diff options
Diffstat (limited to 'src/modules/dcc')
| -rw-r--r-- | src/modules/dcc/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/modules/dcc/DccCanvasWindow.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dcc/DccChatWindow.cpp | 10 | ||||
| -rw-r--r-- | src/modules/dcc/DccFileTransfer.cpp | 16 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt index 3b7d80fca..1496baaff 100644 --- a/src/modules/dcc/CMakeLists.txt +++ b/src/modules/dcc/CMakeLists.txt @@ -21,9 +21,9 @@ set(kvidcc_SRCS ) if(NOT COMPILE_DISABLE_DCC_VIDEO) - list(APPEND kvidcc_SRCS - DccVideoWindow.cpp - ) + list(APPEND kvidcc_SRCS + DccVideoWindow.cpp + ) endif() set(files diff --git a/src/modules/dcc/DccCanvasWindow.cpp b/src/modules/dcc/DccCanvasWindow.cpp index 8a7b4d779..484174737 100644 --- a/src/modules/dcc/DccCanvasWindow.cpp +++ b/src/modules/dcc/DccCanvasWindow.cpp @@ -160,7 +160,7 @@ { KviCString buf(KviCString::Format,"%s\r\n",text); // m_pSlaveThread->sendRawData(buf.ptr(),buf.len()); - + if(bUserFeedback) m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp index ac4180c6e..5f9cbc470 100644 --- a/src/modules/dcc/DccChatWindow.cpp +++ b/src/modules/dcc/DccChatWindow.cpp @@ -271,9 +271,9 @@ void DccChatWindow::fillCaptionBuffers() { QString tmp = QString("DCC %1 %2@%3:%4").arg( #ifdef COMPILE_SSL_SUPPORT - m_pDescriptor->bIsSSL ? "SChat" : "Chat", + m_pDescriptor->bIsSSL ? "SChat" : "Chat", #else - "Chat", + "Chat", #endif m_pDescriptor->szNick, m_pDescriptor->szIp, m_pDescriptor->szPort); @@ -351,7 +351,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback) KviCString buf(KviCString::Format,"%s\r\n",d); QString tmp = text.right(text.length() - 1); m_pSlaveThread->sendRawData(buf.ptr(),buf.len()); - + if(bUserFeedback) g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), @@ -363,7 +363,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback) #endif KviCString buf(KviCString::Format,"%s\r\n",d); m_pSlaveThread->sendRawData(buf.ptr(),buf.len()); - + if(bUserFeedback) g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG, m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), @@ -549,7 +549,7 @@ void DccChatWindow::connected() updateCaption(); m_pSlaveThread = new DccChatThread(this,m_pMarshal->releaseSocket()); - + #ifdef COMPILE_SSL_SUPPORT KviSSL * s = m_pMarshal->releaseSSL(); if(s) diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index a19a59f45..20aa5e2d7 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -656,7 +656,7 @@ void DccSendThread::run() quint64 uTotLastAck = 0; bool bAckHack = false; int iAckHackRounds = 0; - + if(m_pOpt->iPacketSize < 32)m_pOpt->iPacketSize = 32; char * buffer = (char *)KviMemory::allocate(m_pOpt->iPacketSize * sizeof(char)); @@ -761,7 +761,7 @@ void DccSendThread::run() { uTotLastAck = (iAckHackRounds*4u*1024u*1024u*1024u) + iNewAck; } else { - + uTotLastAck = iNewAck; } iBytesInAckBuffer = 0; @@ -773,7 +773,7 @@ void DccSendThread::run() // ssl error....? switch(m_pSSL->getProtocolError(readLen)) { - + case KviSSL::ZeroReturn: //if (!handleInvalidSocketRead(readLen) // break; @@ -866,7 +866,7 @@ void DccSendThread::run() // ssl error....? switch(m_pSSL->getProtocolError(readLen)) { - + case KviSSL::ZeroReturn: readLen = 0; break; @@ -907,7 +907,7 @@ void DccSendThread::run() if (!handleInvalidSocketRead(readLen)) break; #endif - + } else { KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_MESSAGE); e->setData(new KviCString(__tr2qs_ctx("WARNING: Received data in a DCC TSEND, there should be no acknowledges","dcc"))); @@ -2207,7 +2207,7 @@ bool DccFileTransfer::doResume(const char * filename,const char * port,quint64 f // port doesn't match if(!bFileNameMatches) return false; // neither filename nor port match - + if(!KVI_OPTION_BOOL(KviOption_boolAcceptMismatchedPortDccResumeRequests)) return false; @@ -2218,7 +2218,7 @@ bool DccFileTransfer::doResume(const char * filename,const char * port,quint64 f } // port matches - + if(!bFileNameMatches) { // bad file name @@ -2226,7 +2226,7 @@ bool DccFileTransfer::doResume(const char * filename,const char * port,quint64 f return false; // neither filename nor port match // port matches (this is very likely to be the right transfer) - + if(!KVI_OPTION_BOOL(KviOption_boolAcceptBrokenFileNameDccResumeRequests)) { if(_OUTPUT_VERBOSE) |