Merge the use of multiple QString()::arg(QString) calls to avoid format strings

Filter out any urlencoded path form dcc file names

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

20 files changed, 69 insertions, 63 deletions

diff --git a/src/kvilib/ext/avdevice/videodevicepool.cpp b/src/kvilib/ext/avdevice/videodevicepool.cpp
index 3f5991a0c..4fe247fe8 100644
--- a/src/kvilib/ext/avdevice/videodevicepool.cpp
+++ b/src/kvilib/ext/avdevice/videodevicepool.cpp
@@ -733,7 +733,7 @@ void VideoDevicePool::loadDeviceConfig()
 		qint32 ctrl_value;
 		QString ctrl_key;
 		bool ok = false;
-		const QString key_control_start = QString::fromLocal8Bit( "Device %1 Input %2 Control " ).arg( m_videodevice[m_current_device].udi() ).arg( m_videodevice[m_current_device].currentInput() );
+		const QString key_control_start = QString::fromLocal8Bit( "Device %1 Input %2 Control " ).arg( m_videodevice[m_current_device].udi() ,  m_videodevice[m_current_device].currentInput() );
 		QStringList ctrl_keys = config.keyList().filter(key_control_start);
 		qDebug() << "Found" << ctrl_keys.size() << "saved values for video-controls";
 		foreach (ctrl_key, ctrl_keys)
@@ -800,7 +800,7 @@ void VideoDevicePool::saveCurrentDeviceConfig()
 		config.writeEntry( key_currentinput, m_videodevice[m_current_device].currentInput() );
 		// --- Save values of the controls ---:
 		qint32 ctrl_value;
-		const QString key_control_start = QString::fromLocal8Bit( "Device %1 Input %2 Control " ).arg( m_videodevice[m_current_device].udi() ).arg( m_videodevice[m_current_device].currentInput() );
+		const QString key_control_start = QString::fromLocal8Bit( "Device %1 Input %2 Control " ).arg( m_videodevice[m_current_device].udi() ,  m_videodevice[m_current_device].currentInput() );
 		// Save values of the numeric controls:
 		QList<NumericVideoControl> numCtrls = m_videodevice[m_current_device].getSupportedNumericControls();
 		NumericVideoControl numCtrl;
diff --git a/src/kvilib/ext/kvi_osinfo.cpp b/src/kvilib/ext/kvi_osinfo.cpp
index 19fd7e699..b97367b39 100644
--- a/src/kvilib/ext/kvi_osinfo.cpp
+++ b/src/kvilib/ext/kvi_osinfo.cpp
@@ -353,14 +353,14 @@ static QString queryWinInfo(QueryInfo info)
 				szVersion+= QString("Service Pack 6a (Build %1)").arg( osvi.dwBuildNumber & 0xFFFF );
 			else // Windows NT 4.0 prior to SP6a
 			{
-				szVersion+= QString( "%1 (Build %2)").arg( osvi.szCSDVersion).arg( osvi.dwBuildNumber & 0xFFFF);
+				szVersion+= QString( "%1 (Build %2)").arg( osvi.szCSDVersion,  osvi.dwBuildNumber & 0xFFFF);
 			}
 
 			RegCloseKey( hKey );
 		}
 		else // not Windows NT 4.0
 		{
-			szVersion+= QString( "%1 (Build %2)").arg( osvi.szCSDVersion).arg( osvi.dwBuildNumber & 0xFFFF);
+			szVersion+= QString( "%1 (Build %2)").arg( osvi.szCSDVersion,  osvi.dwBuildNumber & 0xFFFF);
 		}
 
 		break;
diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp
index d9d9b0822..a7efc3587 100644
--- a/src/kvilib/tal/kvi_tal_wizard.cpp
+++ b/src/kvilib/tal/kvi_tal_wizard.cpp
@@ -357,7 +357,7 @@ void KviTalWizard::setCurrentPage(KviTalWizardPageData * pData)
 		szSteps = "<nobr><font color=\"";
 		szSteps += clrMid.name();
 		szSteps += "\"><b>[";
-		szSteps += QString("Step %1 of %2").arg(pData->iVisibleIndex).arg(m_p->iEnabledPageCount);
+		szSteps += QString("Step %1 of %2").arg(pData->iVisibleIndex, m_p->iEnabledPageCount);
 		szSteps += "]</b></font></nobr>";
 	}
 
diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp
index 2018af1be..5de17b598 100644
--- a/src/kvirc/kernel/kvi_ircurl.cpp
+++ b/src/kvirc/kernel/kvi_ircurl.cpp
@@ -311,7 +311,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole)
 			szCommand.append(szJoinCommand);
 			szCommand.append("\" ");
 		}
-		szCommand.append(QString("%1 %2 ").arg(parts.szHost).arg(parts.iPort));
+		szCommand.append(QString("%1 %2 ").arg(parts.szHost, parts.iPort));
 
 		if(pConsole->connection()) {
 			KviServer* server = pConsole->connection()->target()->server();
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index 7930f3d87..c8d2c0922 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -1148,9 +1148,9 @@ void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg)
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			szVersion.append(QString(" - %1").arg(KviOsInfo::version()));
 #else
-			szVersion.append(QString(" - %1 (%2)").arg(KviOsInfo::name()).arg(KviOsInfo::release()));
+			szVersion.append(QString(" - %1 (%2)").arg(KviOsInfo::name(), KviOsInfo::release()));
 #endif
-			//szVersion.append(QString(" - QT Version: %1 - %2").arg(qVersion()).arg(__tr2qs("http://www.kvirc.net/")));
+			//szVersion.append(QString(" - QT Version: %1 - %2").arg(qVersion(), __tr2qs("http://www.kvirc.net/")));
 			if(!KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix).isEmpty())
 			{
 				QString sz = KVI_OPTION_STRING(KviOption_stringCtcpVersionPostfix);
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 61b6a98cc..115ce7036 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -1788,7 +1788,7 @@ void KviChannel::preprocessMessage(QString & szMessage)
 					if((*it) == szTmp)
 						*it = QString("\r!c\r%1\r").arg(*it);
 					else
-						*it = QString("\r!c%1\r%2\r").arg(szTmp).arg(*it);
+						*it = QString("\r!c%1\r%2\r").arg(szTmp, *it);
 				}
 			}
 		}
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index 41df8173b..44072ea60 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -307,7 +307,7 @@ void KviConsole::getUserTipText(const QString &nick,KviIrcUserEntry *e,QString &
 
 	if(e->avatar())
 	{
-		buffer += QString("<tr><td><center><img src=\"%1\" width=\"%2\"></center></td></tr>").arg(e->avatar()->localPath()).arg(e->avatar()->size().width());
+		buffer += QString("<tr><td><center><img src=\"%1\" width=\"%2\"></center></td></tr>").arg(e->avatar()->localPath(), e->avatar()->size().width());
 	}
 
 	if(e->hasRealName())
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index 35b98f13c..5e25e0815 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -173,9 +173,9 @@ QString KviQuery::getInfoLabelTipText()
 			szText +=          "<tr><td>";
 
 			if(e->hasRealName())
-				szTmp = __tr2qs("%1 is %2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName()));
+				szTmp = __tr2qs("%1 is %2 (%3)").arg(m_szName, szMask, KviMircCntrl::stripControlBytes(e->realName()));
 			else
-				szTmp = __tr2qs("%1 is %2").arg(m_szName).arg(szMask);
+				szTmp = __tr2qs("%1 is %2").arg(m_szName, szMask);
 
 			szTmp.replace('&',"&amp;");
 			szTmp.replace('<',"&lt;");
@@ -189,9 +189,9 @@ QString KviQuery::getInfoLabelTipText()
 			{
 				szText += "<tr><td>";
 				if(e->hasHops())
-					szText += __tr2qs("%1 is using irc server: %2 (%3 hops)").arg(m_szName).arg(e->server()).arg(e->hops());
+					szText += __tr2qs("%1 is using irc server: %2 (%3 hops)").arg(m_szName, e->server()).arg(e->hops());
 				else
-					szText += __tr2qs("%1 is using irc server: %2").arg(m_szName).arg(e->server());
+					szText += __tr2qs("%1 is using irc server: %2").arg(m_szName, e->server());
 				szText += "</td></tr>";
 			}
 
@@ -203,7 +203,7 @@ QString KviQuery::getInfoLabelTipText()
 			}
 
 			szText += "<tr><td>";
-			szTmp = __tr2qs("Common channels with %1: %2").arg(m_szName).arg(szChans);
+			szTmp = __tr2qs("Common channels with %1: %2").arg(m_szName, szChans);
 
 			szTmp.replace('&',"&amp;");
 			szTmp.replace('<',"&lt;");
@@ -246,9 +246,9 @@ QString KviQuery::getInfoLabelText()
 					szMask += "*";
 
 				if(e->hasRealName())
-					szTmp = __tr2qs("Query with %1!%2 (%3)").arg(m_szName).arg(szMask).arg(KviMircCntrl::stripControlBytes(e->realName()));
+					szTmp = __tr2qs("Query with %1!%2 (%3)").arg(m_szName, szMask, KviMircCntrl::stripControlBytes(e->realName()));
 				else
-					szTmp = __tr2qs("Query with %1!%2").arg(m_szName).arg(szMask);
+					szTmp = __tr2qs("Query with %1!%2").arg(m_szName, szMask);
 
 				if(e->hasServer())
 					szTmp += __tr2qs(", using server %1").arg(e->server());
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index b7f810a8a..b445b3188 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -1590,7 +1590,7 @@ void KviUserListView::maybeTip(KviUserListToolTip * pTip, const QPoint & pnt)
 				int iHours = iMins / 60;
 				iMins = iMins % 60;
 				szBuffer += "<tr><td bgcolor=\"#F0F0F0\"><nobr><font color=\"#000000\">";
-				szBuffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").arg(iHours).arg(iMins).arg(iSecs);
+				szBuffer += __tr2qs("Quiet for <b>%1h %2m %3s</b>").arg(iHours, iMins, iSecs);
 				szBuffer += "</font></nobr></td></tr>";
 			}
 			
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index f625993c3..01e175112 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -1358,7 +1358,7 @@ void KviWindow::preprocessMessage(QString & szMessage)
 					{
 						*it=QString("\r!c\r%1\r").arg(*it);
 					} else {
-						*it=QString("\r!c%1\r%2\r").arg(tmp).arg(*it);
+						*it=QString("\r!c%1\r%2\r").arg(tmp, *it);
 					}
 				}
 			}
diff --git a/src/modules/addon/packaddondialog.cpp b/src/modules/addon/packaddondialog.cpp
index 5dd453a11..2e7e67220 100644
--- a/src/modules/addon/packaddondialog.cpp
+++ b/src/modules/addon/packaddondialog.cpp
@@ -196,15 +196,11 @@ bool KviPackAddonDialog::createInstaller(QString * pszError)
 	// Start creating install.kvs: header
 	QString szTmp;
 	szTmp += QString("# This file is generated automatically. Do NOT touch unless you know what are you doing\n#\n");
-	szTmp += QString("# %1 %2\n# Written by %3\n# %4\n\n").arg(m_szName) \
-		.arg(m_szVersion).arg(m_szAuthor).arg(m_szDescription);
+	szTmp += QString("# %1 %2\n# Written by %3\n# %4\n\n").arg(m_szName, m_szVersion, m_szAuthor, m_szDescription);
 	szTmp += "# Register the script: this must be the first instruction executed\n# since it will abort with an error when a greater version is already installed\n";
 
 	// install.kvs: addon registration
-	szTmp += QString("addon.register(\"%1\",\"%2\",\"%1\",\"%3\",\"%4\",\"%5\")\n") \
-		.arg(m_szName).arg(m_szVersion) \
-		.arg(m_szDescription).arg(m_szMinVersion) \
-		.arg(m_szIcon);
+	szTmp += QString("addon.register(\"%1\",\"%2\",\"%1\",\"%3\",\"%4\",\"%5\")\n").arg(m_szName, m_szVersion, m_szDescription, m_szMinVersion, m_szIcon);
 	szTmp += "{\n\t# This is our uninstall callback: it will be called by KVIrc when addon.uninstall is invoked\n\t";
         szTmp += QString("%1::uninstall::uninstall\n").arg(m_szName);
         szTmp += QString("\t%1::uninstall::uninstallfiles\n").arg(m_szName);
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index ee7abc150..6a9ed91cd 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -275,7 +275,7 @@ void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc)
 		QString tmp = __tr2qs_ctx( \
 				"<b>%1 [%2@%3]</b> requests a " \
 				"<b>Direct Client Connection</b> in <b>%4</b> mode.<br>", \
-				"dcc").arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(dcc->szType);
+				"dcc").arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szType);
 
 #ifdef COMPILE_SSL_SUPPORT
 		if(dcc->bIsSSL)tmp += __tr2qs_ctx("The connection will be secured using SSL.<br>","dcc");
@@ -289,7 +289,7 @@ void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc)
 		} else {
 			tmp += __tr2qs_ctx( \
 					"The connection target will be host <b>%1</b> on port <b>%2</b><br>" \
-					,"dcc").arg(dcc->szIp).arg(dcc->szPort);
+					,"dcc").arg(dcc->szIp, dcc->szPort);
 		}
 
 
@@ -322,7 +322,7 @@ void KviDccBroker::executeChat(KviDccBox *box,KviDccDescriptor * dcc)
 	KviStr szSubProto = dcc->szType;
 	szSubProto.toLower();
 
-	QString tmp = QString("dcc: %1 %2@%3:%4").arg(szSubProto.ptr()).arg(dcc->szNick).arg(dcc->szIp).arg(dcc->szPort);
+	QString tmp = QString("dcc: %1 %2@%3:%4").arg(szSubProto.ptr(), dcc->szNick, dcc->szIp, dcc->szPort);
 	KviDccChat * chat = new KviDccChat(dcc->console()->frame(),dcc,tmp.toUtf8().data());
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
@@ -348,7 +348,7 @@ void KviDccBroker::activeVoiceManage(KviDccDescriptor * dcc)
 					"<b>Direct Client Connection</b> in <b>VOICE</b> mode.<br>" \
 					"The connection target will be host <b>%4</b> on port <b>%5</b><br>" \
 				,"dcc" \
-			).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(dcc->szIp).arg(dcc->szPort);
+			).arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szIp, dcc->szPort);
 
 		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC VOICE request","dcc"));
 		m_pBoxList->append(box);
@@ -418,7 +418,7 @@ void KviDccBroker::activeVideoManage(KviDccDescriptor * dcc)
 					"<b>Direct Client Connection</b> in <b>VIDEO</b> mode.<br>" \
 					"The connection target will be host <b>%4</b> on port <b>%5</b><br>" \
 				,"dcc" \
-			).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(dcc->szIp).arg(dcc->szPort);
+			).arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szIp, dcc->szPort);
 
 		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC VIDEO request","dcc"));
 		m_pBoxList->append(box);
@@ -494,7 +494,7 @@ void KviDccBroker::activeCanvasManage(KviDccDescriptor * dcc)
 					"<b>Direct Client Connection</b> in <b>CANVAS</b> mode.<br>" \
 					"The connection target will be host <b>%4</b> on port <b>%5</b><br>" \
 				,"dcc" \
-			).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(dcc->szIp).arg(dcc->szPort);
+			).arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szIp, dcc->szPort);
 
 		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC CANVAS request","dcc"));
 		m_pBoxList->append(box);
@@ -588,9 +588,9 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc)
 						"<b>%5</b> large.<br>" \
 						"The connection target will be host <b>%6</b> on port <b>%7</b><br>" \
 					,"dcc" \
-				).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(
-				dcc->szFileName).arg(KviQString::makeSizeReadable(dcc->szFileSize.toULongLong())).arg(
-					dcc->szIp).arg(dcc->szPort);
+				).arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szFileName,
+					KviQString::makeSizeReadable(dcc->szFileSize.toULongLong()),
+					dcc->szIp, dcc->szPort);
 
 		} else {
 			// passive: we will be listening!
@@ -601,8 +601,8 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc)
 						"<b>%5</b> large.<br>" \
 						"You will be the passive side of the connection.<br>" \
 					,"dcc" \
-				).arg(dcc->szNick).arg(dcc->szUser).arg(dcc->szHost).arg(
-					dcc->szFileName).arg(KviQString::makeSizeReadable(dcc->szFileSize.toULongLong()));
+				).arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szFileName,
+				      KviQString::makeSizeReadable(dcc->szFileSize.toULongLong()));
 		}
 
 		if(dcc->bIsIncomingAvatar)
@@ -756,7 +756,7 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc)
 							"<b>auto-rename</b> the new file, or<br>" \
 							"<b>resume</b> an incomplete download?" \
 						,"dcc" \
-					).arg(dcc->szLocalFileName).arg(KviQString::makeSizeReadable(fi.size()));
+					).arg(dcc->szLocalFileName, KviQString::makeSizeReadable(fi.size()));
 			} else {
 				bDisableResume = true;
 				// the file on disk is larger or equal to the remote one
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index fd724d94c..784d36dfe 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -222,7 +222,7 @@ void KviDccChat::connectionInProgress()
 			struct in_addr a;
 			if(KviNetUtils::stringIpToBinaryIp(ip.ptr(),&a))ip.setNum(htonl(a.s_addr));
 
-			QString szReq = QString("PRIVMSG %1 :%2DCC %3 chat %4 %5").arg(m_pDescriptor->szNick).arg((char)0x01).arg(m_pDescriptor->szType).arg(ip.ptr()).arg(port);
+			QString szReq = QString("PRIVMSG %1 :%2DCC %3 chat %4 %5").arg(m_pDescriptor->szNick, QChar(0x01), m_pDescriptor->szType, ip.ptr(), port);
 
 			if(m_pDescriptor->isZeroPortRequest())
 			{
@@ -271,11 +271,11 @@ void KviDccChat::fillCaptionBuffers()
 {
 	QString tmp = QString("DCC %1 %2@%3:%4").arg(
 #ifdef COMPILE_SSL_SUPPORT
-		m_pDescriptor->bIsSSL ? "SChat" : "Chat").arg(
+		m_pDescriptor->bIsSSL ? "SChat" : "Chat", 
 #else
-		"Chat").arg(
+		"Chat", 
 #endif
-		m_pDescriptor->szNick).arg(m_pDescriptor->szIp).arg(m_pDescriptor->szPort);
+		m_pDescriptor->szNick, m_pDescriptor->szIp, m_pDescriptor->szPort);
 
 	m_szPlainTextCaption = tmp;
 }
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 0ba8569a8..88d6fe968 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -85,7 +85,7 @@ static void dcc_module_request_error(KviDccRequest * dcc,const QString& errText)
 
 	if(KVI_OPTION_BOOL(KviOption_boolNotifyFailedDccHandshakes))
 	{
-		QString szError = QString("Sorry, your DCC %1 request can't be satisfied: %2").arg(dcc->szType.ptr()).arg(errText);
+		QString szError = QString("Sorry, your DCC %1 request can't be satisfied: %2").arg(dcc->szType.ptr(), errText);
 		dcc_module_reply_errmsg(dcc,szError);
 	}
 }
@@ -464,6 +464,16 @@ static void dccModuleParseDccSend(KviDccRequest *dcc)
 		dcc->szParam1.cutToLast('/');
 	}
 
+	if(dcc->szParam1.contains("%2F"))
+	{
+		if(!dcc->ctcpMsg->msg->haltOutput())
+		{
+			dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCMSG,
+				__tr2qs_ctx("The above request is broken: The filename contains path components, stripping the leading path and trying to continue","dcc"),dcc->szParam1.ptr());
+		}
+		dcc->szParam1.cutToLast("%2F");
+	}
+
 	KviStr szExtensions = dcc->szType;
 	szExtensions.cutRight(4); // cut off SEND
 
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 6def7c4e1..e952e9e07 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1256,14 +1256,14 @@ void KviDccFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 					if(iW2 > 0)p->fillRect(rect.left() + 5 + iL2,rect.top() + 5,iW2,10,bIsTerminated ? QColor(150,130,110) : QColor(220,170,100));
 					p->fillRect(rect.left() + 5,rect.top() + 5,iL2,10,bIsTerminated ? QColor(140,110,110) : QColor(200,100,100));
 
-					txt = QString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).arg(KviQString::makeSizeReadable(uAckedBytes)).arg(KviQString::makeSizeReadable(m_uTotalFileSize)).arg(dPerc2,0,'f',2);
+					txt = QString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).arg(KviQString::makeSizeReadable(uAckedBytes), KviQString::makeSizeReadable(m_uTotalFileSize)).arg(dPerc2,0,'f',2);
 				} else {
 					// we are receiving a file or not sending acks
 					double dPerc = (double)(((double)uTransferred) * 100.0) / (double)m_uTotalFileSize;
 					int iL = (int) ((((double)iW) * dPerc) / 100.0);
 					p->fillRect(rect.left() + 5,rect.top() + 5,iL,10,bIsTerminated ? QColor(140,110,110) : QColor(200,100,100));
 
-					txt = QString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).arg(KviQString::makeSizeReadable(uTransferred)).arg(KviQString::makeSizeReadable(m_uTotalFileSize)).arg(dPerc,0,'f',2);
+					txt = QString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).arg(KviQString::makeSizeReadable(uTransferred), KviQString::makeSizeReadable(m_uTotalFileSize)).arg(dPerc,0,'f',2);
 				}
 
 			} else {
@@ -1353,7 +1353,7 @@ QString KviDccFileTransfer::tipText()
 {
 	QString s;
 
-	s = QString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>DCC %1 (ID %2)</b></font></td></tr>").arg(m_szDccType.ptr()).arg(id());
+	s = QString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>DCC %1 (ID %2)</b></font></td></tr>").arg(m_szDccType.ptr(), id());
 
 	s += "<tr><td bgcolor=\"#404040\"><font color=\"#FFFFFF\">";
 	s += __tr2qs_ctx("Transfer Log","dcc");
@@ -1485,14 +1485,14 @@ void KviDccFileTransfer::connectionInProgress()
 //			if(TRIGGER_EVENT_5PARAM_RETVALUE(KviEvent_OnDCCSendConnected,this,m_pDescriptor->szPort.ptr(),m_pDescriptor->szFileName.ptr(),m_pDescriptor->szNick.ptr(),m_pDescriptor->szUser.ptr(),m_pDescriptor->szHost.ptr()));
 //		}
 //
-		m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").arg(m_pDescriptor->szIp).arg(m_pDescriptor->szPort);
+		m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").arg(m_pDescriptor->szIp, m_pDescriptor->szPort);
 		outputAndLog(m_szStatusString);
 		displayUpdate();
 		return;
 	}
 
 	// PASSIVE CONNECTION
-	m_szStatusString = __tr2qs_ctx("Listening on interface %1 port %2","dcc").arg(m_pMarshal->localIp()).arg(m_pMarshal->localPort());
+	m_szStatusString = __tr2qs_ctx("Listening on interface %1 port %2","dcc").arg(m_pMarshal->localIp(), m_pMarshal->localPort());
 	outputAndLog(m_szStatusString);
 
 	if(m_pDescriptor->bSendRequest)
@@ -1566,7 +1566,7 @@ void KviDccFileTransfer::connectionInProgress()
 					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));
+		outputAndLog(__tr2qs_ctx("Sent DCC %1 request to %2, waiting for remote client to connect...","dcc").arg(szReq.ptr(), m_pDescriptor->szNick));
 	} else {
 		outputAndLog(__tr2qs_ctx("DCC %1 request not sent, awaiting manual connection","dcc").arg(m_szDccType.ptr()));
 	}
@@ -1693,8 +1693,8 @@ void KviDccFileTransfer::handleMarshalError(int err)
 
 void KviDccFileTransfer::connected()
 {
-	outputAndLog(__tr2qs_ctx("Connected to %1:%2","dcc").arg(m_pMarshal->remoteIp()).arg(m_pMarshal->remotePort()));
-	outputAndLog(__tr2qs_ctx("Local end is %1:%2","dcc").arg(m_pMarshal->localIp()).arg(m_pMarshal->localPort()));
+	outputAndLog(__tr2qs_ctx("Connected to %1:%2","dcc").arg(m_pMarshal->remoteIp(), m_pMarshal->remotePort()));
+	outputAndLog(__tr2qs_ctx("Local end is %1:%2","dcc").arg(m_pMarshal->localIp(), m_pMarshal->localPort()));
 
 	m_tTransferStartTime = kvi_unixTime();
 
@@ -1774,7 +1774,7 @@ bool KviDccFileTransfer::resumeAccepted(const char *filename,const char *port,co
 
 	if(ret != KviError_success)handleMarshalError(ret);
 	else {
-		m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").arg(m_pDescriptor->szIp).arg(m_pDescriptor->szPort);
+		m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").arg(m_pDescriptor->szIp, m_pDescriptor->szPort);
 		outputAndLog(m_szStatusString);
 		displayUpdate();
 	}
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index bd78f7619..f2cb79dd5 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -208,8 +208,8 @@ void KviHttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 				//iR = iW - iL;
 				p->fillRect(rect.left() + 5, rect.top() + 5,iL,10,bIsTerminated ? QColor(140,110,110) : QColor(200,100,100));
 
-				txt = QString(__tr2qs_ctx("%1 of %2 (%3 %)","http")).arg(KviQString::makeSizeReadable(uRecvd))
-					.arg(KviQString::makeSizeReadable(uTotal)).arg(dPerc,0,'f',2);
+				txt = QString(__tr2qs_ctx("%1 of %2 (%3 %)","http")).arg(KviQString::makeSizeReadable(uRecvd),
+					KviQString::makeSizeReadable(uTotal)).arg(dPerc,0,'f',2);
 			} else {
 				txt = KviQString::makeSizeReadable(m_pHttpRequest->receivedSize());
 			}
@@ -260,17 +260,17 @@ void KviHttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 			{
 				KviTimeUtils::secondsToDaysHoursMinsSecs(kvi_timeSpan(m_tTransferEndTime,m_tTransferStartTime),&uD,&uH,&uM,&uS);
 				txt = "TOT: ";
-				if(uD > 0)txt += QString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD).arg(uH).arg(uM).arg(uS);
-				else if(uH > 0)txt += QString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH).arg(uM).arg(uS);
-				else txt += QString(__tr2qs_ctx("%3m %4s","http")).arg(uM).arg(uS);
+				if(uD > 0)txt += QString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD, uH, uM, uS);
+				else if(uH > 0)txt += QString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH, uM, uS);
+				else txt += QString(__tr2qs_ctx("%3m %4s","http")).arg(uM, uS);
 			} else {
 				if(iEta >= 0)
 				{
 					KviTimeUtils::secondsToDaysHoursMinsSecs(iEta,&uD,&uH,&uM,&uS);
 					txt = "ETA: ";
-					if(uD > 0)txt += QString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD).arg(uH).arg(uM).arg(uS);
-					else if(uH > 0)txt += QString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH).arg(uM).arg(uS);
-					else txt += QString(__tr2qs_ctx("%3m %4s","http")).arg(uM).arg(uS);
+					if(uD > 0)txt += QString(__tr2qs_ctx("%1d %2h %3m %4s","http")).arg(uD, uH, uM, uS);
+					else if(uH > 0)txt += QString(__tr2qs_ctx("%2h %3m %4s","http")).arg(uH, uM, uS);
+					else txt += QString(__tr2qs_ctx("%3m %4s","http")).arg(uM, uS);
 				} else {
 					txt = "ETA: Unknown";
 				}
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 97bd6d6e1..564474477 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -158,7 +158,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 					"</td>" \
 				"</tr>" \
 			"</table>"
-		).arg(szDialogTitle).arg(szDialog).arg(szInfoTips).arg(szOkCancelButtons);
+		).arg(szDialogTitle, szDialog, szInfoTips, szOkCancelButtons);
 
 	QString szCaption = szDialogTitle + " - KVIrc";
 	setWindowTitle(szCaption);
diff --git a/src/modules/options/optw_channel.cpp b/src/modules/options/optw_channel.cpp
index 1c4def99c..b99b32d8f 100644
--- a/src/modules/options/optw_channel.cpp
+++ b/src/modules/options/optw_channel.cpp
@@ -112,7 +112,7 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pPare
 
 		hostmask.mask(tmp1,(KviIrcMask::MaskType)i);
 		ipmask.mask(tmp2,(KviIrcMask::MaskType)i);
-		m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(),QString("%1 (%2)").arg(tmp1).arg(tmp2));
+		m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(),QString("%1 (%2)").arg(tmp1, tmp2));
 	}
 	m_pBanTypeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintDefaultBanType));
 
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index dbf5faa7e..3ea5ebeeb 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -772,7 +772,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s)
 	KviPointerList<KviProxy> * proxylist = g_pProxyDataBase->proxyList();
 	for(KviProxy * p = proxylist->first();p;p = proxylist->next())
 	{
-		m_pProxyEditor->insertItem(m_pProxyEditor->count(),QString("%1:%2").arg(p->hostname()).arg(p->port()));
+		m_pProxyEditor->insertItem(m_pProxyEditor->count(),QString("%1:%2").arg(p->hostname(), p->port()));
 	}
 	if(m_pProxyEditor->count() > (s->proxy()+2))
 		m_pProxyEditor->setCurrentIndex(s->proxy()+2);
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 9976a11a8..4b685ab78 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -342,7 +342,7 @@ void UrlDialog::contextMenu(const QPoint &point)
 void UrlDialog::sayToWin(QAction * act)
 {
 	KviWindow *wnd = g_pApp->findWindowByCaption(act->text());
-	QString say=QString("PRIVMSG %1 %2").arg(wnd->windowName()).arg(m_szUrl);
+	QString say=QString("PRIVMSG %1 %2").arg(wnd->windowName(), m_szUrl);
 	if(wnd)
 	{
 		KviKvsScript::run(say,wnd);