removed QT3 QString stuff (wip). Need test.

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

8 files changed, 80 insertions, 80 deletions

diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index 1827011fa..db45e0bf6 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -315,7 +315,7 @@ void KviDccBroker::executeChat(KviDccBox *box,KviDccDescriptor * dcc)
 	szSubProto.toLower();
 
 	QString tmp = QString("dcc: %1 %2@%3:%4").arg(szSubProto.ptr()).arg(dcc->szNick).arg(dcc->szIp).arg(dcc->szPort);
-	KviDccChat * chat = new KviDccChat(dcc->console()->frame(),dcc,tmp.utf8().data());
+	KviDccChat * chat = new KviDccChat(dcc->console()->frame(),dcc,tmp.toUtf8().data());
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
 			(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat) || \
@@ -365,7 +365,7 @@ void KviDccBroker::activeVoiceExecute(KviDccBox *box,KviDccDescriptor * dcc)
 		dcc->setConsole(g_pApp->activeConsole());
 	}
 
-	KviStr tmp(KviStr::Format,"dcc: voice %s@%s:%s",dcc->szNick.utf8().data(),dcc->szIp.utf8().data(),dcc->szPort.utf8().data());
+	KviStr tmp(KviStr::Format,"dcc: voice %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
 	KviDccVoice * v = new KviDccVoice(dcc->console()->frame(),dcc,tmp.ptr());
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
@@ -385,7 +385,7 @@ void KviDccBroker::activeVoiceExecute(KviDccBox *box,KviDccDescriptor * dcc)
 
 void KviDccBroker::passiveVoiceExecute(KviDccDescriptor * dcc)
 {
-	KviStr tmp(KviStr::Format,"dcc: voice %s@%s:%s",dcc->szNick.utf8().data(),dcc->szIp.utf8().data(),dcc->szPort.utf8().data());
+	KviStr tmp(KviStr::Format,"dcc: voice %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
 	KviDccVoice * v = new KviDccVoice(dcc->console()->frame(),dcc,tmp.ptr());
 	//#warning "Create minimized dcc voice ?... or maybe it's too much ? :)"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat);
@@ -437,7 +437,7 @@ void KviDccBroker::activeCanvasExecute(KviDccBox *box,KviDccDescriptor * dcc)
 		dcc->setConsole(g_pApp->activeConsole());
 	}
 
-	KviStr tmp(KviStr::Format,"dcc: canvas %s@%s:%s",dcc->szNick.utf8().data(),dcc->szIp.utf8().data(),dcc->szPort.utf8().data());
+	KviStr tmp(KviStr::Format,"dcc: canvas %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
 	KviDccCanvas * cnv = new KviDccCanvas(dcc->console()->frame(),dcc,tmp.ptr());
 
 	//#warning "This option should be dedicated to Dcc Canvas!....for now we are using the DccChat options"
@@ -458,7 +458,7 @@ void KviDccBroker::activeCanvasExecute(KviDccBox *box,KviDccDescriptor * dcc)
 #ifdef COMPILE_DCC_CANVAS
 void KviDccBroker::passiveCanvasExecute(KviDccDescriptor * dcc)
 {
-	KviStr tmp(KviStr::Format,"dcc: canvas %s@%s:%s",dcc->szNick.utf8().data(),dcc->szIp.utf8().data(),dcc->szPort.utf8().data());
+	KviStr tmp(KviStr::Format,"dcc: canvas %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
 	KviDccCanvas * cnv = new KviDccCanvas(dcc->console()->frame(),dcc,tmp.ptr());
 	//#warning "This option should be dedicated to Dcc Canvas!....for now we are using the DccChat options"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat);
@@ -571,7 +571,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc)
 		if(KVI_OPTION_BOOL(KviOption_boolUseIncomingDccMediaTypeSavePath))
 		{
 			g_pMediaManager->lock();
-			if(KviMediaType * mt = g_pMediaManager->findMediaType(dcc->szFileName.utf8().data(),false))
+			if(KviMediaType * mt = g_pMediaManager->findMediaType(dcc->szFileName.toUtf8().data(),false))
 			{
 				if(mt->szSavePath.hasData())
 				{
@@ -693,7 +693,7 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc)
 			if(KVI_OPTION_BOOL(KviOption_boolAutoResumeDccSendWhenAutoAccepted) &&
 				(iRemoteSize > -1) && // only if the remote size is really known
 				(iRemoteSize > ((int)(fi.size()))) && // only if the remote size is larger than the local size
-				(!KviDccFileTransfer::nonFailedTransferWithLocalFileName(dcc->szLocalFileName.utf8().data()))) // only if there is no transfer with this local file name yet
+				(!KviDccFileTransfer::nonFailedTransferWithLocalFileName(dcc->szLocalFileName.toUtf8().data()))) // only if there is no transfer with this local file name yet
 			{
 				// yep, auto resume...
 				dcc->bResume = true;
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index b89b25a87..033ba2ee5 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -86,12 +86,12 @@
 				if(dcc->bSendRequest)
 				{
 					QString ip     = !dcc->szFakeIp.isEmpty() ? dcc->szFakeIp : dcc->szListenIp;
-					QString port   = !dcc->szFakePort.isEmpty() ? dcc->szFakePort.utf8().data() : m_pMarshal->localPort();
+					QString port   = !dcc->szFakePort.isEmpty() ? dcc->szFakePort.toUtf8().data() : m_pMarshal->localPort();
 					//#warning "OPTION FOR SENDING 127.0.0.1 and so on (not an unsigned number)"
 					struct in_addr a;
-					if(kvi_stringIpToBinaryIp(ip.utf8().data(),&a))ip.setNum(htonl(a.s_addr));
+					if(kvi_stringIpToBinaryIp(ip.toUtf8().data(),&a))ip.setNum(htonl(a.s_addr));
 					dcc->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC CANVAS chat %Q %Q%c",
-						dcc->console()->connection()->encodeText( dcc->szNick.utf8().data() ).data(),
+						dcc->console()->connection()->encodeText( dcc->szNick.toUtf8().data() ).data(),
 						0x01,&ip,
 						&port,
 						0x01);
@@ -102,7 +102,7 @@
 		} else {
 			// ACTIVE CONNECTION
 			outputNoFmt(KVI_OUT_DCCMSG,__tr2qs_ctx("Attempting an active DCC CANVAS connection","dcc"));
-			int ret = m_pMarshal->dccConnect(dcc->szIp.utf8().data(),dcc->szPort.utf8().data(),m_pDescriptor->bDoTimeout);
+			int ret = m_pMarshal->dccConnect(dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
 			if(ret != KviError_success)handleMarshalError(ret);
 			else output(KVI_OUT_DCCMSG,__tr2qs_ctx("Contacting host %Q on port %Q","dcc"),&(dcc->szIp),&(dcc->szPort));
 		}
@@ -128,14 +128,14 @@
 	{
 		// This may change on the fly...
 		m_szTarget.sprintf("%s@%s:%s",
-			m_pDescriptor->szNick.utf8().data(),m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data());
+			m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 		return m_szTarget;
 	}
 	
 	void KviDccCanvas::fillCaptionBuffers()
 	{
 		KviStr tmp(KviStr::Format,"DCC Canvas %s@%s:%s",
-			m_pDescriptor->szNick.utf8().data(),m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data());
+			m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 	
 		m_szPlainTextCaption = tmp;
 	
@@ -152,7 +152,7 @@
 
 	void KviDccCanvas::getBaseLogFileName(KviStr &buffer)
 	{
-		buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.utf8().data(),m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data());
+		buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 	}
 
 	void KviDccCanvas::ownMessage(const char * text)
@@ -160,8 +160,8 @@
 		KviStr buf(KviStr::Format,"%s\r\n",text);
 	//	m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 		m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
-			m_pDescriptor->szLocalNick.utf8().data(),m_pDescriptor->szLocalUser.utf8().data(),
-			m_pDescriptor->szLocalHost.utf8().data(),text);
+			m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+			m_pDescriptor->szLocalHost.toUtf8().data(),text);
 	}
 	
 	void KviDccCanvas::ownAction(const char * text)
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index e598f04bf..223a7989a 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -1438,7 +1438,7 @@
 	
 		for(QMap<QString,QVariant>::ConstIterator iter = m->begin();iter != m->end();++iter)
 		{
-			item = new QTableItem(this,QTableItem::Never,iter.key().utf8().data());
+			item = new QTableItem(this,QTableItem::Never,iter.key().toUtf8().data());
 			setItem(idx,0,item);
 			item = new KviVariantTableItem(this,iter.data());
 			setItem(idx,1,item);
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 5bd2b26ca..6e16bed5b 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -153,7 +153,7 @@ void KviDccChat::startConnection()
 	if(!(m_pDescriptor->bActive))
 	{
 		// PASSIVE CONNECTION
-		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Attempting a passive DCC %s connection","dcc"),m_pDescriptor->szType.utf8().data());
+		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Attempting a passive DCC %s connection","dcc"),m_pDescriptor->szType.toUtf8().data());
 #ifdef COMPILE_SSL_SUPPORT
 		int ret = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout,m_pDescriptor->bIsSSL);
 #else
@@ -162,11 +162,11 @@ void KviDccChat::startConnection()
 		if(ret != KviError_success)handleMarshalError(ret);
 	} else {
 		// ACTIVE CONNECTION
-		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Attempting an active DCC %s connection","dcc"),m_pDescriptor->szType.utf8().data());
+		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Attempting an active DCC %s connection","dcc"),m_pDescriptor->szType.toUtf8().data());
 #ifdef COMPILE_SSL_SUPPORT
-		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data(),m_pDescriptor->bDoTimeout,m_pDescriptor->bIsSSL);
+		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout,m_pDescriptor->bIsSSL);
 #else
-		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data(),m_pDescriptor->bDoTimeout);
+		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
 #endif
 		if(ret != KviError_success)handleMarshalError(ret);
 	}
@@ -196,7 +196,7 @@ void KviDccChat::connectionInProgress()
 						// try to get the IP that the IRC server can see
 						if(m_pDescriptor->console())
 						{
-							KviStr tmp = m_pDescriptor->console()->connection() ? m_pDescriptor->console()->connection()->userInfo()->hostIp().utf8().data() : "";
+							KviStr tmp = m_pDescriptor->console()->connection() ? m_pDescriptor->console()->connection()->userInfo()->hostIp().toUtf8().data() : "";
 							if(tmp.hasData())
 							{
 								ip = tmp;
@@ -275,9 +275,9 @@ void KviDccChat::fillCaptionBuffers()
 	m_szPlainTextCaption = tmp;
 
 	m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),tmp.utf8().data());
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),tmp.toUtf8().data());
 	m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),tmp.utf8().data());
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),tmp.toUtf8().data());
 }
 
 QPixmap * KviDccChat::myIconPtr()
@@ -287,7 +287,7 @@ QPixmap * KviDccChat::myIconPtr()
 
 void KviDccChat::getBaseLogFileName(KviStr &buffer)
 {
-	buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.utf8().data(),m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data());
+	buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 }
 
 void KviDccChat::ownMessage(const QString &text)
@@ -318,8 +318,8 @@ void KviDccChat::ownMessage(const QString &text)
 						KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
 						m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 						m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
-							m_pDescriptor->szLocalNick.utf8().data(),m_pDescriptor->szLocalUser.utf8().data(),
-							m_pDescriptor->szLocalHost.utf8().data(),text,KviConsole::NoNotifications);
+							m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+							m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
 					}
 					break;
 					case KviCryptEngine::Encoded:
@@ -328,8 +328,8 @@ void KviDccChat::ownMessage(const QString &text)
 						m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 						QString encr = decodeText(encrypted.ptr());
 						m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
-							m_pDescriptor->szLocalNick.utf8().data(),m_pDescriptor->szLocalUser.utf8().data(),
-							m_pDescriptor->szLocalHost.utf8().data(),encr,KviConsole::NoNotifications);
+							m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+							m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications);
 					}
 					break;
 					default: // also case KviCryptEngine::EncryptError
@@ -348,8 +348,8 @@ void KviDccChat::ownMessage(const QString &text)
 				QString tmp = text.right(text.length() - 1);
 				m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 				m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
-					m_pDescriptor->szLocalNick.utf8().data(),m_pDescriptor->szLocalUser.utf8().data(),
-					m_pDescriptor->szLocalHost.utf8().data(),tmp,KviConsole::NoNotifications);
+					m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+					m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications);
 				return;
 			}
 		}
@@ -358,8 +358,8 @@ void KviDccChat::ownMessage(const QString &text)
 	KviStr buf(KviStr::Format,"%s\r\n",d);
 	m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 	m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
-		m_pDescriptor->szLocalNick.utf8().data(),m_pDescriptor->szLocalUser.utf8().data(),
-		m_pDescriptor->szLocalHost.utf8().data(),text,KviConsole::NoNotifications);
+		m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+		m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
 }
 
 const QString & KviDccChat::localNick()
@@ -428,8 +428,8 @@ bool KviDccChat::event(QEvent *e)
 									if(!KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnDCCChatMessage,this,QString(decryptedStuff.ptr()),m_pDescriptor->idString()))
 									{
 										m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
-											m_pDescriptor->szNick.utf8().data(),m_pDescriptor->szUser.utf8().data(),
-											m_pDescriptor->szHost.utf8().data(),decryptedStuff.ptr());
+											m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szUser.toUtf8().data(),
+											m_pDescriptor->szHost.toUtf8().data(),decryptedStuff.ptr());
 									}
 									delete encoded;
 									return true;
@@ -450,8 +450,8 @@ bool KviDccChat::event(QEvent *e)
 						// FIXME!
 						if(!KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnDCCChatMessage,this,QString(d.ptr()),m_pDescriptor->idString()))
 							m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
-								m_pDescriptor->szNick.utf8().data(),m_pDescriptor->szUser.utf8().data(),
-								m_pDescriptor->szHost.utf8().data(),d.ptr());
+								m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szUser.toUtf8().data(),
+								m_pDescriptor->szHost.toUtf8().data(),d.ptr());
 #ifdef COMPILE_CRYPT_SUPPORT
 					}
 #endif
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 080aa9a7a..f72dfab39 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -788,7 +788,7 @@ static void dccModuleParseDccRSend(KviDccRequest *dcc)
 	d->bNoAcks           = d->bIsTdcc;
 	d->bOverrideMinimize = false;
 	d->bAutoAccept       = KVI_OPTION_BOOL(KviOption_boolAutoAcceptDccSend);
-	d->bIsIncomingAvatar = g_pApp->findPendingAvatarChange(dcc->pConsole,d->szNick.utf8().data(),d->szFileName.utf8().data());
+	d->bIsIncomingAvatar = g_pApp->findPendingAvatarChange(dcc->pConsole,d->szNick.toUtf8().data(),d->szFileName.toUtf8().data());
 
 	if(KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault))
 	{
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 8a4401c88..1c883e24a 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -823,23 +823,23 @@ void KviDccFileTransfer::startConnection()
 	if(m_pDescriptor->bResume && m_pDescriptor->bRecvFile)
 	{
 		QString fName;
-		KviServerParser::encodeCtcpParameter(m_pDescriptor->szFileName.utf8().data(),fName);
+		KviServerParser::encodeCtcpParameter(m_pDescriptor->szFileName.toUtf8().data(),fName);
 		if(m_pDescriptor->isZeroPortRequest())
 		{
 		m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC RESUME %s %s %s %s%c",
 			m_pDescriptor->console()->connection()->encodeText(m_pDescriptor->szNick).data(),
 			0x01,
 			m_pDescriptor->console()->connection()->encodeText(fName).data(),
-			m_pDescriptor->szPort.utf8().data(),
-			m_pDescriptor->szLocalFileSize.utf8().data(),
+			m_pDescriptor->szPort.toUtf8().data(),
+			m_pDescriptor->szLocalFileSize.toUtf8().data(),
 			m_pDescriptor->zeroPortRequestTag(),0x01);
 		} else {
 			m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC RESUME %s %s %s%c",
 				m_pDescriptor->console()->connection()->encodeText(m_pDescriptor->szNick).data(),
 				0x01,
 				m_pDescriptor->console()->connection()->encodeText(fName).data(),
-				m_pDescriptor->szPort.utf8().data(),
-				m_pDescriptor->szLocalFileSize.utf8().data(),0x01);
+				m_pDescriptor->szPort.toUtf8().data(),
+				m_pDescriptor->szLocalFileSize.toUtf8().data(),0x01);
 		}
 		m_szStatusString = __tr2qs_ctx("Sent DCC RESUME request to %1, waiting for ACCEPT","dcc").arg(m_pDescriptor->szNick);
 		outputAndLog(m_szStatusString);
@@ -867,7 +867,7 @@ void KviDccFileTransfer::listenOrConnect()
 		int ret = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout);
 		if(ret != KviError_success)handleMarshalError(ret);
 	} else {
-		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data(),m_pDescriptor->bDoTimeout);
+		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
 		if(ret != KviError_success)handleMarshalError(ret);
 	}
 
@@ -891,7 +891,7 @@ KviWindow * KviDccFileTransfer::dccMarshalOutputWindow()
 
 const char * KviDccFileTransfer::dccMarshalOutputContextString()
 {
-	return m_szTransferIdString.utf8().data();
+	return m_szTransferIdString.toUtf8().data();
 }
 
 void KviDccFileTransfer::die()
@@ -911,7 +911,7 @@ void KviDccFileTransfer::abort()
 	if(m_pMarshal)m_pMarshal->abort();
 
 	if(m_pDescriptor->bRecvFile)
-			g_pApp->fileDownloadTerminated(false,m_pDescriptor->szFileName.utf8().data(),m_pDescriptor->szLocalFileName.utf8().data(),m_pDescriptor->szNick.utf8().data(),__tr_ctx("Aborted","dcc"));
+			g_pApp->fileDownloadTerminated(false,m_pDescriptor->szFileName.toUtf8().data(),m_pDescriptor->szLocalFileName.toUtf8().data(),m_pDescriptor->szNick.toUtf8().data(),__tr_ctx("Aborted","dcc"));
 
 	KviStr tmp;
 
@@ -1144,15 +1144,15 @@ void KviDccFileTransfer::displayPaint(QPainter * p,int column,int width,int heig
 
 			p->setPen(Qt::black);
 
-			KviStr szRemote(KviStr::Format,"dcc://%s@%s:%s/%s",m_pDescriptor->szNick.utf8().data(),m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data(),
-					m_pDescriptor->szFileName.utf8().data());
+			KviStr szRemote(KviStr::Format,"dcc://%s@%s:%s/%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),
+					m_pDescriptor->szFileName.toUtf8().data());
 
 			p->drawText(4 + daW1,iY,width - (8 + daW1),height - 8,Qt::AlignTop | Qt::AlignLeft,
-					m_pDescriptor->bRecvFile ? szRemote.ptr() : m_pDescriptor->szLocalFileName.utf8().data());
+					m_pDescriptor->bRecvFile ? szRemote.ptr() : m_pDescriptor->szLocalFileName.toUtf8().data());
 			iY += iLineSpacing;
 
 			p->drawText(4 + daW1,iY,width - (8 + daW1),height - 8,Qt::AlignTop | Qt::AlignLeft,
-					m_pDescriptor->bRecvFile ? m_pDescriptor->szLocalFileName.utf8().data() : szRemote.ptr());
+					m_pDescriptor->bRecvFile ? m_pDescriptor->szLocalFileName.toUtf8().data() : szRemote.ptr());
 			iY += iLineSpacing;
 
 
@@ -1531,7 +1531,7 @@ void KviDccFileTransfer::connectionInProgress()
 		if(KVI_OPTION_BOOL(KviOption_boolDCCFileTransferReplaceOutgoingSpacesWithUnderscores))
 			tmp.replace(" ","_");
 
-		KviServerParser::encodeCtcpParameter(tmp.utf8().data(),fName);
+		KviServerParser::encodeCtcpParameter(tmp.toUtf8().data(),fName);
 		// Zero port requests want DCC SEND as back-request
 		KviStr szReq;
 
@@ -1543,8 +1543,8 @@ void KviDccFileTransfer::connectionInProgress()
 					0x01,
 					m_pDescriptor->console()->connection()->encodeText(szReq.ptr()).data(),
 					m_pDescriptor->console()->connection()->encodeText(fName).data(),
-					ip.utf8().data(),port.ptr(),
-					m_pDescriptor->szFileSize.utf8().data(),m_pDescriptor->zeroPortRequestTag(),0x01);
+					ip.toUtf8().data(),port.ptr(),
+					m_pDescriptor->szFileSize.toUtf8().data(),m_pDescriptor->zeroPortRequestTag(),0x01);
 		} else {
 			szReq = m_szDccType;
 			m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC %s %s %s %s %Q%c",
@@ -1552,7 +1552,7 @@ void KviDccFileTransfer::connectionInProgress()
 					0x01,
 					m_pDescriptor->console()->connection()->encodeText(szReq.ptr()).data(),
 					m_pDescriptor->console()->connection()->encodeText(fName).data(),
-					ip.utf8().data(),port.ptr(),
+					ip.toUtf8().data(),port.ptr(),
 					&(m_pDescriptor->szLocalFileSize),0x01);
 		}
 		outputAndLog(__tr2qs_ctx("Sent DCC %1 request to %2, waiting for remote client to connect...","dcc").arg(szReq.ptr()).arg(m_pDescriptor->szNick));
@@ -1592,7 +1592,7 @@ bool KviDccFileTransfer::event(QEvent *e)
 				QString szErrorString = KviError::getDescription(*err);
 				delete err;
 				if(m_pDescriptor->bRecvFile)
-					g_pApp->fileDownloadTerminated(false,m_pDescriptor->szFileName.utf8().data(),m_pDescriptor->szLocalFileName.utf8().data(),m_pDescriptor->szNick.utf8().data(),szErrorString.utf8().data());
+					g_pApp->fileDownloadTerminated(false,m_pDescriptor->szFileName.toUtf8().data(),m_pDescriptor->szLocalFileName.toUtf8().data(),m_pDescriptor->szNick.toUtf8().data(),szErrorString.toUtf8().data());
 
 				m_szStatusString = __tr2qs_ctx("Transfer failed: ","dcc");
 				m_szStatusString += szErrorString;
@@ -1633,7 +1633,7 @@ bool KviDccFileTransfer::event(QEvent *e)
 					g_pApp->notifierMessage(0,KVI_SMALLICON_DCCMSG,szMsg,30);
 				}
 				*/
-				if(m_pDescriptor->bRecvFile)g_pApp->fileDownloadTerminated(true,m_pDescriptor->szFileName.utf8().data(),m_pDescriptor->szLocalFileName.utf8().data(),m_pDescriptor->szNick.utf8().data());
+				if(m_pDescriptor->bRecvFile)g_pApp->fileDownloadTerminated(true,m_pDescriptor->szFileName.toUtf8().data(),m_pDescriptor->szLocalFileName.toUtf8().data(),m_pDescriptor->szNick.toUtf8().data());
 				m_szStatusString = __tr2qs_ctx("Transfer completed","dcc");
 				outputAndLog(m_szStatusString);
 				m_eGeneralStatus = Success;
@@ -1696,7 +1696,7 @@ void KviDccFileTransfer::connected()
 	if(m_pDescriptor->bRecvFile)
 	{
 		KviDccRecvThreadOptions * o = new KviDccRecvThreadOptions;
-		o->szFileName      = m_pDescriptor->szLocalFileName.utf8().data();
+		o->szFileName      = m_pDescriptor->szLocalFileName.toUtf8().data();
 		bool bOk;
 		o->iTotalFileSize  = m_pDescriptor->szFileSize.toInt(&bOk);
 		if(!bOk)o->iTotalFileSize = -1;
@@ -1710,7 +1710,7 @@ void KviDccFileTransfer::connected()
 		m_pSlaveRecvThread->start();
 	} else {
 		KviDccSendThreadOptions * o = new KviDccSendThreadOptions;
-		o->szFileName      = m_pDescriptor->szLocalFileName.utf8().data();
+		o->szFileName      = m_pDescriptor->szLocalFileName.toUtf8().data();
 		o->bFastSend       = KVI_OPTION_BOOL(KviOption_boolUseFastDccSend);
 		o->iIdleStepLengthInMSec = KVI_OPTION_BOOL(KviOption_boolDccSendForceIdleStep) ? KVI_OPTION_UINT(KviOption_uintDccSendIdleStepInMSec) : 0;
 		bool bOk;
@@ -1736,10 +1736,10 @@ void KviDccFileTransfer::connected()
 
 bool KviDccFileTransfer::resumeAccepted(const char *filename,const char *port,const char *szZeroPortTag)
 {
-	if(!(kvi_strEqualCI(filename,m_pDescriptor->szFileName.utf8().data()) || KVI_OPTION_BOOL(KviOption_boolAcceptBrokenFileNameDccResumeRequests)))
+	if(!(kvi_strEqualCI(filename,m_pDescriptor->szFileName.toUtf8().data()) || KVI_OPTION_BOOL(KviOption_boolAcceptBrokenFileNameDccResumeRequests)))
 		return false;
 
-	if(!(kvi_strEqualCI(port,m_pDescriptor->szPort.utf8().data()) &&
+	if(!(kvi_strEqualCI(port,m_pDescriptor->szPort.toUtf8().data()) &&
 			(!m_pSlaveRecvThread) && m_pDescriptor->bResume && m_pDescriptor->bRecvFile && m_pResumeTimer))
 		return false;
 
@@ -1757,8 +1757,8 @@ bool KviDccFileTransfer::resumeAccepted(const char *filename,const char *port,co
 	listenOrConnect();
 
 	/*
-	int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.utf8().data(),
-					m_pDescriptor->szPort.utf8().data(),m_pDescriptor->bDoTimeout);
+	int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),
+					m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
 
 	if(ret != KviError_success)handleMarshalError(ret);
 	else {
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp
index 84c9af0c2..acec18073 100644
--- a/src/modules/dcc/utils.cpp
+++ b/src/modules/dcc/utils.cpp
@@ -43,7 +43,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin
 		KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).stripWhiteSpace();
 		if(!KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).isEmpty())
 		{
-			if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data()))
+			if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
 			{
 				if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface),"0.0.0.0"))
 				{
@@ -51,7 +51,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin
 					if(!kvi_getLocalHostAddress(szListenIp))
 					{
 						if(c)c->warning(__tr2qs_ctx("Can't retrieve a suitable local IPV4 address","dcc"),
-								KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data());
+								KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data());
 						return false;
 					}
 				} else {
@@ -60,16 +60,16 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin
 				return true;
 			}
 #ifdef COMPILE_IPV6_SUPPORT
-			if(kvi_isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data()))
+			if(kvi_isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
 			{
 				szListenIp = KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface);
 			} else {
 #endif
-				if(!kvi_getInterfaceAddress(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data(),szListenIp))
+				if(!kvi_getInterfaceAddress(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data(),szListenIp))
 				{
 					KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault) = false;
 					if(c)c->warning(__tr2qs_ctx("Can't listen on default interface '%s': fix it in the options dialog, disabling the option (so the next dcc will work)","dcc"),
-							KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data());
+							KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data());
 					return false;
 				}
 #ifdef COMPILE_IPV6_SUPPORT
@@ -111,7 +111,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
 		KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).stripWhiteSpace();
 		if(!KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).isEmpty())
 		{
-			if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data()))
+			if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
 			{
 				if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface),"0.0.0.0"))
 				{
@@ -119,7 +119,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
 					if(!kvi_getLocalHostAddress(szListenIp))
 					{
 						if(c)c->warning(__tr2qs_ctx("Can't retrieve a suitable local IPV4 address","dcc"),
-								KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data());
+								KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data());
 						return false;
 					}
 				} else {
@@ -128,16 +128,16 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
 				return true;
 			}
 #ifdef COMPILE_IPV6_SUPPORT
-			if(kvi_isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data()))
+			if(kvi_isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
 			{
 				szListenIp = KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface);
 			} else {
 #endif
-				if(!kvi_getInterfaceAddress(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data(),szListenIp))
+				if(!kvi_getInterfaceAddress(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data(),szListenIp))
 				{
 					KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault) = false;
 					if(c)c->warning(__tr2qs_ctx("Can't listen on default interface '%s': fix it in the options dialog, disabling the option (so the next dcc will work)","dcc"),
-							KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).utf8().data());
+							KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data());
 					return false;
 				}
 #ifdef COMPILE_IPV6_SUPPORT
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 96ab3dd54..d92908953 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -734,7 +734,7 @@ void KviDccVoice::startConnection()
 	} else {
 		// ACTIVE CONNECTION
 		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Attempting an active DCC VOICE connection","dcc"));
-		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data(),m_pDescriptor->bDoTimeout);
+		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
 		if(ret != KviError_success)handleMarshalError(ret);
 	}
 }
@@ -771,20 +771,20 @@ const QString & KviDccVoice::target()
 {
 	// This may change on the fly...
 	m_szTarget.sprintf("%s@%s:%s",
-		m_pDescriptor->szNick.utf8().data(),m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data());
+		m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 	return m_szTarget;
 }
 
 void KviDccVoice::getBaseLogFileName(KviStr &buffer)
 {
-	buffer.sprintf("dccvoice_%s_%s_%s",m_pDescriptor->szNick.utf8().data(),m_pDescriptor->szLocalFileName.utf8().data(),m_pDescriptor->szPort.utf8().data());
+	buffer.sprintf("dccvoice_%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szLocalFileName.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 }
 
 void KviDccVoice::fillCaptionBuffers()
 {
 	KviStr tmp(KviStr::Format,"DCC Voice %s@%s:%s %s",
-		m_pDescriptor->szNick.utf8().data(),m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data(),
-		m_pDescriptor->szLocalFileName.utf8().data());
+		m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),
+		m_pDescriptor->szLocalFileName.toUtf8().data());
 
 	m_szPlainTextCaption = tmp;
 
@@ -926,7 +926,7 @@ void KviDccVoice::connected()
 	opt->bForceHalfDuplex = KVI_OPTION_BOOL(KviOption_boolDccVoiceForceHalfDuplex);
 //	opt->bForceDummyReadTrigger = false;
 	opt->iPreBufferSize = KVI_OPTION_UINT(KviOption_uintDccVoicePreBufferSize);
-	opt->szSoundDevice = KVI_OPTION_STRING(KviOption_stringDccVoiceSoundDevice).utf8().data();
+	opt->szSoundDevice = KVI_OPTION_STRING(KviOption_stringDccVoiceSoundDevice).toUtf8().data();
 	opt->iSampleRate = m_pDescriptor->iSampleRate;
 
 	m_pSlaveThread = new KviDccVoiceThread(this,m_pMarshal->releaseSocket(),opt);
@@ -964,7 +964,7 @@ int KviDccVoice::getMixerVolume(void) const
 	int left; //, right;
 	int req;
 
-	if((fd = ::open(KVI_OPTION_STRING(KviOption_stringDccVoiceMixerDevice).utf8().data(), O_RDONLY)) == -1)
+	if((fd = ::open(KVI_OPTION_STRING(KviOption_stringDccVoiceMixerDevice).toUtf8().data(), O_RDONLY)) == -1)
 	{
 		return 0;
 	}
@@ -995,7 +995,7 @@ void KviDccVoice::setMixerVolume(int vol)
 	int val;
 	int req;
 
-	if((fd = ::open(KVI_OPTION_STRING(KviOption_stringDccVoiceMixerDevice).utf8().data(), O_WRONLY)) == -1)
+	if((fd = ::open(KVI_OPTION_STRING(KviOption_stringDccVoiceMixerDevice).toUtf8().data(), O_WRONLY)) == -1)
 		return;
 
 	req = KVI_OPTION_BOOL(KviOption_boolDccVoiceVolumeSliderControlsPCM) ? SOUND_MIXER_WRITE_PCM : SOUND_MIXER_WRITE_VOLUME;