diff options
| author |  Fabio Bas | 2008-06-03 21:28:23 +0000 |
|---|---|---|
| committer | Fabio Bas | 2008-06-03 21:28:23 +0000 |
| commit | a44967996dfcb28477cd885685d641a4541cea87 (patch) | |
| tree | 01eb1cf8daa18e27509a518f5518f8611867d282 /src/modules/dcc/chat.cpp | |
| parent | fix compilation on Visual Studio (diff) | |
| download | KVIrc-a44967996dfcb28477cd885685d641a4541cea87.tar.gz KVIrc-a44967996dfcb28477cd885685d641a4541cea87.tar.bz2 KVIrc-a44967996dfcb28477cd885685d641a4541cea87.zip | |
fixed some compilation warnings
fixed a crash on theme applying
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1903 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc/chat.cpp')
| -rw-r--r-- | src/modules/dcc/chat.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index a14647375..533a3456f 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -189,7 +189,7 @@ void KviDccChat::connectionInProgress() ip = m_pDescriptor->szFakeIp; } else { ip = m_pDescriptor->szListenIp; - + if(KVI_OPTION_BOOL(KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable)) { if(!kvi_isRoutableIpString(ip.ptr())) @@ -220,7 +220,7 @@ void KviDccChat::connectionInProgress() 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); - if(m_pDescriptor->isZeroPortRequest()) + if(m_pDescriptor->isZeroPortRequest()) { szReq.append(" "); szReq+=m_pDescriptor->zeroPortRequestTag(); @@ -276,9 +276,9 @@ void KviDccChat::fillCaptionBuffers() m_szPlainTextCaption = tmp; m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>", - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii(),tmp.toUtf8().data()); + KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),tmp.toUtf8().data()); m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>", - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii(),tmp.toUtf8().data()); + KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),tmp.toUtf8().data()); } QPixmap * KviDccChat::myIconPtr() @@ -298,11 +298,11 @@ void KviDccChat::ownMessage(const QString &text) output(KVI_OUT_SYSTEMWARNING,__tr2qs_ctx("Cannot send data: No active connection","dcc")); return; } - + KviQCString szData = encodeText(text); const char * d = szData.data(); if(!d)return; - + #ifdef COMPILE_CRYPT_SUPPORT if(cryptSessionInfo()) { @@ -435,7 +435,7 @@ bool KviDccChat::event(QEvent *e) delete encoded; return true; break; - + default: // also case KviCryptEngine::DecryptError { QString szErr = cinf->pEngine->lastError(); @@ -500,7 +500,7 @@ void KviDccChat::connected() } updateCaption(); - + m_pSlaveThread = new KviDccChatThread(this,m_pMarshal->releaseSocket()); #ifdef COMPILE_SSL_SUPPORT KviSSL * s = m_pMarshal->releaseSSL(); |