killed some QString helpers. Pay attention to the localizations: format strings have changed!;

updated translation files; git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5328 17fca916-40b9-46aa-a4ea-0a15b648b75c
author: Elvio Basello 2011-01-10 18:36:59 +0000
committer: Elvio Basello 2011-01-10 18:36:59 +0000
commit: 78735b180c2ba56fa1cf4fd578726d457626e80a (patch)
tree: 12b359e1e59b7585dc89878e2eeae54982baa4e1 /src/modules
parent: updated perlcore's xs include, hopefully fixing #1068 (diff)
download: KVIrc-78735b180c2ba56fa1cf4fd578726d457626e80a.tar.gz
KVIrc-78735b180c2ba56fa1cf4fd578726d457626e80a.tar.bz2
KVIrc-78735b180c2ba56fa1cf4fd578726d457626e80a.zip
30 files changed, 144 insertions, 232 deletions
diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 9621b834f..cd56b2121 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -32,7 +32,6 @@
 #include "KviScriptEditor.h"
 #include "kvi_debug.h"
 #include "KviApplication.h"
-#include "KviQString.h"
 #include "KviKvsAliasManager.h"
 #include "KviFileDialog.h"
 #include "KviActionManager.h"
@@ -755,18 +754,18 @@ void ActionEditor::deleteActions()
 
 QString ActionEditor::nameForAutomaticAction(const QString &szTemplate)
 {
-	QString ret;
+	QString szRet;
 	QString szT = szTemplate;
 	szT.replace(" ","");
 	szT.replace(".","_");
 
 	int i = 1;
 	do {
-		KviQString::sprintf(ret,"%Q%d",&szT,i);
+		szRet = QString("%1%2").arg(szT).arg(i);
 		i++;
-	} while(actionExists(ret));
+	} while(actionExists(szRet));
 
-	return ret;
+	return szRet;
 }
 
 void ActionEditor::newAction()
diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp
index 4cad53710..8f1643071 100644
--- a/src/modules/addon/AddonFunctions.cpp
+++ b/src/modules/addon/AddonFunctions.cpp
@@ -65,7 +65,7 @@ namespace AddonFunctions
 		if(!r.readHeader(szAddonPackageFileName))
 		{
 			szErr = r.lastError();
-			KviQString::sprintf(szError,__tr2qs_ctx("The selected file does not seem to be a valid KVIrc package: %Q","addon"),&szErr);
+			szError = QString(__tr2qs_ctx("The selected file does not seem to be a valid KVIrc package: %Q","addon")).arg(szErr);
 			return false;
 		}
 
@@ -143,42 +143,31 @@ namespace AddonFunctions
 			szWarnings += "</b></font></center></p>";
 		}
 
-		KviQString::sprintf(hd.szHtmlText,
+		hd.szHtmlText = QString(
 			"<html bgcolor=\"#ffffff\">" \
 				"<body bgcolor=\"#ffffff\">" \
 					"<p><center>" \
-						"<h2>%Q %Q</h2>" \
+						"<h2>%1 %2</h2>" \
 					"</center></p>" \
 					"<p><center>" \
 						"<img src=\"addon_dialog_pack_image\">" \
 					"</center></p>" \
 					"<p><center>" \
-						"<i>%Q</i>" \
+						"<i>%3</i>" \
 					"</center></p>" \
 					"<p><center>" \
-						"%Q: <b>%Q</b><br>" \
-						"%Q: <b>%Q</b><br>" \
+						"%4: <b>%5</b><br>" \
+						"%6: <b>%7</b><br>" \
 					"</center></p>" \
 					"<p><center>" \
 						"<font color=\"#808080\">" \
-							"%Q: %Q<br>" \
+							"%8: %9<br>" \
 						"</font>" \
 					"</center></p>" \
-					"%Q" \
+					"%10" \
 					"<br>" \
 				"</body>" \
-			"</html>",
-			&szPackageName,
-			&szPackageVersion,
-			&szPackageDescription,
-			&szAuthor,
-			&szPackageAuthor,
-			&szCreatedAt,
-			&szPackageDate,
-			&szCreatedWith,
-			&szPackageApplication,
-			&szWarnings
-		);
+			"</html>").arg(szPackageName,szPackageVersion,szPackageDescription,szAuthor,szPackageAuthor,szCreatedAt,szPackageDate,szCreatedWith,szPackageApplication).arg(szWarnings);
 
 		hd.addImageResource("addon_dialog_pack_image",pix);
 		hd.addHtmlResource("addon_dialog_main",hd.szHtmlText);
@@ -224,7 +213,7 @@ namespace AddonFunctions
 		if(!r.unpack(szAddonPackageFileName,szUnpackPath))
 		{
 			szErr = r.lastError();
-			KviQString::sprintf(szError,__tr2qs_ctx("Failed to unpack the selected file: %Q","addon"),&szErr);
+			szError = QString(__tr2qs_ctx("Failed to unpack the selected file: %1","addon")).arg(szErr);
 			return false;
 		}
 
@@ -240,7 +229,7 @@ namespace AddonFunctions
 		{
 			// FIXME: Just warn the user and assume success?
 			szErr = __tr2qs_ctx("One or more files can't be deleted","addon");
-			KviQString::sprintf(szError,__tr2qs_ctx("Failed to unpack the selected file: %Q","addon"),&szErr);
+			szError = QString(__tr2qs_ctx("Failed to unpack the selected file: %1","addon")).arg(szErr);
 			return false;
 		}
 
diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp
index a3924d71d..db26d61c5 100644
--- a/src/modules/aliaseditor/AliasEditorWindow.cpp
+++ b/src/modules/aliaseditor/AliasEditorWindow.cpp
@@ -747,7 +747,7 @@ void AliasEditorWidget::exportSelectionInSinglesFiles(KviPointerList<AliasEditor
 		if (KviFileUtils::fileExists(szCompletePath) && !bReplaceAll)
 		{
 			QString szMsg;
-			KviQString::sprintf(szMsg,__tr2qs_ctx("The file \"%Q\" exists. Do you want to replace it ?","editor"),&szFileName);
+			szMsg = QString(__tr2qs_ctx("The file \"%1\" exists. Do you want to replace it?","editor")).arg(szFileName);
 			int ret = QMessageBox::question(this,__tr2qs_ctx("Replace file","editor"),szMsg,__tr2qs_ctx("Yes","editor"),__tr2qs_ctx("Yes to All","editor"),__tr2qs_ctx("No","editor"));
 			if (ret!=2)
 			{
@@ -923,9 +923,9 @@ bool AliasEditorWidget::removeItem(AliasEditorTreeWidgetItem *it,bool * pbYesToA
 	if(!*pbYesToAll)
 	{
 		if(it->isAlias())
-			KviQString::sprintf(szMsg,__tr2qs_ctx("Do you really want to remove the alias \"%Q\" ?","editor"),&szName);
+			szMsg = QString(__tr2qs_ctx("Do you really want to remove the alias \"%1\"?","editor")).arg(szName);
 		else {
-			KviQString::sprintf(szMsg,__tr2qs_ctx("Do you really want to remove the namespace \"%Q\" ?","editor"),&szName);
+			szMsg = QString(__tr2qs_ctx("Do you really want to remove the namespace \"%1\"?","editor")).arg(szName);
 			szMsg += "<br>";
 			szMsg += __tr2qs_ctx("Please note that all the children items will be deleted too.","editor");
 		}
diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp
index a3f6ee7cc..64c4255c3 100644
--- a/src/modules/classeditor/ClassEditorWindow.cpp
+++ b/src/modules/classeditor/ClassEditorWindow.cpp
@@ -1334,15 +1334,15 @@ bool ClassEditorWidget::removeItem(ClassEditorTreeWidgetItem * pItem, KviPointer
 		saveLastEditedItem();
 		if(pItem->isClass())
 		{
-			KviQString::sprintf(szMsg,__tr2qs_ctx("Do you really want to remove the class \"%Q\" ?","editor"),&szName);
+			szMsg = QString(__tr2qs_ctx("Do you really want to remove the class \"%1\"?","editor")).arg(szName);
 		} else if(pItem->isNamespace())
 		{
-			KviQString::sprintf(szMsg,__tr2qs_ctx("Do you really want to remove the namespace \"%Q\" ?","editor"),&szName);
+			szMsg = QString(__tr2qs_ctx("Do you really want to remove the namespace \"%1\"?","editor")).arg(szName);
 			szMsg += "<br>";
 			szMsg += __tr2qs_ctx("Please note that all the children classes/functions will be deleted too.","editor");
 		} else if(pItem->isMethod())
 		{
-			KviQString::sprintf(szMsg,__tr2qs_ctx("Do you really want to remove the function \"%Q\" ?","editor"),&szName);
+			szMsg = QString(__tr2qs_ctx("Do you really want to remove the function \"%1\"?","editor")).arg(szName);
 		}
 		
 		g_pClassEditorModule->lock();
@@ -1372,7 +1372,7 @@ bool ClassEditorWidget::removeItem(ClassEditorTreeWidgetItem * pItem, KviPointer
 	{
 		m_pClasses->removeRef(pItem);
 		KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass(buildFullClassName(pItem));
-		qDebug("rimuovo class %s %p",buildFullClassName(pItem).toUtf8().data(), pClass);
+		qDebug("removing class %s %p",buildFullClassName(pItem).toUtf8().data(), pClass);
 		if(pClass)
 			KviKvsKernel::instance()->objectController()->deleteClass(pClass);
 		else
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index 920756e21..9f6d77cc2 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -1003,7 +1003,7 @@ DccFileTransfer::DccFileTransfer(DccDescriptor * dcc)
 	m_pResumeTimer = 0;
 	m_pBandwidthDialog = 0;
 
-	KviQString::sprintf(m_szTransferIdString,__tr2qs_ctx("TRANSFER %d","dcc"),id());
+	m_szTransferIdString = QString(__tr2qs_ctx("TRANSFER %1","dcc")).arg(id());
 
 	m_pDescriptor = dcc;
 	m_pDescriptor->setTransfer(this);
@@ -1911,8 +1911,7 @@ bool DccFileTransfer::event(QEvent *e)
 				// Also add an optional message to the notifier, unless it is an AVATAR download!
 				if(KVI_OPTION_BOOL(KviOption_boolNotifiDccDownloadSuccessInNotifier))
 				{
-					QString szMsg;
-					KviQString::sprintf(szMsg,__tr2qs_ctx(""));
+					QString szMsg = __tr2qs_ctx("");
 					g_pApp->notifierMessage(0,KVI_SMALLICON_DCCMSG,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 				}
 				*/
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 232c7a441..5ad4aa458 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -98,9 +98,7 @@ static bool dcc_module_check_concurrent_transfers_limit(KviDccRequest * dcc)
 		unsigned int uTransfers = DccFileTransfer::runningTransfersCount();
 		if(uTransfers >= KVI_OPTION_UINT(KviOption_uintMaxDccSendTransfers))
 		{
-			QString szError;
-			KviQString::sprintf(szError,__tr2qs_ctx("Concurrent transfer limit reached (%u of %u transfers running)","dcc"),
-				uTransfers,KVI_OPTION_UINT(KviOption_uintMaxDccSendTransfers));
+			QString szError = QString(__tr2qs_ctx("Concurrent transfer limit reached (%1 of %2 transfers running)","dcc")).arg(uTransfers).arg(KVI_OPTION_UINT(KviOption_uintMaxDccSendTransfers));
 			dcc_module_request_error(dcc,szError);
 			return false;
 		}
@@ -115,9 +113,7 @@ static bool dcc_module_check_limits(KviDccRequest * dcc)
 		unsigned int uWindows = g_pDccBroker->dccWindowsCount();
 		if(uWindows >= KVI_OPTION_UINT(KviOption_uintMaxDccSlots))
 		{
-			QString szError;
-			KviQString::sprintf(szError,__tr2qs_ctx("Slot limit reached (%u slots of %u)","dcc"),
-				uWindows,KVI_OPTION_UINT(KviOption_uintMaxDccSlots));
+			QString szError = QString(__tr2qs_ctx("Slot limit reached (%1 slots of %2)","dcc")).arg(uWindows).arg(KVI_OPTION_UINT(KviOption_uintMaxDccSlots));
 			dcc_module_request_error(dcc,szError);
 			return false;
 		}
@@ -160,8 +156,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviCString &ipa
 	{
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
-			QString szError;
-			KviQString::sprintf(szError,__tr2qs_ctx("Invalid port number %s","dcc"),port.ptr());
+			QString szError = QString(__tr2qs_ctx("Invalid port number %1","dcc")).arg(port.ptr());
 			dcc_module_request_error(dcc,szError);
 		}
 		return false;
@@ -177,8 +172,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviCString &ipa
 		{
 			if(!dcc->ctcpMsg->msg->haltOutput())
 			{
-				QString szError;
-				KviQString::sprintf(szError,__tr2qs_ctx("Invalid IP address in old format %s","dcc"),ipaddr.ptr());
+				QString szError = QString(__tr2qs_ctx("Invalid IP address in old format %1","dcc")).arg(ipaddr.ptr());
 				dcc_module_request_error(dcc,szError);
 			}
 			return false;
@@ -198,8 +192,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviCString &ipa
 #endif
 			if(!dcc->ctcpMsg->msg->haltOutput())
 			{
-				QString szError;
-				KviQString::sprintf(szError,__tr2qs_ctx("Invalid IP address %s","dcc"),ipaddr.ptr());
+				QString szError = QString(__tr2qs_ctx("Invalid IP address %1","dcc")).arg(ipaddr.ptr());
 				dcc_module_request_error(dcc,szError);
 			}
 			return false;
@@ -546,8 +539,7 @@ static void dccModuleParseDccAccept(KviDccRequest *dcc)
 		//#warning "IF KviOption_boolReplyCtcpErrmsgOnInvalidAccept..."
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
-			QString szError;
-			KviQString::sprintf(szError,__tr2qs_ctx("Can't proceed with DCC RECV: Transfer not initiated for file %s on port %s","dcc"),dcc->szParam1.ptr(),dcc->szParam2.ptr());
+			QString szError = QString(__tr2qs_ctx("Can't proceed with DCC RECV: Transfer not initiated for file %1 on port %2","dcc")).arg(dcc->szParam1.ptr()).arg(dcc->szParam2.ptr());
 			dcc_module_request_error(dcc,szError);
 		}
 	}
@@ -572,8 +564,7 @@ static void dccModuleParseDccResume(KviDccRequest *dcc)
 	{
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
-			QString szError;
-			KviQString::sprintf(szError,__tr2qs_ctx("Invalid resume position argument '%s'","dcc"),dcc->szParam3.ptr());
+			QString szError = QString(__tr2qs_ctx("Invalid resume position argument '%1'","dcc")).arg(dcc->szParam3.ptr());
 			dcc_module_request_error(dcc,szError);
 		}
 		return;
@@ -584,10 +575,7 @@ static void dccModuleParseDccResume(KviDccRequest *dcc)
 		//#warning "IF KviOption_boolReplyCtcpErrmsgOnInvalidResume..."
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
-			QString szError;
-			KviQString::sprintf(szError,
-					__tr2qs_ctx("Can't proceed with DCC SEND: Transfer not initiated for file %s on port %s, or invalid resume size","dcc"),
-					dcc->szParam1.ptr(),dcc->szParam2.ptr());
+			QString szError = QString(__tr2qs_ctx("Can't proceed with DCC SEND: Transfer not initiated for file %1 on port %2, or invalid resume size","dcc")).arg(dcc->szParam1.ptr()).arg(dcc->szParam2.ptr());
 			dcc_module_request_error(dcc,szError);
 		}
 	}
@@ -649,9 +637,7 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
 		if(uResumeSize >= o->fileSize())
 		{
 			// senseless request
-			QString szError;
-			KviQString::sprintf(szError,
-					__tr2qs_ctx("Invalid RECV request: Position %u is is larger than file size","dcc"),uResumeSize);
+			QString szError = QString(__tr2qs_ctx("Invalid RECV request: Position %1 is is larger than file size","dcc")).arg(uResumeSize);
 			dcc_module_request_error(dcc,szError);
 			return;
 		}
@@ -867,13 +853,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
 	{
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
-			QString szError;
-			KviQString::sprintf(szError,
-					__tr2qs_ctx("No file offer named '%s' (with size %s) available for %Q [%Q@%Q]","dcc"),
-					dcc->szParam1.ptr(),uSize > 0 ? dcc->szParam2.ptr() : __tr_ctx("\"any\"","dcc"),
-					&(dcc->ctcpMsg->pSource->nick()),
-					&(dcc->ctcpMsg->pSource->user()),
-					&(dcc->ctcpMsg->pSource->host()));
+			QString szError = QString(__tr2qs_ctx("No file offer named '%1' (with size %2) available for %3 [%4@%5]","dcc")).arg(dcc->szParam1.ptr()).arg(uSize > 0 ? dcc->szParam2.ptr() : __tr_ctx("\"any\"","dcc")).arg(dcc->ctcpMsg->pSource->nick(),dcc->ctcpMsg->pSource->user(),dcc->ctcpMsg->pSource->host());
 			dcc_module_request_error(dcc,szError);
 		}
 		return;
@@ -1245,9 +1225,7 @@ KVIMODULEEXPORTFUNC void dccModuleCtcpDccParseRoutine(KviDccRequest *dcc)
 	// ops...we don't know this dcc type
 	if(!dcc->ctcpMsg->msg->haltOutput())
 	{
-		QString szError;
-		KviQString::sprintf(szError,
-				__tr2qs_ctx("Unknown DCC type '%s'","dcc"),dcc->szType.ptr());
+		QString szError = QString(__tr2qs_ctx("Unknown DCC type '%1'","dcc")).arg(dcc->szType.ptr());
 		dcc_module_request_error(dcc,szError);
 	}
 }
diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp
index b01771d58..81c78304b 100644
--- a/src/modules/editor/ScriptEditorImplementation.cpp
+++ b/src/modules/editor/ScriptEditorImplementation.cpp
@@ -503,8 +503,7 @@ bool ScriptEditorWidget::contextSensitiveHelp() const
 	g_pUserParser->freeCompletionResult(pList);
 	if(!bOk)return false;
 
-	QString szParse;
-	KviQString::sprintf(szParse,"timer -s (help,0){ help -s %Q; }",&szBuffer);
+	QString szParse = QString("timer -s (help,0){ help -s %Q; }").arg(szBuffer);
 	qDebug("parsing %s",szParse.toLatin1());
 	KviKvsScript::run(szParse,(KviWindow*)g_pApp->activeConsole());
 	*/
@@ -932,7 +931,7 @@ void ScriptEditorImplementation::saveToFile()
 			QString szTmp;
 			QMessageBox::warning(this,
 				__tr2qs_ctx("Save Failed - KVIrc","editor"),
-				KviQString::sprintf(szTmp,__tr2qs_ctx("Can't open the file %s for writing.","editor"),&szFileName));
+				szTmp = QString(__tr2qs_ctx("Can't open the file %1 for writing.","editor")).arg(szFileName));
 		}
 	}
 }
@@ -989,8 +988,7 @@ void ScriptEditorImplementation::updateRowColLabel()
 		return;
 	int iRow = m_pEditor->textCursor().blockNumber();
 	int iCol = m_pEditor->textCursor().columnNumber();
-	QString szTmp;
-	KviQString::sprintf(szTmp,__tr2qs_ctx("Row: %d Col: %d","editor"),iRow,iCol);
+	QString szTmp = QString(__tr2qs_ctx("Row: %1 Col: %2","editor")).arg(iRow).arg(iCol);
 	m_pRowColLabel->setText(szTmp);
 	m_lastCursorPos = m_pEditor->textCursor().position();
 }
@@ -1021,7 +1019,7 @@ void ScriptEditorImplementation::loadFromFile()
 			QString szTmp;
 			QMessageBox::warning(this,
 				__tr2qs_ctx("Open Failed - KVIrc","editor"),
-				KviQString::sprintf(szTmp,__tr2qs_ctx("Can't open the file %s for reading.","editor"),&szFileName));
+				szTmp = QString(__tr2qs_ctx("Can't open the file %1 for reading.","editor")).arg(szFileName));
 		}
 	}
 }
diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index a7354c7e4..46fbdb0ac 100644
--- a/src/modules/eventeditor/EventEditorWindow.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -259,7 +259,7 @@ void EventEditor::getUniqueHandlerName(EventEditorEventTreeWidgetItem *it,QStrin
 			if(KviQString::equalCI(newName,((EventEditorHandlerTreeWidgetItem *)it->child(i))->m_szName))
 			{
 				bFound = true;
-				KviQString::sprintf(newName,"%Q_%d",&buffer,idx);
+				newName = QString("%1_%2").arg(buffer).arg(idx);
 				idx++;
 				break;
 			}
@@ -342,7 +342,7 @@ void EventEditor::commit()
 			for(int j=0;j<ccount;j++)
 			{
 				QTreeWidgetItem * ch = it->child(j);
-				KviQString::sprintf(szContext,"%Q::%Q",&(((EventEditorEventTreeWidgetItem *)it)->m_szName),&(((EventEditorHandlerTreeWidgetItem *)ch)->m_szName));
+				szContext = QString("%1::%2").arg(((EventEditorEventTreeWidgetItem *)it)->m_szName,((EventEditorHandlerTreeWidgetItem *)ch)->m_szName);
 				KviKvsScriptEventHandler * s = KviKvsScriptEventHandler::createInstance( // msvc workaround
 						((EventEditorHandlerTreeWidgetItem *)ch)->m_szName,
 						szContext,
@@ -409,10 +409,8 @@ void EventEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
 		if(parms.isEmpty())parms = __tr2qs_ctx("none","editor");
 		KviCommandFormatter::indent(parms);
 		KviCommandFormatter::indent(parms);
-		QString tmp;
-		KviQString::sprintf(tmp,__tr2qs_ctx("\n\nEvent:\n%s\n\nParameters:\n%s","editor"),
-			((EventEditorEventTreeWidgetItem *)it)->m_szName.toUtf8().data(),parms.toUtf8().data());
-		m_pEditor->setText(tmp);
+		QString szTmp = QString(__tr2qs_ctx("\n\nEvent:\n%1\n\nParameters:\n%2","editor")).arg(((EventEditorEventTreeWidgetItem *)it)->m_szName,parms);
+		m_pEditor->setText(szTmp);
 	}
 }
 
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 60dd9af8e..06cb87516 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -606,19 +606,18 @@ void FileTransferWindow::openLocalFileTerminal()
 
 void FileTransferWindow::deleteLocalFile()
 {
-	KviFileTransfer * t = selectedTransfer();
-	if(!t)return;
-
-	QString fName = t->localFileName();
-	QString tmp;
+	KviFileTransfer * pTransfer = selectedTransfer();
+	if(!pTransfer)
+		return;
 
-	KviQString::sprintf(tmp,__tr2qs_ctx("Do you really want to delete the file %Q?","filetransferwindow"),&fName);
+	QString szName = pTransfer->localFileName();
+	QString szTmp = QString(__tr2qs_ctx("Do you really want to delete the file %1?","filetransferwindow")).arg(szName);
 
 	if(QMessageBox::warning(this,__tr2qs_ctx("Confirm delete","filetransferwindow"),
-			tmp,__tr2qs_ctx("Yes","filetransferwindow"),__tr2qs_ctx("No","filetransferwindow")) != 0)
+			szTmp,__tr2qs_ctx("Yes","filetransferwindow"),__tr2qs_ctx("No","filetransferwindow")) != 0)
 		return;
 
-	if(!QFile::remove(fName))
+	if(!QFile::remove(szName))
 		QMessageBox::warning(this,__tr2qs_ctx("Delete failed","filetransferwindow"),
 			__tr2qs_ctx("Failed to remove the file","filetransferwindow"),
 			__tr2qs_ctx("OK","filetransferwindow"));
@@ -760,30 +759,28 @@ void FileTransferWindow::heartbeat()
 
 void FileTransferWindow::clearAll()
 {
-	QString tmp;
-
 	bool bHaveAllTerminated = true;
 	int i;
-	FileTransferItem * item;
+	FileTransferItem * pItem;
 
-	for(i=0;i<m_pTableWidget->rowCount();i++)
+	for(i=0; i < m_pTableWidget->rowCount(); i++)
 	{
-		item = (FileTransferItem *)m_pTableWidget->item(i,0);
-		if(!item)
+		pItem = (FileTransferItem *)m_pTableWidget->item(i,0);
+		if(!pItem)
 			continue;
 
-		if(!item->transfer()->terminated())
+		if(!pItem->transfer()->terminated())
 		{
 			bHaveAllTerminated = false;
 			break;
 		}
 	}
 
-	KviQString::sprintf(tmp,__tr2qs_ctx("Clear all transfers, including any in progress?","filetransferwindow"));
+	QString szTmp = __tr2qs_ctx("Clear all transfers, including any in progress?","filetransferwindow");
 
 	// If any transfer is active asks for confirm
 	if(!bHaveAllTerminated)
-		if(QMessageBox::warning(this,__tr2qs_ctx("Clear All Transfers? - KVIrc","filetransferwindow"), tmp,__tr2qs_ctx("Yes","filetransferwindow"),__tr2qs_ctx("No","filetransferwindow")) != 0)
+		if(QMessageBox::warning(this,__tr2qs_ctx("Clear All Transfers? - KVIrc","filetransferwindow"), szTmp,__tr2qs_ctx("Yes","filetransferwindow"),__tr2qs_ctx("No","filetransferwindow")) != 0)
 			return;
 
 	KviFileTransferManager::instance()->killAllTransfers();
diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp
index eb92bc761..dacd5b01a 100644
--- a/src/modules/links/LinksWindow.cpp
+++ b/src/modules/links/LinksWindow.cpp
@@ -30,7 +30,6 @@
 #include "kvi_out.h"
 #include "KviOptions.h"
 #include "KviLocale.h"
-#include "KviQString.h"
 #include "kvi_out.h"
 #include "KviMircCntrl.h"
 #include "KviThemedLabel.h"
@@ -130,9 +129,8 @@ void LinksWindow::connectionStateChange()
 	m_pRequestButton->setEnabled(st == KviIrcContext::Connected);
 	if(st == KviIrcContext::Connected)
 	{
-		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);
+		QString szTmp = QString(__tr2qs("Connected to %1 (%2)")).arg(m_pConsole->connection()->currentServerName(),m_pConsole->currentNetworkName());
+		m_pInfoLabel->setText(szTmp);
 	} else {
 		m_pInfoLabel->setText(__tr2qs("Links cannot be requested: Not connected to a server"));
 	}
@@ -159,7 +157,7 @@ QSize LinksWindow::sizeHint() const
 
 void LinksWindow::fillCaptionBuffers()
 {
-	KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Links for %Q [IRC Context %u]"),&m_szRootServer,m_pConsole->context()->id());
+	m_szPlainTextCaption = QString(__tr2qs("Links for %1 [IRC Context %2]")).arg(m_szRootServer).arg(m_pConsole->context()->id());
 }
 
 void LinksWindow::die()
@@ -234,21 +232,20 @@ void LinksWindow::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++;
-				QString tmp;
-				KviQString::sprintf(tmp,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->parent.ptr());
+				QString szTmp = QString(__tr2qs("%1: Parent link %2")).arg(l->description.ptr(),l->parent.ptr());
 				KviCString tmp2(KviCString::Format,"%d",l->hops);
 				if(root)
 				{
 					it = new QTreeWidgetItem(root);
 					it->setText(0,QString(l->host.ptr()));
 					it->setText(1,QString(tmp2.ptr()));
-					it->setText(2,tmp);
+					it->setText(2,szTmp);
 				} else {
 					outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("Warning: No root link was sent by the server, the stats may be invalid."));
 					it = new QTreeWidgetItem(m_pListView);
 					it->setText(0,QString(l->host.ptr()));
 					it->setText(1,QString(tmp2.ptr()));
-					it->setText(2,tmp);
+					it->setText(2,szTmp);
 				}
 			} else {
 				it = (QTreeWidgetItem*) it->parent();
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index c45601b51..9497774f2 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -36,7 +36,6 @@
 #include "KviOptions.h"
 #include "KviIrcConnection.h"
 #include "KviIrcConnection.h"
-#include "KviQString.h"
 #include "KviTopicWidget.h"
 #include "KviConfigurationFile.h"
 #include "KviFileDialog.h"
@@ -293,11 +292,9 @@ void ListWindow::connectionStateChange()
 	m_pRequestButton->setEnabled(st == KviIrcContext::Connected);
 	if(st == KviIrcContext::Connected)
 	{
-		QString szTmp;
-		KviQString::sprintf(szTmp,
-				__tr2qs("Connected to %s (%s)"),
-				m_pConsole->connection()->currentServerName().toUtf8().data(),
-				m_pConsole->currentNetworkName().toUtf8().data());
+		QString szTmp = QString(__tr2qs("Connected to %1 (%2)")).arg(
+			m_pConsole->connection()->currentServerName(),
+			m_pConsole->currentNetworkName());
 		m_pInfoLabel->setText(szTmp);
 	} else {
 		m_pInfoLabel->setText(__tr2qs("List cannot be requested: Not connected to a server"));
@@ -323,7 +320,7 @@ QSize ListWindow::sizeHint() const
 
 void ListWindow::fillCaptionBuffers()
 {
-	KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Channel List [IRC Context %u]"),m_pConsole->context()->id());
+	m_szPlainTextCaption = QString(__tr2qs("Channel List [IRC Context %1]")).arg(m_pConsole->context()->id());
 }
 
 void ListWindow::die()
@@ -357,8 +354,7 @@ void ListWindow::exportList()
 				szDate = date.toString(Qt::SystemLocaleDate);
 				break;
 		}
-		KviQString::sprintf(szFile,__tr2qs("Channel list for %Q - %Q"),
-			&(connection()->currentNetworkName()),&(szDate));
+		szFile = QString(__tr2qs("Channel list for %1 - %2")).arg(connection()->currentNetworkName(),szDate);
 	} else {
 		szFile = __tr2qs("Channel list");
 	}
diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index 8f98a90ba..495edd1a0 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -301,7 +301,7 @@ void LogViewWindow::filterNext()
 		m_pLastCategory = new LogListViewItemType(m_pListView,pFile->type());
 	}
 
-	KviQString::sprintf(szCurGroup, __tr2qs_ctx("%Q on %Q","logview"), &(pFile->name()), &(pFile->network()));
+	szCurGroup = QString(__tr2qs_ctx("%1 on %2","logview")).arg(pFile->name(),pFile->network());
 
 	if(m_szLastGroup!=szCurGroup)
 	{
diff --git a/src/modules/mediaplayer/MpXmmsInterface.cpp b/src/modules/mediaplayer/MpXmmsInterface.cpp
index 24890f9dc..bab94cbc5 100644
--- a/src/modules/mediaplayer/MpXmmsInterface.cpp
+++ b/src/modules/mediaplayer/MpXmmsInterface.cpp
@@ -132,18 +132,16 @@ void * KviXmmsInterface::lookupSymbol(const char * szSymbolName)
 	{
 		if(!loadPlayerLibrary())
 		{
-			QString tmp;
-			KviQString::sprintf(tmp,__tr2qs_ctx("Can't load the player library (%Q)","mediaplayer"),&m_szPlayerLibraryName);
-			setLastError(tmp);
+			QString szTmp = QString(__tr2qs_ctx("Can't load the player library (%1)","mediaplayer")).arg(m_szPlayerLibraryName);
+			setLastError(szTmp);
 			return 0;
 		}
 	}
 	void * symptr =m_pPlayerLibrary->resolve(szSymbolName);
 	if(!symptr)
 	{
-		QString tmp;
-		KviQString::sprintf(tmp,__tr2qs_ctx("Can't find symbol %s in %Q","mediaplayer"),szSymbolName,&m_szPlayerLibraryName);
-		setLastError(tmp);
+		QString szTmp = QString(__tr2qs_ctx("Can't find symbol %1 in %2","mediaplayer")).arg(szSymbolName,m_szPlayerLibraryName);
+		setLastError(szTmp);
 	}
 	return symptr;
 }
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index c20fb421c..55b49005c 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -62,7 +62,7 @@ static MpInterface * auto_detect_player(KviWindow * pOut = 0)
 			{
 				QString szOut;
 				QString szNam = d->name();
-				KviQString::sprintf(szOut,__tr2qs_ctx("Trying media player interface \"%Q\": score %d","mediaplayer"),&(szNam),iScore);
+				szOut = QString(__tr2qs_ctx("Trying media player interface \"%1\": score %2","mediaplayer")).arg(szNam).arg(iScore);
 				pOut->output(KVI_OUT_MULTIMEDIA,szOut);
 			}
 		}
@@ -88,7 +88,7 @@ static MpInterface * auto_detect_player(KviWindow * pOut = 0)
 				{
 					QString szOut;
 					QString szNam = d->name();
-					KviQString::sprintf(szOut,__tr2qs_ctx("Trying media player interface \"%Q\": score %d","mediaplayer"),&(szNam),iScore);
+					szOut = QString(__tr2qs_ctx("Trying media player interface \"%1\": score %2","mediaplayer")).arg(szNam).arg(iScore);
 					pOut->output(KVI_OUT_MULTIMEDIA,szOut);
 				}
 			}
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 53ec51e5a..17632b397 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -64,7 +64,7 @@ int KviMircServersIniImport::doImport(const QString& filename)
 		QString key;
 		QString entry;
 		do {
-			KviQString::sprintf(key,"n%d",i);
+			key = QString("n%1").arg(i);
 			entry = cfg.readEntry(key,"");
 			if(!entry.isEmpty())
 			{
@@ -111,9 +111,8 @@ int KviMircServersIniImport::doImport(const QString& filename)
 			}
 		} while(!entry.isEmpty());
 	} else {
-		QString tmp;
-		KviQString::sprintf(tmp,__tr2qs("%Q doesn't look like a servers.ini file.\nImport failed."),&filename);
-		QMessageBox::warning(0,__tr2qs("Warning - KVIrc"),tmp);
+		QString szTmp = QString(__tr2qs("%1 doesn't look like a servers.ini file.\nImport failed.")).arg(filename);
+		QMessageBox::warning(0,__tr2qs("Warning - KVIrc"),szTmp);
 	}
 	return iCount;
 }
diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp
index b528ed3e9..c13895448 100644
--- a/src/modules/objects/KvsObject_xmlreader.cpp
+++ b/src/modules/objects/KvsObject_xmlreader.cpp
@@ -159,15 +159,16 @@ private:
 	void decodeException(QString &szMsg,bool bError,const QXmlParseException &exception)
 	{
 		if(bError)
-			KviQString::sprintf(szMsg,__tr2qs_ctx("Error near line %d, column %d","objects"),exception.lineNumber(),exception.columnNumber());
+			szMsg = QString(__tr2qs_ctx("Error near line %1, column %2","objects")).arg(exception.lineNumber()).arg(exception.columnNumber());
 		else
-			KviQString::sprintf(szMsg,__tr2qs_ctx("Warning near line %d, column %d","objects"),exception.lineNumber(),exception.columnNumber());
+			szMsg = QString(__tr2qs_ctx("Warning near line %1, column %2","objects")).arg(exception.lineNumber()).arg(exception.columnNumber());
 		szMsg += ": ";
 		szMsg += exception.message();
 	}
 	bool handleKvsCallReturnValue(KviKvsVariant * pRetVal)
 	{
-		if(!pRetVal->asBoolean())return kvsCodeAbort();
+		if(!pRetVal->asBoolean())
+			return kvsCodeAbort();
 		return true;
 	}
 public:
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index 1066ae6c7..e405b365d 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -559,10 +559,9 @@ void OptionsWidget_identityAvatar::chooseAvatar()
 				} // else loaded!
 			} else {
 				// unloadable
-				QString tmp;
-				KviQString::sprintf(tmp,__tr2qs_ctx("Failed to download the avatar image.<br>" \
-					"<b>%Q</b>","options"),&(dlg.errorMessage()));
-				QMessageBox::warning(this,__tr2qs_ctx("Avatar Download Failed - KVIrc","options"),tmp,QMessageBox::Ok,QMessageBox::NoButton);
+				QString szTmp = QString(__tr2qs_ctx("Failed to download the avatar image.<br>" \
+					"<b>%1</b>","options")).arg(dlg.errorMessage());
+				QMessageBox::warning(this,__tr2qs_ctx("Avatar Download Failed - KVIrc","options"),szTmp,QMessageBox::Ok,QMessageBox::NoButton);
 				szCurrent = "";
 				m_pLocalAvatar->setNull();
 			}
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index c69f63891..92cbd1cfa 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -228,7 +228,7 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	m_pTextEncodingEditor->addItem(__tr2qs_ctx("Use System Encoding","options"));
 	while(d->szName)
 	{
-		KviQString::sprintf(tmp,"%s (%s)",d->szName,d->szDescription);
+		tmp = QString("%1 (%2)").arg(d->szName,d->szDescription);
 		m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp);
 		m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp);
 		if(KviQString::equalCI(d->szName,n->encoding()))srvcurrent = i + 1;
@@ -782,7 +782,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	m_pTextEncodingEditor->addItem(__tr2qs_ctx("Use Network Encoding","options"));
 	while(d->szName)
 	{
-		KviQString::sprintf(tmp,"%s (%s)",d->szName,d->szDescription);
+		tmp = QString("%1 (%2)").arg(d->szName,d->szDescription);
 		m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp);
 		m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp);
 		if(KviQString::equalCI(d->szName,s->encoding()))srvcurrent = i + 1;
diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index b27e690aa..fb44900e6 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -179,15 +179,14 @@ bool KviPerlInterpreter::init()
 	// declaration could be dropped as well...
 	// I just haven't tried :D
 
-	KviQString::sprintf(
-		szInitCode,
+	szInitCode = QString(
 		"{\n" \
 			"package KVIrc;\n" \
 			"require Exporter;\n" \
 			"our @ISA = qw(Exporter);\n" \
 			"1;\n" \
 		"}\n" \
-		"$g_szContext = \"%Q\";\n" \
+		"$g_szContext = \"%1\";\n" \
 		"$g_bExecuteQuiet = 0;\n" \
 		"$SIG{__WARN__} = sub\n" \
 		"{\n" \
@@ -195,8 +194,7 @@ bool KviPerlInterpreter::init()
 		"	($p,$f,$l) = caller;\n" \
 		"	KVIrc::internalWarning(\"At line \".$l.\" of perl code: \");\n" \
 		"	KVIrc::internalWarning(join(' ',@_));\n" \
-		"}\n",
-		&m_szContextName);
+		"}\n").arg(m_szContextName);
 
 	eval_pv(szInitCode.toUtf8().data(),false);
 	return true;
diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp
index 538813fb2..0bf8481a8 100644
--- a/src/modules/popupeditor/PopupEditorWindow.cpp
+++ b/src/modules/popupeditor/PopupEditorWindow.cpp
@@ -1356,7 +1356,7 @@ void PopupEditorWidget::getUniquePopupName(MenuTreeWidgetItem *item,QString &buf
 			if(KviQString::equalCI(newName,ch->m_pPopup->popupName()) && (ch != item))
 			{
 				bFound = true;
-				KviQString::sprintf(newName,"%Q.%d",&buffer,idx);
+				newName = QString("%1.%2").arg(buffer).arg(idx);
 				idx++;
 				break;
 			}
diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index 277c69715..21c3476ce 100644
--- a/src/modules/raweditor/RawEditorWindow.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -203,7 +203,7 @@ void RawEditorWidget::getUniqueHandlerName(RawTreeWidgetItem *it,QString &buffer
 			if(KviQString::equalCI(newName,ch->text(0)))
 			{
 				bFound = true;
-				KviQString::sprintf(newName,"%Q_%d",&buffer,idx);
+				newName = QString("%1_%2").arg(buffer).arg(idx);
 				idx++;
 				break;
 			}
@@ -311,7 +311,7 @@ void RawEditorWidget::commit()
 				ch=(QTreeWidgetItem *)it->child(j);
 				qDebug("Commit handler %s",((RawHandlerTreeWidgetItem *)ch)->text(0).toUtf8().data());
 				//int a=(RawTreeWidgetItem *)it)->m_iIdx;
-				KviQString::sprintf(szContext,"RawEvent%d::%s",&(((RawTreeWidgetItem *)it)->m_iIdx),(((RawHandlerTreeWidgetItem *)ch)->text(0)).toUtf8().data());
+				szContext = QString("RawEvent%1::%2").arg(((RawTreeWidgetItem *)it)->m_iIdx).arg(((RawHandlerTreeWidgetItem *)ch)->text(0));
 				KviKvsScriptEventHandler * s = new KviKvsScriptEventHandler(
 						((RawHandlerTreeWidgetItem *)ch)->text(0),
 						szContext,
@@ -363,10 +363,8 @@ void RawEditorWidget::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
 		m_pNameEditor->setEnabled(false);
 		m_pNameEditor->setText("");
 		m_pEditor->setEnabled(false);
-		QString tmp;
-		KviQString::sprintf(tmp,__tr2qs_ctx("\n\nRaw Event:\n%s","editor"),
-			((RawHandlerTreeWidgetItem *)it)->text(0).toUtf8().data());
-		m_pEditor->setText(tmp);
+		QString szTmp = QString(__tr2qs_ctx("\n\nRaw Event:\n%1","editor")).arg(((RawHandlerTreeWidgetItem *)it)->text(0));
+		m_pEditor->setText(szTmp);
 	}
 }
 
diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp
index b8678759b..c3aae0fd7 100644
--- a/src/modules/reguser/RegisteredUserEntryDialog.cpp
+++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp
@@ -599,7 +599,7 @@ void RegisteredUserEntryDialog::okClicked()
 		u = g_pLocalRegisteredUserDataBase->findUserByName(szNameOk);
 		if(u)
 		{
-			KviQString::sprintf(szNameOk,"%Q%d",&name,idx);
+			szNameOk = QString("%1%2").arg(name).arg(idx);
 			idx++;
 		}
 	} while(u);
diff --git a/src/modules/reguser/RegistrationWizard.cpp b/src/modules/reguser/RegistrationWizard.cpp
index f511fdfdc..5680b9d73 100644
--- a/src/modules/reguser/RegistrationWizard.cpp
+++ b/src/modules/reguser/RegistrationWizard.cpp
@@ -309,7 +309,7 @@ void RegistrationWizard::accept()
 			u = m_pDb->findUserByName(szNameOk);
 			if(u)
 			{
-				KviQString::sprintf(szNameOk,"%Q%d",&szNameOk,idx);
+				szNameOk = QString("%1%2").arg(szNameOk).arg(idx);
 				idx++;
 			}
 		} while(u);
diff --git a/src/modules/socketspy/SocketSpyWindow.cpp b/src/modules/socketspy/SocketSpyWindow.cpp
index 1c62d949c..b0a8ad251 100644
--- a/src/modules/socketspy/SocketSpyWindow.cpp
+++ b/src/modules/socketspy/SocketSpyWindow.cpp
@@ -77,7 +77,7 @@ void SocketSpyWindow::getBaseLogFileName(QString &buffer)
 
 void SocketSpyWindow::fillCaptionBuffers()
 {
-	KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Socket Spy [IRC Context %u]"),m_pConsole->context()->id());
+	m_szPlainTextCaption = QString(__tr2qs("Socket Spy [IRC Context %1]")).arg(m_pConsole->context()->id());
 }
 
 bool SocketSpyWindow::incomingMessage(const char * message)
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index a831fa5e4..204acc395 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -487,7 +487,7 @@ static bool str_kvs_fnc_cmp(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("tocompare",KVS_PT_STRING,0,szString2)
 		KVSM_PARAMETER("case",KVS_PT_BOOL,KVS_PF_OPTIONAL,bCase)
 	KVSM_PARAMETERS_END(c)
-	iCmp = bCase ? KviQString::cmpCS(szString,szString2) : KviQString::cmpCI(szString,szString2);
+	iCmp = bCase ? szString.compare(szString2,Qt::CaseSensitive) : szString.compare(szString2,Qt::CaseInsensitive);
 	c->returnValue()->setInteger(iCmp);
 	return true;
 }
@@ -1884,7 +1884,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 
 	//s.setLength(allocsize);
 
-	const QChar * fmt = KviQString::nullTerminatedArray(szFormat);
+	const QChar * fmt = szFormat.constData();
 
 	if(fmt)
 	{
diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp
index c3560ec78..991f1c6ea 100644
--- a/src/modules/theme/PackThemeDialog.cpp
+++ b/src/modules/theme/PackThemeDialog.cpp
@@ -505,26 +505,26 @@ bool PackThemeDialog::packTheme()
 	int iIdx = 0;
 	for(KviThemeInfo * pInfo = m_pThemeInfoList->first(); pInfo; pInfo = m_pThemeInfoList->next())
 	{
-		KviQString::sprintf(szTmp,"Theme%dName",iIdx);
+		szTmp = QString("Theme%1Name").arg(iIdx);
 		f.addInfoField(szTmp,pInfo->name());
-		KviQString::sprintf(szTmp,"Theme%dVersion",iIdx);
+		szTmp = QString("Theme%1Version").arg(iIdx);
 		f.addInfoField(szTmp,pInfo->version());
-		KviQString::sprintf(szTmp,"Theme%dDescription",iIdx);
+		szTmp = QString("Theme%1Description").arg(iIdx);
 		f.addInfoField(szTmp,pInfo->description());
-		KviQString::sprintf(szTmp,"Theme%dDate",iIdx);
+		szTmp = QString("Theme%1Date").arg(iIdx);
 		f.addInfoField(szTmp,pInfo->date());
-		KviQString::sprintf(szTmp,"Theme%dSubdirectory",iIdx);
+		szTmp = QString("Theme%1Subdirectory").arg(iIdx);
 		f.addInfoField(szTmp,pInfo->subdirectory());
-		KviQString::sprintf(szTmp,"Theme%dAuthor",iIdx);
+		szTmp = QString("Theme%1Author").arg(iIdx);
 		f.addInfoField(szTmp,pInfo->author());
-		KviQString::sprintf(szTmp,"Theme%dApplication",iIdx);
+		szTmp = QString("Theme%1Application").arg(iIdx);
 		f.addInfoField(szTmp,pInfo->application());
-		KviQString::sprintf(szTmp,"Theme%dThemeEngineVersion",iIdx);
+		szTmp = QString("Theme%1ThemeEngineVersion").arg(iIdx);
 		f.addInfoField(szTmp,pInfo->themeEngineVersion());
 		QPixmap pixScreenshot = pInfo->smallScreenshot();
 		if(!pixScreenshot.isNull())
 		{
-			KviQString::sprintf(szTmp,"Theme%dScreenshot",iIdx);
+			szTmp = QString("Theme%1Screenshot").arg(iIdx);
 			QByteArray * pba = new QByteArray();
 
 			QBuffer bufferz(pba,0);
diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp
index 388f7b163..6c4e0e9d7 100644
--- a/src/modules/theme/SaveThemeDialog.cpp
+++ b/src/modules/theme/SaveThemeDialog.cpp
@@ -276,9 +276,8 @@ bool SaveThemeDialog::saveTheme()
 
 	if(!KviTheme::save(sto))
 	{
-		QString szMsg2;
 		QString szErr = sto.lastError();
-		KviQString::sprintf(szMsg2,__tr2qs_ctx("Unable to save theme: %Q","theme"),&szErr);
+		QString szMsg2 = QString(__tr2qs_ctx("Unable to save theme: %1","theme")).arg(szErr);
 		QMessageBox::critical(this,__tr2qs_ctx("Save Current Theme - KVIrc","theme"),szMsg2,
 			QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);
 		return false;
diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp
index 89844cc7d..a24684c7b 100644
--- a/src/modules/theme/ThemeFunctions.cpp
+++ b/src/modules/theme/ThemeFunctions.cpp
@@ -65,7 +65,7 @@ namespace ThemeFunctions
 		if(!r.readHeader(szThemePackageFileName))
 		{
 			QString szErr = r.lastError();
-			KviQString::sprintf(szError,__tr2qs_ctx("The selected file does not seem to be a valid KVIrc package: %Q","theme"),&szErr);
+			szError = QString(__tr2qs_ctx("The selected file does not seem to be a valid KVIrc package: %1","theme")).arg(szErr);
 			return false;
 		}
 
@@ -154,23 +154,23 @@ namespace ThemeFunctions
 			QString szThemeEngineVersion;
 			QString szThemeApplication;
 
-			KviQString::sprintf(szTmp,"Theme%dName",iIdx);
+			szTmp = QString("Theme%1Name").arg(iIdx);
 			r.getStringInfoField(szTmp,szThemeName);
-			KviQString::sprintf(szTmp,"Theme%dVersion",iIdx);
+			szTmp = QString("Theme%1Version").arg(iIdx);
 			r.getStringInfoField(szTmp,szThemeVersion);
-			KviQString::sprintf(szTmp,"Theme%dApplication",iIdx);
+			szTmp = QString("Theme%1Application").arg(iIdx);
 			r.getStringInfoField(szTmp,szThemeApplication);
-			KviQString::sprintf(szTmp,"Theme%dDescription",iIdx);
+			szTmp = QString("Theme%1Description").arg(iIdx);
 			r.getStringInfoField(szTmp,szThemeDescription);
-			KviQString::sprintf(szTmp,"Theme%dDate",iIdx);
+			szTmp = QString("Theme%1Date").arg(iIdx);
 			r.getStringInfoField(szTmp,szThemeDate);
-			KviQString::sprintf(szTmp,"Theme%dSubdirectory",iIdx);
+			szTmp = QString("Theme%1Subdirectory").arg(iIdx);
 			r.getStringInfoField(szTmp,szThemeSubdirectory);
-			KviQString::sprintf(szTmp,"Theme%dAuthor",iIdx);
+			szTmp = QString("Theme%1Author").arg(iIdx);
 			r.getStringInfoField(szTmp,szThemeAuthor);
-			KviQString::sprintf(szTmp,"Theme%dThemeEngineVersion",iIdx);
+			szTmp = QString("Theme%1ThemeEngineVersion").arg(iIdx);
 			r.getStringInfoField(szTmp,szThemeEngineVersion);
-			KviQString::sprintf(szTmp,"Theme%dScreenshot",iIdx);
+			szTmp = QString("Theme%1Screenshot").arg(iIdx);
 			QPixmap pixScreenshot;
 			pByteArray = r.binaryInfoFields()->find(szTmp);
 			if(pByteArray)
@@ -227,46 +227,34 @@ namespace ThemeFunctions
 
 		QString szShowDetails = __tr2qs_ctx("Show Details","theme");
 
-		KviQString::sprintf(hd.szHtmlText,
+		hd.szHtmlText = QString(
 			"<html bgcolor=\"#ffffff\">" \
 				"<body bgcolor=\"#ffffff\">" \
 					"<p><center>" \
-						"<h2>%Q %Q</h2>" \
+						"<h2>%1 %2</h2>" \
 					"</center></p>" \
 					"<p><center>" \
 						"<img src=\"theme_dialog_pack_image\">" \
 					"</center></p>" \
 					"<p><center>" \
-						"<i>%Q</i>" \
+						"<i>%3</i>" \
 					"</center></p>" \
 					"<p><center>" \
-						"%Q: <b>%Q</b><br>" \
-						"%Q: <b>%Q</b><br>" \
+						"%4: <b>%5</b><br>" \
+						"%6: <b>%7</b><br>" \
 					"</center></p>" \
 					"<p><center>" \
 						"<font color=\"#808080\">" \
-							"%Q: %Q<br>" \
+							"%8: %9<br>" \
 						"</font>" \
 					"</center></p>" \
-					"%Q" \
+					"%10" \
 					"<br>" \
 					"<p><center>" \
-						"<a href=\"theme_dialog_details\">%Q</a>" \
+						"<a href=\"theme_dialog_details\">%11</a>" \
 					"</center></p>" \
 				"</body>" \
-			"</html>",
-			&szPackageName,
-			&szPackageVersion,
-			&szPackageDescription,
-			&szAuthor,
-			&szPackageAuthor,
-			&szCreatedAt,
-			&szPackageDate,
-			&szCreatedOn,
-			&szPackageApplication,
-			&szWarnings,
-			&szShowDetails
-		);
+			"</html>").arg(szPackageName,szPackageVersion,szPackageDescription,szAuthor,szPackageAuthor,szCreatedAt,szPackageDate,szCreatedOn,szPackageApplication).arg(szWarnings,szShowDetails);
 
 		hd.addImageResource("theme_dialog_pack_image",pix);
 		hd.addHtmlResource("theme_dialog_details",szDetails);
@@ -295,7 +283,7 @@ namespace ThemeFunctions
 			if(!r.unpack(szThemePackageFileName,szUnpackPath))
 			{
 				QString szErr2 = r.lastError();
-				KviQString::sprintf(szError,__tr2qs_ctx("Failed to unpack the selected file: %Q","theme"),&szErr2);
+				szError = QString(__tr2qs_ctx("Failed to unpack the selected file: %1","theme")).arg(szErr2);
 				return false;
 			}
 		}
@@ -328,9 +316,9 @@ namespace ThemeFunctions
 		QString szScreenshot;
 		if(!pixScreenshot.isNull())
 		{
-			KviQString::sprintf(szScreenshot,"<p><center><img src=\"theme_shot%d\"></center></p>",iUniqueIndexInDocument);
+			szScreenshot = QString("<p><center><img src=\"theme_shot%1\"></center></p>").arg(iUniqueIndexInDocument);
 			QString szTmp;
-			KviQString::sprintf(szTmp,"theme_shot%d",iUniqueIndexInDocument);
+			szTmp = QString("theme_shot%1").arg(iUniqueIndexInDocument);
 			//FIXME in tooltip
 			if (hd)
 				hd->addImageResource(szTmp,pixScreenshot);
@@ -339,41 +327,25 @@ namespace ThemeFunctions
 			szScreenshot = "";
 		}
 
-		KviQString::sprintf(
-			szBuffer,
+		szBuffer = QString(
 			"<p><center>" \
-				"<h2>%Q %Q</h2>" \
+				"<h2>%1 %2</h2>" \
 			"</center></p>" \
-			"%Q" \
+			"%3" \
 			"<p><center>" \
-				"<i>%Q</i>" \
+				"<i>%4</i>" \
 			"</center></p>" \
 			"<p><center>" \
-				"%Q: <b>%Q</b><br>" \
-				"%Q: <b>%Q</b><br>" \
+				"%5: <b>%6</b><br>" \
+				"%7: <b>%8</b><br>" \
 			"</center></p>" \
 			"<p><center>" \
 				"<font color=\"#808080\">" \
-					"%Q: %Q<br>" \
-					"%Q: %Q<br>" \
-					"%Q: %Q<br>" \
+					"%9: %10<br>" \
+					"%11: %12<br>" \
+					"%13: %14<br>" \
 				"</font>" \
-			"</center></p>",
-			&szThemeName,
-			&szThemeVersion,
-			&szScreenshot,
-			&szThemeDescription,
-			&szAuthor,
-			&szThemeAuthor,
-			&szCreatedAt,
-			&szThemeDate,
-			&szCreatedOn,
-			&szThemeApplication,
-			&szThemeEngineVersion,
-			&szThemeThemeEngineVersion,
-			&szSubdirectory,
-			&szThemeSubdirectory
-		);
+			"</center></p>").arg(szThemeName,szThemeVersion,szScreenshot,szThemeDescription,szAuthor,szThemeAuthor,szCreatedAt,szThemeDate,szCreatedOn).arg(szThemeApplication,szThemeEngineVersion,szThemeThemeEngineVersion,szSubdirectory,szThemeSubdirectory);
 	}
 
 	bool makeKVIrcScreenshot(const QString &szSavePngFilePath,bool bMaximizeFrame)
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index d17b3fe7f..f1b368cb5 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -28,7 +28,6 @@
 #include "KviMessageBox.h"
 #include "KviModule.h"
 #include "KviLocale.h"
-#include "KviQString.h"
 #include "KviParameterList.h"
 #include "KviCommandFormatter.h"
 #include "KviError.h"
@@ -118,8 +117,7 @@ static bool theme_kvs_cmd_apply(KviKvsModuleCommandCall * c)
 			if(!KviTheme::load(szPath,out))
 			{
 				QString szErr = out.lastError();
-				QString szMsg;
-				KviQString::sprintf(szMsg,__tr2qs_ctx("Failed to apply the specified theme: %Q","theme"),&szErr);
+				QString szMsg = QString(__tr2qs_ctx("Failed to apply the specified theme: %1","theme")).arg(szErr);
 				QMessageBox::critical(0,__tr2qs_ctx("Apply theme - KVIrc","theme"),szMsg,
 				QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);
 			}
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 3366ea871..6f434b7be 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -308,8 +308,7 @@ void ThemeManagementDialog::applyCurrentTheme()
 		if(!KviTheme::load(szPath,out))
 		{
 			QString szErr = out.lastError();
-			QString szMsg;
-			KviQString::sprintf(szMsg,__tr2qs_ctx("Failed to apply the specified theme: %Q","theme"),&szErr);
+			QString szMsg = QString(__tr2qs_ctx("Failed to apply the specified theme: %1","theme")).arg(szErr);
 			QMessageBox::critical(this,__tr2qs_ctx("Apply theme - KVIrc","theme"),szMsg,
 				QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);
author	Elvio Basello	2011-01-10 18:36:59 +0000
committer	Elvio Basello	2011-01-10 18:36:59 +0000
commit	78735b180c2ba56fa1cf4fd578726d457626e80a (patch)
tree	12b359e1e59b7585dc89878e2eeae54982baa4e1 /src/modules
parent	updated perlcore's xs include, hopefully fixing #1068 (diff)
download	KVIrc-78735b180c2ba56fa1cf4fd578726d457626e80a.tar.gz KVIrc-78735b180c2ba56fa1cf4fd578726d457626e80a.tar.bz2 KVIrc-78735b180c2ba56fa1cf4fd578726d457626e80a.zip