diff options
| author |  Szymon Tomasz Stefanek | 2011-01-01 23:36:56 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2011-01-01 23:36:56 +0000 |
| commit | f7f64c33bd3025012d7cbf071f472d90fc27be31 (patch) | |
| tree | f41f47e14dcd951f6826f561263dd59b3fc561a2 /src/modules/dcc | |
| parent | Fix a compilation error under windows (diff) | |
| download | KVIrc-f7f64c33bd3025012d7cbf071f472d90fc27be31.tar.gz KVIrc-f7f64c33bd3025012d7cbf071f472d90fc27be31.tar.bz2 KVIrc-f7f64c33bd3025012d7cbf071f472d90fc27be31.zip | |
Fix an issue related to KviError::Code in dcc marshal
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5286 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc')
| -rw-r--r-- | src/modules/dcc/DccChatWindow.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dcc/DccFileTransfer.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dcc/DccMarshal.cpp | 7 | ||||
| -rw-r--r-- | src/modules/dcc/DccMarshal.h | 2 | ||||
| -rw-r--r-- | src/modules/dcc/DccVideoWindow.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dcc/DccVoiceWindow.cpp | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp index bf5a935c9..c7071b437 100644 --- a/src/modules/dcc/DccChatWindow.cpp +++ b/src/modules/dcc/DccChatWindow.cpp @@ -112,7 +112,7 @@ DccChatWindow::DccChatWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char if(KVI_OPTION_BOOL(KviOption_boolAutoLogDccChat))m_pIrcView->startLogging(); m_pMarshal = new DccMarshal(this); - connect(m_pMarshal,SIGNAL(error(int)),this,SLOT(handleMarshalError(int))); + connect(m_pMarshal,SIGNAL(error(KviError::Code)),this,SLOT(handleMarshalError(KviError::Code))); connect(m_pMarshal,SIGNAL(connected()),this,SLOT(connected())); connect(m_pMarshal,SIGNAL(inProgress()),this,SLOT(connectionInProgress())); #ifdef COMPILE_SSL_SUPPORT diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index 4fd0ed4a2..8e9e1b0a3 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -1010,7 +1010,7 @@ DccFileTransfer::DccFileTransfer(DccDescriptor * dcc) m_pMarshal = new DccMarshal(this); - connect(m_pMarshal,SIGNAL(error(int)),this,SLOT(handleMarshalError(int))); + connect(m_pMarshal,SIGNAL(error(KviError::Code)),this,SLOT(handleMarshalError(KviError::Code))); connect(m_pMarshal,SIGNAL(connected()),this,SLOT(connected())); connect(m_pMarshal,SIGNAL(inProgress()),this,SLOT(connectionInProgress())); #ifdef COMPILE_SSL_SUPPORT diff --git a/src/modules/dcc/DccMarshal.cpp b/src/modules/dcc/DccMarshal.cpp index 719ca33a8..5e0bcc5a7 100644 --- a/src/modules/dcc/DccMarshal.cpp +++ b/src/modules/dcc/DccMarshal.cpp @@ -477,10 +477,11 @@ void DccMarshal::snActivated(int) if(sockError != 0) { //failed - if(sockError > 0)sockError = KviError::translateSystemError(sockError); - else sockError = KviError::UnknownError; //Error 0 ? + KviError::Code eError; + if(sockError > 0)eError = KviError::translateSystemError(sockError); + else eError = KviError::UnknownError; //Error 0 ? reset(); - emit error(sockError); + emit error(eError); return; } //Succesfully connected... diff --git a/src/modules/dcc/DccMarshal.h b/src/modules/dcc/DccMarshal.h index 228905224..3065a3a71 100644 --- a/src/modules/dcc/DccMarshal.h +++ b/src/modules/dcc/DccMarshal.h @@ -109,7 +109,7 @@ signals: void sslError(const char * msg); void connected(); void inProgress(); - void error(int); + void error(KviError::Code); }; diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp index f9464158f..75989cdd6 100644 --- a/src/modules/dcc/DccVideoWindow.cpp +++ b/src/modules/dcc/DccVideoWindow.cpp @@ -495,7 +495,7 @@ DccVideoWindow::DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const cha m_Timer.start(FRAME_DURATION); m_pMarshal = new DccMarshal(this); - connect(m_pMarshal,SIGNAL(error(int)),this,SLOT(handleMarshalError(int))); + connect(m_pMarshal,SIGNAL(error(KviError::Code)),this,SLOT(handleMarshalError(KviError::Code))); connect(m_pMarshal,SIGNAL(connected()),this,SLOT(connected())); connect(m_pMarshal,SIGNAL(inProgress()),this,SLOT(connectionInProgress())); diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp index f1ede8af7..b736b4058 100644 --- a/src/modules/dcc/DccVoiceWindow.cpp +++ b/src/modules/dcc/DccVoiceWindow.cpp @@ -704,7 +704,7 @@ DccVoiceWindow::DccVoiceWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const cha //setFocusHandler(m_pIrcView,this); m_pMarshal = new DccMarshal(this); - connect(m_pMarshal,SIGNAL(error(int)),this,SLOT(handleMarshalError(int))); + connect(m_pMarshal,SIGNAL(error(KviError::Code)),this,SLOT(handleMarshalError(KviError::Code))); connect(m_pMarshal,SIGNAL(connected()),this,SLOT(connected())); connect(m_pMarshal,SIGNAL(inProgress()),this,SLOT(connectionInProgress())); |