diff options
Diffstat (limited to 'src/modules/dcc/chat.cpp')
| -rw-r--r-- | src/modules/dcc/chat.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index ef06da588..5bd2b26ca 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -56,6 +56,11 @@ #include "kvi_ircconnectionuserinfo.h" #include "kvi_kvs_eventtriggers.h" #include "kvi_qcstring.h" +#include "kvi_tal_vbox.h" + +#include <QSplitter> +#include <QEvent> +#include <QResizeEvent> #ifdef COMPILE_CRYPT_SUPPORT #include "kvi_crypt.h" @@ -63,17 +68,10 @@ #include "kvi_mirccntrl.h" #endif -#include <qsplitter.h> -#include <qevent.h> -#include "kvi_tal_vbox.h" - - #ifdef COMPILE_SSL_SUPPORT #include "kvi_sslmaster.h" #endif - - extern KviDccBroker * g_pDccBroker; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -162,7 +160,6 @@ void KviDccChat::startConnection() int ret = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout); #endif if(ret != KviError_success)handleMarshalError(ret); - } else { // ACTIVE CONNECTION output(KVI_OUT_DCCMSG,__tr2qs_ctx("Attempting an active DCC %s connection","dcc"),m_pDescriptor->szType.utf8().data()); @@ -185,7 +182,6 @@ void KviDccChat::connectionInProgress() if(m_pDescriptor->bSendRequest) { - KviStr ip; if(!m_pDescriptor->szFakeIp.isEmpty()) { @@ -289,7 +285,6 @@ QPixmap * KviDccChat::myIconPtr() return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG); } - void KviDccChat::getBaseLogFileName(KviStr &buffer) { buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.utf8().data(),m_pDescriptor->szIp.utf8().data(),m_pDescriptor->szPort.utf8().data()); @@ -543,13 +538,11 @@ KviDccChatThread::KviDccChatThread(KviWindow *wnd,kvi_socket_t fd) m_pOutBuffers->setAutoDelete(true); } - KviDccChatThread::~KviDccChatThread() { if(m_pOutBuffers)delete m_pOutBuffers; } - void KviDccChatThread::run() { KviDccThreadIncomingData data; |