diff options
| author |  Elvio Basello | 2011-02-10 22:03:48 +0000 |
|---|---|---|
| committer | Elvio Basello | 2011-02-10 22:03:48 +0000 |
| commit | 75bb29bca649278322a987419802655ed7c9817f (patch) | |
| tree | e2ec1ee869d0ccaedd6e93836c2c827975094a2b /src/modules/dcc | |
| parent | fixed fish key exchange with cryptopp (diff) | |
| download | KVIrc-75bb29bca649278322a987419802655ed7c9817f.tar.gz KVIrc-75bb29bca649278322a987419802655ed7c9817f.tar.bz2 KVIrc-75bb29bca649278322a987419802655ed7c9817f.zip | |
renamed namespace
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5459 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc')
| -rw-r--r-- | src/modules/dcc/DccChatWindow.cpp | 6 | ||||
| -rw-r--r-- | src/modules/dcc/DccVideoWindow.cpp | 6 | ||||
| -rw-r--r-- | src/modules/dcc/libkvidcc.cpp | 1 | ||||
| -rw-r--r-- | src/modules/dcc/requests.cpp | 6 |
4 files changed, 9 insertions, 10 deletions
diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp index 0d0fea505..d3bfddfa1 100644 --- a/src/modules/dcc/DccChatWindow.cpp +++ b/src/modules/dcc/DccChatWindow.cpp @@ -52,7 +52,7 @@ #include "KviIrcConnection.h" #include "KviIrcConnectionUserInfo.h" #include "KviKvsEventTriggers.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviTalVBox.h" #include <QEvent> @@ -308,7 +308,7 @@ void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback) { if(cryptSessionInfo()->m_bDoEncrypt) { - if(*d != KviMircCntrl::CryptEscape) + if(*d != KviControlCodes::CryptEscape) { KviCString encrypted; cryptSessionInfo()->m_pEngine->setMaxEncryptLen(-1); @@ -386,7 +386,7 @@ void DccChatWindow::ownAction(const QString &text) //see bug ticket #220 if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages)) { - szTmpBuffer = KviMircCntrl::stripControlBytes(text); + szTmpBuffer = KviControlCodes::stripControlBytes(text); } else { szTmpBuffer = text; } diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp index a20d0489c..f3bca6bd9 100644 --- a/src/modules/dcc/DccVideoWindow.cpp +++ b/src/modules/dcc/DccVideoWindow.cpp @@ -40,7 +40,7 @@ #include "kvi_socket.h" #include "KviIrcConnection.h" #include "KviTalVBox.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviMainWindow.h" #include <QToolTip> @@ -675,7 +675,7 @@ void DccVideoWindow::ownMessage(const QString &text, bool bUserFeedback) { if(cryptSessionInfo()->m_bDoEncrypt) { - if(*d != KviMircCntrl::CryptEscape) + if(*d != KviControlCodes::CryptEscape) { KviCString encrypted; cryptSessionInfo()->m_pEngine->setMaxEncryptLen(-1); @@ -753,7 +753,7 @@ void DccVideoWindow::ownAction(const QString &text) //see bug ticket #220 if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages)) { - szTmpBuffer = KviMircCntrl::stripControlBytes(text); + szTmpBuffer = KviControlCodes::stripControlBytes(text); } else { szTmpBuffer = text; } diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp index 54b60de54..1f0f352da 100644 --- a/src/modules/dcc/libkvidcc.cpp +++ b/src/modules/dcc/libkvidcc.cpp @@ -44,7 +44,6 @@ #include "KviError.h" #include "KviOptions.h" #include "kvi_defaults.h" -#include "KviMircCntrl.h" #include "KviApplication.h" #include "KviIrcConnection.h" #include "KviIrcConnectionUserInfo.h" diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index 242dbf0f2..c235596cb 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -50,7 +50,7 @@ #include "KviOptions.h" #include "kvi_defaults.h" #include "KviSharedFilesManager.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviApplication.h" #include "KviIrcConnection.h" #include "KviIrcConnectionUserInfo.h" @@ -705,12 +705,12 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc) #endif dcc->ctcpMsg->msg->console()->output(KVI_OUT_DCCMSG, __tr2qs_ctx("Use %c\r![!dbl]dcc.send %s -i=%s -p=%s %Q\r/dcc.send %s -i=%s -p=%s %Q\r%c to send the file (or double-click on the socket)","dcc"), - KviMircCntrl::Bold, + KviControlCodes::Bold, szSwitches.ptr(), dcc->szParam2.ptr(),dcc->szParam3.ptr(),&(dcc->ctcpMsg->pSource->nick()), szSwitches.ptr(), dcc->szParam2.ptr(),dcc->szParam3.ptr(),&(dcc->ctcpMsg->pSource->nick()), - KviMircCntrl::Bold); + KviControlCodes::Bold); } } |