diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/dcc/chat.cpp | 16 | ||||
| -rw-r--r-- | src/modules/dcc/voice.cpp | 14 |
2 files changed, 15 insertions, 15 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(); diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index d6291c8b2..f9c40b780 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -44,7 +44,7 @@ #include <QSplitter> #include <QSlider> #include <QToolTip> -
+ #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include <sys/time.h> #include <sys/types.h> @@ -412,7 +412,7 @@ bool KviDccVoiceThread::soundStep() m_iLastSignalBufferSize = m_inSignalBuffer.size(); } else { // have stuff to play , but it's not enough to fill the pre-buffer - // + // struct timeval tv; gettimeofday(&tv,0); @@ -656,14 +656,14 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name m_pOutputLabel = new QLabel(__tr2qs_ctx("Output buffer","dcc"),vbox); m_pOutputLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel); vbox->setSpacing(1); - + KviTalVBox * vbox2 = new KviTalVBox(m_pHBox); m_pRecordingLabel = new QLabel(vbox2); m_pRecordingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RECORD))); m_pRecordingLabel->setEnabled(false); m_pRecordingLabel->setFrameStyle(QFrame::Raised | QFrame::Panel); - + m_pPlayingLabel = new QLabel(vbox2); m_pPlayingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLAY))); m_pPlayingLabel->setEnabled(false); @@ -746,7 +746,7 @@ void KviDccVoice::connectionInProgress() { output(KVI_OUT_DCCMSG,__tr2qs_ctx("Contacting host %Q on port %Q","dcc"),&(m_pDescriptor->szIp),&(m_pDescriptor->szPort)); } else { - + output(KVI_OUT_DCCMSG,__tr2qs_ctx("Listening on interface %Q port %Q","dcc"), &(m_pMarshal->localIp()),&(m_pMarshal->localPort())); @@ -790,9 +790,9 @@ void KviDccVoice::fillCaptionBuffers() m_szPlainTextCaption = tmp; m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>", - KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii(),tmp.ptr()); + KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),tmp.ptr()); m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>", - KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii(),tmp.ptr()); + KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),tmp.ptr()); } QPixmap * KviDccVoice::myIconPtr() |