fixed format strings

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

5 files changed, 14 insertions, 14 deletions

diff --git a/src/kvilib/system/KviTimeUtils.cpp b/src/kvilib/system/KviTimeUtils.cpp
index fd0c207ea..07c9134dd 100644
--- a/src/kvilib/system/KviTimeUtils.cpp
+++ b/src/kvilib/system/KviTimeUtils.cpp
@@ -114,16 +114,16 @@ namespace KviTimeUtils
 				if(h > 0)
 				{
 					if(iFlags & NoLeadingZeroes)
-						szRet = QString(__tr2qs("%1 h %2 m %3 s")).arg(h,m,s);
+						szRet = QString(__tr2qs("%1 h %2 m %3 s")).arg(h).arg(m).arg(s);
 					else
-						szRet = QString(__tr2qs("%1 h %2%3 m %4%5 s")).arg(h,m / 10,m % 10,s / 10,s % 10);
+						szRet = QString(__tr2qs("%1 h %2%3 m %4%5 s")).arg(h).arg(m / 10).arg(m % 10).arg(s / 10).arg(s % 10);
 				} else {
 					if(m > 0)
 					{
 						if(iFlags & NoLeadingZeroes)
-							szRet = QString(__tr2qs("%1 m %2 s")).arg(m,s);
+							szRet = QString(__tr2qs("%1 m %2 s")).arg(m).arg(s);
 						else
-							szRet = QString(__tr2qs("%1 m %2%3 s")).arg(m,s / 10,s % 10);
+							szRet = QString(__tr2qs("%1 m %2%3 s")).arg(m).arg(s / 10).arg(s % 10);
 					} else {
 						szRet = QString(__tr2qs("%1 s")).arg(s);
 					}
diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp
index 3f9191f78..806720768 100644
--- a/src/modules/dcc/DccBroker.cpp
+++ b/src/modules/dcc/DccBroker.cpp
@@ -591,9 +591,9 @@ void DccBroker::recvFileManage(DccDescriptor * 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, dcc->szUser, dcc->szHost, dcc->szFileName,
-					KviQString::makeSizeReadable(dcc->szFileSize.toULongLong()),
-					dcc->szIp, dcc->szPort);
+				).arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szFileName)
+				.arg(KviQString::makeSizeReadable(dcc->szFileSize.toULongLong()))
+				.arg(dcc->szIp, dcc->szPort);
 
 		} else {
 			// passive: we will be listening!
@@ -604,8 +604,8 @@ void DccBroker::recvFileManage(DccDescriptor * dcc)
 						"<b>%5</b> large.<br>" \
 						"You will be the passive side of the connection.<br>" \
 					,"dcc" \
-				).arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szFileName,
-				      KviQString::makeSizeReadable(dcc->szFileSize.toULongLong()));
+				).arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szFileName)
+				.arg(KviQString::makeSizeReadable(dcc->szFileSize.toULongLong()));
 		}
 
 		if(dcc->bIsIncomingAvatar)
@@ -762,7 +762,7 @@ void DccBroker::renameOverwriteResume(DccDialog *box,DccDescriptor * dcc)
 							"<b>overwrite</b> the existing file, or<br> " \
 							"<b>resume</b> an incomplete download?" \
 						,"dcc" \
-					).arg(dcc->szLocalFileName, KviQString::makeSizeReadable(fi.size()));
+					).arg(dcc->szLocalFileName).arg(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/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index 9f6d77cc2..2d5c57398 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -1522,14 +1522,14 @@ void DccFileTransfer::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), KviQString::makeSizeReadable(m_uTotalFileSize)).arg(dPerc2,0,'f',2);
+					txt = QString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).arg(KviQString::makeSizeReadable(uAckedBytes)).arg(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), KviQString::makeSizeReadable(m_uTotalFileSize)).arg(dPerc,0,'f',2);
+					txt = QString(__tr2qs_ctx("%1 of %2 (%3%)","dcc")).arg(KviQString::makeSizeReadable(uTransferred)).arg(KviQString::makeSizeReadable(m_uTotalFileSize)).arg(dPerc,0,'f',2);
 				}
 
 			} else {
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 5ad4aa458..242dbf0f2 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -637,7 +637,7 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
 		if(uResumeSize >= o->fileSize())
 		{
 			// senseless request
-			QString szError = QString(__tr2qs_ctx("Invalid RECV request: Position %1 is is larger than file size","dcc")).arg(uResumeSize);
+			QString szError = QString(__tr2qs_ctx("Invalid RECV request: Position %1 is larger than file size","dcc")).arg(uResumeSize);
 			dcc_module_request_error(dcc,szError);
 			return;
 		}
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 06cb87516..2a6ae9ce4 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -311,7 +311,7 @@ bool FileTransferWindow::eventFilter( QObject *obj, QEvent *ev )
 					if(m_pTableWidget->currentItem())
 					{
 						delete m_pTableWidget->currentItem();
-						return TRUE;
+						return true;
 					}
 					break;
 			}