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

3 files changed, 3 insertions, 3 deletions

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);