From f92c7d6e3b847d502e40bc0578d830d4919f09e4 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Fri, 14 May 2010 13:49:51 +0000 Subject: 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 --- src/modules/dcc/chat.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules/dcc/chat.cpp') 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; } -- cgit v1.3.1-10-gc9f91