Yet more KDE4 port

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1609 17fca916-40b9-46aa-a4ea-0a15b648b75c

23 files changed, 77 insertions, 65 deletions

diff --git a/src/kvirc/module/kvi_mexserverimport.h b/src/kvirc/module/kvi_mexserverimport.h
index c1ed1fbf5..838861f5b 100644
--- a/src/kvirc/module/kvi_mexserverimport.h
+++ b/src/kvirc/module/kvi_mexserverimport.h
@@ -40,7 +40,7 @@ public:
 	virtual void start() = 0;
 	virtual void die() = 0;
 signals:
-	void server(const KviIrcServer &s,const char * network);
+	void server(const KviIrcServer &s,const QString &network);
 };
 
 #endif //!_KVI_MEXSERVERIMPORT_H_
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index b5c0aac6e..1655dd470 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -93,7 +93,6 @@ KviCompletionBox::KviCompletionBox(QTextEdit * parent = 0)
 void KviCompletionBox::updateContents(QString buffer)

 {

 	//buffer=buffer.stripWhiteSpace();

-	debug("Update Contents");

 	KviPointerList<QString> *list;

 	clear();

 	

@@ -135,7 +134,6 @@ void KviCompletionBox::updateContents(QString buffer)
 //			debug("we need a module completion!");

 		for ( QString* szCurrent = list->first(); szCurrent; szCurrent = list->next() )

 		{

-			debug ("Add word %s",(*szCurrent).toUtf8().data());

 			szCurrent->append(' ');

 			addItem(*szCurrent);

 		}

@@ -267,7 +265,7 @@ void KviScriptEditorWidget::slotFind()
 

 void KviScriptEditorWidget::slotReplace()

 {

-	KviScriptEditorReplaceDialog *dialog=new KviScriptEditorReplaceDialog(this,tr("Find & Repalce"));

+	KviScriptEditorReplaceDialog *dialog=new KviScriptEditorReplaceDialog(this,__tr("Find & Repalce"));

 	connect (dialog,SIGNAL(replaceAll(const QString &,const QString &)),m_pParent,SLOT(slotReplaceAll(const QString &,const QString &)));

 	connect (dialog,SIGNAL(initFind()),m_pParent,SLOT(slotInitFind()));

 	connect (dialog,SIGNAL(nextFind(const QString &)),m_pParent,SLOT(slotNextFind(const QString &)));

@@ -332,7 +330,6 @@ void KviScriptEditorWidget::keyPressEvent(QKeyEvent * e)
 	{

 		if (e->key() == Qt::Key_Insert) 

 		{

-			debug("Trigger key INS");

 			completition();

 			return;

 		}

@@ -416,7 +413,6 @@ void KviScriptEditorWidget::mouseReleaseEvent (QMouseEvent *e)
 	QTextCursor cur=cursorForPosition(e->pos());

 	cur.select(QTextCursor::WordUnderCursor);

 	buffer=cur.selectedText();

- debug ("Word selected %s",buffer.toUtf8().data());

 	QString tmp=buffer;

 	KviPointerList<QString> *l;

 	if (tmp.left(1) == "$")

@@ -434,10 +430,8 @@ void KviScriptEditorWidget::mouseReleaseEvent (QMouseEvent *e)
 	}

 	for (int i=0;i<l->count();i++){

 		QString str=*(l->at(i));

-		debug ("TEXT %s",str.toUtf8().data());

 	}

 	KviKvsKernel::instance()->freeCompletionResult(l);

-	debug (buffer);

 	m_szHelp=buffer;

 	}

 	QTextEdit::mouseReleaseEvent(e);

@@ -460,7 +454,6 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const
 	QTextCursor cur=cursorForPosition(QPoint(r.x(),r.y()));

 	cur.select(QTextCursor::WordUnderCursor);

 	QString text=cur.selectedText();

-	debug ("TEXT %s",text.toUtf8().data());

 	QString tmp=text;

 	/*KviPointerList<QString> * l;

 	if(tmp.left(1) == "$")

@@ -524,7 +517,6 @@ void KviScriptEditorWidget::completition(bool bCanComplete)
 		//ForPosition(QPoint(r.x(),r.y()));

 	cur.select(QTextCursor::WordUnderCursor);

 	QString buffer=cur.selectedText();

-	debug("Buffer %s",buffer.toUtf8().data());

 /*

 	int line,index;

 	QString buffer;

@@ -1077,7 +1069,7 @@ void KviScriptEditorImplementation::setText(const KviQCString &txt)
 

 void KviScriptEditorImplementation::getText(KviQCString &txt)

 {

-	txt = m_pEditor->text();

+	txt = m_pEditor->text().toUtf8();

 }

 

 QLineEdit * KviScriptEditorImplementation::getFindlineedit()

diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index d0b2b052b..9b468d09e 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -36,6 +36,7 @@
 #include "kvi_input.h"
 #include "kvi_qstring.h"
 #include "kvi_tal_hbox.h"
+#include "kvi_frame.h"
 
 #include <QSplitter>
 #include <QToolTip>
@@ -55,8 +56,9 @@
 #ifdef COMPILE_KDE_SUPPORT
 	#include <kurl.h>
 	#include <krun.h>
-	#include <kuserprofile.h>
 	#include <kmimetype.h>
+	#include <kmimetypetrader.h>
+	#include <kiconloader.h>
 #endif //COMPILE_KDE_SUPPORT
 
 extern KviFileTransferWindow * g_pFileTransferWindow;
@@ -325,7 +327,7 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const QPoi
 
 #ifdef COMPILE_KDE_SUPPORT
 				QString mimetype = KMimeType::findByPath(szFile)->name();
-				KServiceTypeProfile::OfferList offers = KServiceTypeProfile::offers(mimetype,"Application");
+				KService::List offers = KMimeTypeTrader::self()->query(mimetype,"Application");
 
 				id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,SLOT(openLocalFile()));
 				m_pLocalFilePopup->setItemParameter(id,-1);
@@ -335,10 +337,13 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const QPoi
 				int id;
 				int idx = 0;
 
-				for(KServiceTypeProfile::OfferList::Iterator itOffers = offers.begin();
+				for(KService::List::Iterator itOffers = offers.begin();
 	   				itOffers != offers.end(); ++itOffers)
 				{
-					id = m_pOpenFilePopup->insertItem((*itOffers).service()->pixmap(KIcon::Small),(*itOffers).service()->name());
+					id = m_pOpenFilePopup->insertItem(
+							SmallIcon((*itOffers).data()->icon()),
+							(*itOffers).data()->name()
+						);
 					m_pOpenFilePopup->setItemParameter(id,idx);
 					idx++;
 				}
@@ -429,19 +434,20 @@ void KviFileTransferWindow::openFilePopupActivated(int id)
 	QString tmp = t->localFileName();
 	if(tmp.isEmpty())return;
 
+
 	QString mimetype = KMimeType::findByPath(tmp)->name();
-	KServiceTypeProfile::OfferList offers = KServiceTypeProfile::offers(mimetype,"Application");
+	KService::List offers = KMimeTypeTrader::self()->query(mimetype,"Application");
 
-	for(KServiceTypeProfile::OfferList::Iterator itOffers = offers.begin();
-			itOffers != offers.end(); ++itOffers)
+	for(KService::List::Iterator itOffers = offers.begin();
+	   				itOffers != offers.end(); ++itOffers)
 	{
-		if(txt == (*itOffers).service()->name())
+		if(txt == (*itOffers).data()->name())
 		{
-			KURL::List lst;
-			KURL url;
+			KUrl::List lst;
+			KUrl url;
 			url.setPath(tmp);
 			lst.append(url);
-			KRun::run(*((*itOffers).service()), lst);
+			KRun::run(*((*itOffers).data()),lst,g_pFrame);
 			break;
 		}
 	}
@@ -478,7 +484,7 @@ void KviFileTransferWindow::openLocalFileTerminal()
 		tmp.prepend("konsole --workdir=\"");
 		tmp.append("\"");
 
-		KRun::runCommand(tmp);
+		KRun::runCommand(tmp,g_pFrame);
 	#endif //COMPILE_KDE_SUPPORT
 #endif //!COMPILE_ON_WINDOWS
 }
@@ -523,18 +529,19 @@ void KviFileTransferWindow::openLocalFile()
 		if(tmp.isEmpty())return;
 
 		QString mimetype = KMimeType::findByPath(tmp)->name();  //KMimeType
-		KService::Ptr offer = KServiceTypeProfile::preferredService(mimetype,"Application");
+		KService::Ptr offer = KMimeTypeTrader::self()->preferredService(mimetype,"Application");
 		if(!offer)
 		{
 			openLocalFileWith();
 			return;
 		}
 
-		KURL::List lst;
-		KURL url;
+		KUrl::List lst;
+		KUrl url;
 		url.setPath(tmp);
 		lst.append(url);
-		KRun::run(*offer, lst);
+
+		KRun::run(*offer, lst, g_pFrame);
 	#endif //COMPILE_KDE_SUPPORT
 #endif //!COMPILE_ON_WINDOWS
 }
@@ -558,11 +565,11 @@ void KviFileTransferWindow::openLocalFileWith()
 		QString tmp = t->localFileName();
 		if(tmp.isEmpty())return;
 
-		KURL::List lst;
-		KURL url;
+		KUrl::List lst;
+		KUrl url;
 		url.setPath(tmp);
 		lst.append(url);
-		KRun::displayOpenWithDialog(lst);
+		KRun::displayOpenWithDialog(lst,g_pFrame);
 	#endif //COMPILE_KDE_SUPPORT
 #endif //!COMPILE_ON_WINDOWS
 }
@@ -601,14 +608,14 @@ void KviFileTransferWindow::openLocalFileFolder()
 		tmp = tmp.left(idx);
 
 		QString mimetype = KMimeType::findByPath(tmp)->name(); // inode/directory
-		KService::Ptr offer = KServiceTypeProfile::preferredService(mimetype,"Application");
+		KService::Ptr offer = KMimeTypeTrader::self()->preferredService(mimetype,"Application");
 		if(!offer)return;
 
-		KURL::List lst;
-		KURL url;
+		KUrl::List lst;
+		KUrl url;
 		url.setPath(tmp);
 		lst.append(url);
-		KRun::run(*offer, lst);
+		KRun::run(*offer,lst,g_pFrame);
 	#endif //COMPILE_KDE_SUPPORT
 #endif //!COMPILE_ON_WINDOWS
 }
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index e82074105..8cc7f3ed3 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -27,6 +27,7 @@
 #include "index.h"
 
 #include "kvi_file.h"
+#include "kvi_qstring.h"
 #include "kvi_pointerhashtable.h"
 
 #include <ctype.h>
@@ -127,7 +128,7 @@ void Index::setupDocumentList()
 
 void Index::insertInDict( const QString &str, int docNum )
 {
-	if ( strcmp( str, "amp" ) == 0 || strcmp( str, "nbsp" ) == 0 ) return;
+	if (KviQString::equalCI( str, "amp" ) || KviQString::equalCI( str, "nbsp" ) ) return;
 	Entry *e = 0;
 	if ( dict.count() ) e = dict[ str ];
 	
@@ -145,7 +146,8 @@ void Index::parseDocument( const QString &filename, int docNum )
 {
 	KviFile file( filename );
 	if ( !file.openForReading() ) {
-		qWarning( "can not open file " + filename );
+		QString warn = "cannot open file " + filename;
+		qWarning( warn.toUtf8().data() );
 		return;
 	}
 	QTextStream s( &file );
@@ -332,7 +334,8 @@ QString Index::getDocumentTitle( const QString &fileName )
 {
 	KviFile file( fileName );
 	if ( !file.openForReading() ) {
-		qWarning( "cannot open file " + fileName );
+		QString warn = "cannot open file " + fileName;
+		qWarning( warn.toUtf8().data() );
 		return fileName;
 	}
 	
@@ -470,7 +473,8 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo
 	KviFile file( fileName );
 	
 	if ( !file.openForReading() ) {
-		qWarning( "cannot open file " + fileName );
+		QString warn = "cannot open file " + fileName;
+		qWarning( warn.toUtf8().data() );
 		return FALSE;
 	}
 	
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 54e571bc2..137f9be78 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -27,6 +27,7 @@
 #include "kvi_out.h"
 #include "kvi_options.h"
 #include "kvi_locale.h"
+#include "kvi_qstring.h"
 #include "kvi_out.h"
 #include "kvi_mirccntrl.h"
 #include "kvi_themedlabel.h"
@@ -121,8 +122,9 @@ void KviLinksWindow::connectionStateChange()
 	m_pRequestButton->setEnabled(st == KviIrcContext::Connected);
 	if(st == KviIrcContext::Connected)
 	{
-		KviStr tmp(KviStr::Format,__tr2qs("Connected to %s (%s)"),m_pConsole->connection()->currentServerName().toUtf8().data(),m_pConsole->currentNetworkName().toUtf8().data());
-		m_pInfoLabel->setText(tmp.ptr());
+		QString tmp;
+		KviQString::sprintf(tmp,__tr2qs("Connected to %s (%s)"),m_pConsole->connection()->currentServerName().toUtf8().data(),m_pConsole->currentNetworkName().toUtf8().data());
+		m_pInfoLabel->setText(tmp);
 	} else {
 		m_pInfoLabel->setText(__tr2qs("Links cannot be requested: Not connected to a server"));
 	}
@@ -234,12 +236,13 @@ void KviLinksWindow::endOfLinks()
 				output(KVI_OUT_SYSTEMERROR,__tr2qs("Broken link: Missing parent (%s) for %s (%d hops): %s (used /LINKS <mask> ?)"),
 					l->parent.ptr(),l->host.ptr(),l->hops,l->description.ptr());
 				brokenLinks++;
-				KviStr tmp(KviStr::Format,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->parent.ptr());
+				QString tmp;
+				KviQString::sprintf(tmp,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->parent.ptr());
 				KviStr tmp2(KviStr::Format,"%d",l->hops);
-				if(root)it = new KviTalListViewItem(m_pListView,root,QString(l->host.ptr()),QString(tmp2.ptr()),QString(tmp.ptr()));
+				if(root)it = new KviTalListViewItem(m_pListView,root,QString(l->host.ptr()),QString(tmp2.ptr()),tmp);
 				else {
 					outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("Warning: No root link was sent by the server, the stats may be invalid."));
-					it = new KviTalListViewItem(m_pListView,QString(l->host.ptr()),QString(tmp2.ptr()),QString(tmp.ptr()));
+					it = new KviTalListViewItem(m_pListView,QString(l->host.ptr()),QString(tmp2.ptr()),tmp);
 				}
 			} else {
 				it = it->parent();
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index 14931574d..a08cd1420 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -1615,7 +1615,7 @@ static bool mediaplayer_module_init( KviModule * m )
 	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviWinampInterface));
 #endif
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAmarokInterface));
 	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviJukInterface));
 #endif
diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp
index 72c0f7924..2db7a4af4 100644
--- a/src/modules/mediaplayer/mp_amarokinterface.cpp
+++ b/src/modules/mediaplayer/mp_amarokinterface.cpp
@@ -24,7 +24,7 @@
 
 #include "mp_amarokinterface.h"
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 
 #include "kvi_app.h"
 #include "kvi_locale.h"
diff --git a/src/modules/mediaplayer/mp_amarokinterface.h b/src/modules/mediaplayer/mp_amarokinterface.h
index 6b2148e82..fc4033c5f 100644
--- a/src/modules/mediaplayer/mp_amarokinterface.h
+++ b/src/modules/mediaplayer/mp_amarokinterface.h
@@ -27,7 +27,7 @@
 #include "kvi_settings.h"
 
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 
 	#include "kvi_dcophelper.h"
 	#include "mp_interface.h"
diff --git a/src/modules/mediaplayer/mp_dcopinterface.cpp b/src/modules/mediaplayer/mp_dcopinterface.cpp
index b68ec8c54..c2b612658 100644
--- a/src/modules/mediaplayer/mp_dcopinterface.cpp
+++ b/src/modules/mediaplayer/mp_dcopinterface.cpp
@@ -24,7 +24,7 @@
 
 #include "mp_dcopinterface.h"
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 
 #include "dcopclient.h"
 
diff --git a/src/modules/mediaplayer/mp_dcopinterface.h b/src/modules/mediaplayer/mp_dcopinterface.h
index 14a3212d2..2efd5b4ab 100644
--- a/src/modules/mediaplayer/mp_dcopinterface.h
+++ b/src/modules/mediaplayer/mp_dcopinterface.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 
 #include "mp_interface.h"
 
diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp
index 3c9b81049..69b3d6a4a 100644
--- a/src/modules/mediaplayer/mp_interface.cpp
+++ b/src/modules/mediaplayer/mp_interface.cpp
@@ -32,7 +32,7 @@
 

 static QTextCodec * mediaplayer_get_codec()

 {

-	QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding)); 

+	QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toUtf8().data());
 	if(!c)c = QTextCodec::codecForLocale(); 

 	return c;

 

diff --git a/src/modules/mediaplayer/mp_jukinterface.cpp b/src/modules/mediaplayer/mp_jukinterface.cpp
index 7c0fbccd6..45c54c218 100644
--- a/src/modules/mediaplayer/mp_jukinterface.cpp
+++ b/src/modules/mediaplayer/mp_jukinterface.cpp
@@ -24,7 +24,7 @@
 
 #include "mp_jukinterface.h"
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 
 #include "kvi_app.h"
 #include "kvi_locale.h"
diff --git a/src/modules/mediaplayer/mp_jukinterface.h b/src/modules/mediaplayer/mp_jukinterface.h
index 9b1400a56..b8abdcfca 100644
--- a/src/modules/mediaplayer/mp_jukinterface.h
+++ b/src/modules/mediaplayer/mp_jukinterface.h
@@ -27,7 +27,7 @@
 
 #include "kvi_settings.h"
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 
 	#include "kvi_dcophelper.h"
 	#include "mp_interface.h"
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 5a49d5e35..eff762a63 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -94,7 +94,7 @@ int KviMircServersIniImport::doImport(const QString& filename)
 						uPort = 6667;
 					}
 				}
-				if(entry.isEmpty())entry = __tr("Standalone Servers");
+				if(entry.isEmpty())entry = __tr2qs("Standalone Servers");
 				if(!serv.isEmpty())
 				{
 					KviIrcServer s;
diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp
index 50a6f996d..7782b327f 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/class_checkbox.cpp
@@ -77,7 +77,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_checkbox)
 
 bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	KviStyledCheckBox  * cb = new KviStyledCheckBox(parentScriptWidget(), getName());
+	KviStyledCheckBox  * cb = new KviStyledCheckBox(parentScriptWidget(), getName().toUtf8().data());
 	setObject(cb, true);
 	connect(cb,SIGNAL(toggled(bool)),this,SLOT(toggled(bool)));
 	connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked()));
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index d28f7d939..4bf98f40c 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -296,12 +296,12 @@ bool KviKvsObject_file::functionputch(KviKvsObjectFunctionCall *c)
 {
 	QString szChar;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("char",KVS_PT_STRING,KVS_PF_OPTIONAL,szChar)
+		KVSO_PARAMETER("char",KVS_PT_STRING,0,szChar)
 	KVSO_PARAMETERS_END(c)
 	if (m_pFile)
 	{
 		if (szChar.length()>1)c->warning(__tr2qs("Argument to long, using only first char"));
-		const char *ch=szChar;
+		const char *ch=szChar.toUtf8().data();
 
 		if (!m_pFile->putChar(ch[0])) c->warning(__tr2qs("Write error occured !"));
 	}
@@ -334,7 +334,7 @@ bool KviKvsObject_file::functionunGetch(KviKvsObjectFunctionCall *c)
 	else
 	{
 		if (szChar.length()>1) c->warning(__tr2qs("Argument to long, using only first char"));
-		const char *ch=szChar;
+		const char *ch=szChar.toUtf8().data();
 		if (m_pFile->ungetch(ch[0])<0) c->warning(__tr2qs("An error occured !"));// c->error ?
 	}
 	return true;
@@ -371,7 +371,7 @@ bool KviKvsObject_file::functionwriteBlock(KviKvsObjectFunctionCall *c)
 	if (!m_pFile) return true;
 	if(!m_pFile->isOpen())
 		c->warning(__tr("File is not open !"));
-	const char *block=szBlock;
+	const char *block=szBlock.toUtf8().data();
 	int rlen = m_pFile->writeBlock(block, uLen);
 	c->returnValue()->setInteger(rlen);
 	m_pFile->flush();
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 35cbd7e6e..2ccb4302a 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -215,7 +215,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listview)
 
 bool KviKvsObject_listview::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new KviKvsMdmListView(parentScriptWidget(),getName(),this),true);
+	setObject(new KviKvsMdmListView(parentScriptWidget(),getName().toUtf8().data(),this),true);
 	connect(widget(),SIGNAL(clicked(KviTalListViewItem *)),this,SLOT(slotClicked(KviTalListViewItem *)));
 	connect(widget(),SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(slotSelectionChanged(KviTalListViewItem *)));
 	connect(widget(),SIGNAL(selectionChanged()),this,SLOT(slotMultipleSelectionChanged()));
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index 870fef715..ec6f2564e 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -67,7 +67,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mainwindow)
 
 bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new KviTalMainWindow(parentScriptWidget(), getName()), true);
+	setObject(new KviTalMainWindow(parentScriptWidget(), getName().toUtf8().data()), true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index b3e9bf40d..2bc49b36f 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -341,7 +341,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mledit)
 
 bool KviKvsObject_mledit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
 {
-	setObject(new KviTalMultiLineEdit(parentScriptWidget(),getName()),true);
+	setObject(new KviTalMultiLineEdit(parentScriptWidget(),getName().toUtf8().data()),true);
 	return true;
 }
 
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index b108a0a85..7936063cd 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -880,7 +880,7 @@ static void dumpChildObjects(KviWindow *pWnd, QObject *parent, const char *spaci
 			n->set(idx,new KviKvsVariant(v));
 			debug ("string %s",szTemp.latin1());
 			idx++;
-			dumpChildObjects(pWnd, list.at(i), sp, bFlag, n, idx );
+			dumpChildObjects(pWnd, list.at(i), sp.toUtf8().data(), bFlag, n, idx );
 		}
 	}
 
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 66ae40d71..1f01823bb 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -161,7 +161,13 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
 	connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
 #endif //!COMPILE_IPV6_SUPPORT
 
-	addBoolSelector(0,4,0,4,__tr2qs_ctx("Pick Random IP Address for Round-Robin Servers","options"),KviOption_boolPickRandomIpAddressForRoundRobinServers);
+	b = addBoolSelector(0,4,0,4,__tr2qs_ctx("Pick Random IP Address for Round-Robin Servers","options"),KviOption_boolPickRandomIpAddressForRoundRobinServers);
+	mergeTip(b,__tr2qs_ctx("<center>This option will cause the KVIrc networking stack to pick up " \
+							"a random entry when multiple IP address are retrieved for a server " \
+							"dns lookup. This is harmless and can fix some problems with caching " \
+							"dns servers that do not properly rotate the records as the authoritative " \
+							"ones would do. On the other hand, you might want to disable it if " \
+							"you want to rely on the dns server to provide the best choice.</center>"));
 
 	addRowSpacer(0,5,0,5);
 }
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 4b03a8322..a46c7d010 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -1395,7 +1395,7 @@ void KviServerOptionsWidget::importPopupActivated(int id)
 		return;
 	}
 
-	connect(m_pImportFilter,SIGNAL(server(const KviIrcServer &,const char *)),this,SLOT(importServer(const KviIrcServer &,const char *)));
+	connect(m_pImportFilter,SIGNAL(server(const KviIrcServer &,const QString&)),this,SLOT(importServer(const KviIrcServer &,const QString&)));
 	connect(m_pImportFilter,SIGNAL(destroyed()),this,SLOT(importerDead()));
 
 	m_pImportFilter->start();
@@ -1406,7 +1406,7 @@ void KviServerOptionsWidget::importerDead()
 	m_pImportFilter = 0;
 }
 
-void KviServerOptionsWidget::importServer(const KviIrcServer &s,const char * network)
+void KviServerOptionsWidget::importServer(const KviIrcServer &s,const QString &network)
 {
 	KviServerOptionsListViewItem * net = findNetItem(network);
 	if(!net)
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 52ebb0c38..5cdf8f335 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -187,7 +187,7 @@ private:
 	KviServerOptionsListViewItem * findNetItem(const char * netname);
 protected slots:
 	void importerDead();
-	void importServer(const KviIrcServer & s,const char * network);
+	void importServer(const KviIrcServer & s,const QString &network);
 	void importPopupAboutToShow();
 	void listViewItemSelectionChanged(KviTalListViewItem *it);
 	void listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col);