From 75bb29bca649278322a987419802655ed7c9817f Mon Sep 17 00:00:00 2001 From: Elvio Basello Date: Thu, 10 Feb 2011 22:03:48 +0000 Subject: renamed namespace git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5459 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/action/libkviaction.cpp | 6 +++--- src/modules/addon/libkviaddon.cpp | 4 ++-- src/modules/dcc/DccChatWindow.cpp | 6 +++--- src/modules/dcc/DccVideoWindow.cpp | 6 +++--- src/modules/dcc/libkvidcc.cpp | 1 - src/modules/dcc/requests.cpp | 6 +++--- src/modules/filetransferwindow/FileTransferWindow.cpp | 1 - src/modules/links/LinksWindow.cpp | 4 ++-- src/modules/list/ListWindow.cpp | 6 +++--- src/modules/notifier/NotifierWindow.cpp | 1 - src/modules/objects/libkviobjects.cpp | 8 ++++---- src/modules/options/OptionsWidget_message.cpp | 6 +++--- src/modules/options/libkvioptions.cpp | 4 ++-- src/modules/regchan/libkviregchan.cpp | 4 ++-- src/modules/reguser/libkvireguser.cpp | 4 ++-- src/modules/rijndael/libkvirijndael.cpp | 6 +++--- src/modules/sharedfile/libkvisharedfile.cpp | 4 ++-- src/modules/sharedfileswindow/SharedFilesWindow.cpp | 1 - src/modules/spaste/SlowPasteController.cpp | 4 ++-- src/modules/str/libkvistr.cpp | 4 ++-- src/modules/theme/libkvitheme.cpp | 1 - 21 files changed, 41 insertions(+), 46 deletions(-) (limited to 'src/modules') diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp index a47d89ed0..67a9f9366 100644 --- a/src/modules/action/libkviaction.cpp +++ b/src/modules/action/libkviaction.cpp @@ -33,7 +33,7 @@ #include "KviError.h" #include "kvi_out.h" #include "KviIconManager.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviKvsUserAction.h" #include "KviKvsScript.h" @@ -59,9 +59,9 @@ static bool action_kvs_cmd_list(KviKvsModuleCommandCall * c) while(KviAction * a = it.current()) { if(a->isKviUserActionNeverOverrideThis()) - pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cCore action: %Q"),KviMircCntrl::Bold,&(a->name())); + pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cCore action: %Q"),KviControlCodes::Bold,&(a->name())); else - pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cUser action: %Q"),KviMircCntrl::Bold,&(a->name())); + pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cUser action: %Q"),KviControlCodes::Bold,&(a->name())); pOut->output(KVI_OUT_VERBOSE,__tr2qs("Label: %Q"),&(a->visibleName())); pOut->output(KVI_OUT_VERBOSE,__tr2qs("Category: %Q"),&(a->category()->visibleName())); pOut->output(KVI_OUT_VERBOSE,__tr2qs("Description: %Q"),&(a->description())); diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp index c852c5b13..51451108b 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -34,7 +34,7 @@ #include "KviError.h" #include "kvi_out.h" #include "KviIconManager.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviConfigurationFile.h" #include "kvi_sourcesdate.h" #include "KviMiscUtils.h" @@ -143,7 +143,7 @@ static bool addon_kvs_cmd_list(KviKvsModuleCommandCall * c) KviPointerHashTableIterator it(*da); while(KviKvsScriptAddon * a = it.current()) { - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("%cAddon id %Q, version %Q%c","addon"),KviMircCntrl::Bold,&(a->name()),&(a->version()),KviMircCntrl::Bold); + c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("%cAddon id %Q, version %Q%c","addon"),KviControlCodes::Bold,&(a->name()),&(a->version()),KviControlCodes::Bold); c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Name: %Q","addon"),&(a->visibleName())); c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Description: %Q","addon"),&(a->description())); 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 @@ -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 @@ -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); } } diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp index 2a6ae9ce4..707277b5f 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.cpp +++ b/src/modules/filetransferwindow/FileTransferWindow.cpp @@ -31,7 +31,6 @@ #include "KviOptions.h" #include "KviLocale.h" #include "kvi_out.h" -#include "KviMircCntrl.h" #include "KviThemedLabel.h" #include "KviInput.h" #include "KviQString.h" diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp index dacd5b01a..88f7fdab4 100644 --- a/src/modules/links/LinksWindow.cpp +++ b/src/modules/links/LinksWindow.cpp @@ -31,7 +31,7 @@ #include "KviOptions.h" #include "KviLocale.h" #include "kvi_out.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviThemedLabel.h" #include "KviIrcContext.h" #include "KviIrcConnection.h" @@ -280,7 +280,7 @@ void LinksWindow::endOfLinks() if(root) { m_szRootServer = root->text(0); - output(KVI_OUT_LINKS,__tr2qs("%c%cLinks for %Q"),KviMircCntrl::Bold,KviMircCntrl::Underline,&m_szRootServer); + output(KVI_OUT_LINKS,__tr2qs("%c%cLinks for %Q"),KviControlCodes::Bold,KviControlCodes::Underline,&m_szRootServer); outputNoFmt(KVI_OUT_LINKS,"======================"); QString tmpo = wildServers ? __tr2qs("Total hosts listed") : __tr2qs("Total hosts in the network"); output(KVI_OUT_LINKS,"%Q: %d",&tmpo,totalHosts); diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp index 6d16df8e5..6a936db6c 100644 --- a/src/modules/list/ListWindow.cpp +++ b/src/modules/list/ListWindow.cpp @@ -31,7 +31,7 @@ #include "KviOptions.h" #include "KviLocale.h" #include "kvi_out.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviThemedLabel.h" #include "KviOptions.h" #include "KviIrcConnection.h" @@ -95,7 +95,7 @@ bool ChannelTreeWidgetItem::operator<(const QTreeWidgetItem & other) const case 2: default: //topic - return KviMircCntrl::stripControlBytes(m_pData->m_szTopic.toUpper()) < KviMircCntrl::stripControlBytes(((ChannelTreeWidgetItem*)&other)->itemData()->m_szTopic.toUpper()); + return KviControlCodes::stripControlBytes(m_pData->m_szTopic.toUpper()) < KviControlCodes::stripControlBytes(((ChannelTreeWidgetItem*)&other)->itemData()->m_szTopic.toUpper()); break; } } @@ -137,7 +137,7 @@ QSize ChannelTreeWidgetItemDelegate::sizeHint( const QStyleOptionViewItem &sovIt default: //topic if(item->itemData()->m_szStrippedTopic.isEmpty()) - item->itemData()->m_szStrippedTopic = KviMircCntrl::stripControlBytes(item->itemData()->m_szTopic); + item->itemData()->m_szStrippedTopic = KviControlCodes::stripControlBytes(item->itemData()->m_szTopic); return QSize(fm.width(item->itemData()->m_szStrippedTopic), iHeight); break; } diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp index 39b943b93..83a92b045 100644 --- a/src/modules/notifier/NotifierWindow.cpp +++ b/src/modules/notifier/NotifierWindow.cpp @@ -33,7 +33,6 @@ #include "KviWindow.h" #include "KviLocale.h" #include "KviMainWindow.h" -#include "KviMircCntrl.h" #include "KviOptions.h" #include "KviUserInput.h" #include "KviThemedLineEdit.h" diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index b0e443b8a..99f1d9574 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -74,7 +74,7 @@ #include "KviIconManager.h" #include "KviWindow.h" #include "kvi_out.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviApplication.h" #include "KviModule.h" #include "KviLocale.h" @@ -668,7 +668,7 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd) { cmd->window()->output(80, "Ptr %u: top level object: %c%s%c, class %s, %s, rect = %d, %d, %d, %d", list.at(i), - KviMircCntrl::Bold, list.at(i)->objectName().data(), KviMircCntrl::Bold, + KviControlCodes::Bold, list.at(i)->objectName().data(), KviControlCodes::Bold, list.at(i)->metaObject()->className(), list.at(i)->isVisible() ? "visible" : "hidden", list.at(i)->x(), list.at(i)->y(), list.at(i)->width(), list.at(i)->height()); @@ -706,8 +706,8 @@ static void dumpChildObjects(KviWindow *pWnd, QObject *parent, const char *spaci if (bFlag) { pWnd->output(80, "%sPtr %u: object: %c%s%c, class %s", - spacing, list.at(i), KviMircCntrl::Bold, - list.at(i)->objectName().data(), KviMircCntrl::Bold, list.at(i)->metaObject()->className() + spacing, list.at(i), KviControlCodes::Bold, + list.at(i)->objectName().data(), KviControlCodes::Bold, list.at(i)->metaObject()->className() ); } QString szClass=list.at(i)->metaObject()->className(); diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp index da082ce41..ed5c2b742 100644 --- a/src/modules/options/OptionsWidget_message.cpp +++ b/src/modules/options/OptionsWidget_message.cpp @@ -30,7 +30,7 @@ #include "KviOptions.h" #include "KviApplication.h" #include "KviLocale.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviConfigurationFile.h" #include "KviFileDialog.h" #include "KviTalVBox.h" @@ -365,7 +365,7 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent) m_pBackListWidgetDelegate = new MessageColorListWidgetItemDelegate(m_pBackListWidget); m_pBackListWidget->setItemDelegate(m_pBackListWidgetDelegate); - m_pBackItems[16] = new MessageColorListWidgetItem(m_pBackListWidget,KviMircCntrl::Transparent); + m_pBackItems[16] = new MessageColorListWidgetItem(m_pBackListWidget,KviControlCodes::Transparent); for(i=0;i<16;i++) { m_pBackItems[i] = new MessageColorListWidgetItem(m_pBackListWidget,i); @@ -633,7 +633,7 @@ void OptionsWidget_messageColors::load() tmp.sprintf("Back%d",it->optionId()); int back = cfg.readIntEntry(tmp,it->msgType()->back()); if(back < 0 || back > 15) - back = KviMircCntrl::Transparent; + back = KviControlCodes::Transparent; it->msgType()->setBack(back); tmp.sprintf("Icon%d",it->optionId()); diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index 6c8b8e9dc..772d4c038 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -32,7 +32,7 @@ #include "KviMainWindow.h" #include "KviWindow.h" #include "KviLocale.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "kvi_out.h" #include "KviSplashScreen.h" #include "KviPointerHashTable.h" @@ -152,7 +152,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c) static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,OptionsWidgetInstanceEntry * e,const char * prefix) { - c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c (%Q)",prefix,KviMircCntrl::Bold,e->szClassName,KviMircCntrl::Bold,&(e->szName)); + c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c (%Q)",prefix,KviControlCodes::Bold,e->szClassName,KviControlCodes::Bold,&(e->szName)); KviCString szPre = prefix; szPre.append(" "); if(e->pChildList) diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp index 1bf1bf749..71f42c99f 100644 --- a/src/modules/regchan/libkviregchan.cpp +++ b/src/modules/regchan/libkviregchan.cpp @@ -27,7 +27,7 @@ #include "KviRegisteredChannelDataBase.h" #include "KviLocale.h" #include "kvi_out.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviWindow.h" #include "kvi_debug.h" @@ -217,7 +217,7 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c) c->window()->outputNoFmt( KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Channel: %1%2@%3","register") - .arg(QChar(KviMircCntrl::Bold)) + .arg(QChar(KviControlCodes::Bold)) .arg(ch->name()) .arg(ch->netMask()) ); diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp index b5a57a788..3986417b0 100644 --- a/src/modules/reguser/libkvireguser.cpp +++ b/src/modules/reguser/libkvireguser.cpp @@ -31,7 +31,7 @@ #include "KviRegisteredUserDataBase.h" #include "KviIrcUserDataBase.h" #include "kvi_out.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviWindow.h" #include "KviLocale.h" #include "KviApplication.h" @@ -809,7 +809,7 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c) KviPointerList * ml = u->maskList(); if(u->matches(mask) || (ml->count() == 0)) { - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx(" User: %c%Q","register"),KviMircCntrl::Bold,&(u->name())); + c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx(" User: %c%Q","register"),KviControlCodes::Bold,&(u->name())); if(ml->count() == 0) { diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index 7877bc0e8..8c09ed902 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -29,7 +29,7 @@ #include "KviModule.h" #include "kvi_debug.h" #include "KviLocale.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviTimeUtils.h" #include "UglyBase64.h" @@ -208,7 +208,7 @@ return KviCryptEngine::EncryptError; } } - outBuffer.prepend(KviMircCntrl::CryptEscape); + outBuffer.prepend(KviControlCodes::CryptEscape); return KviCryptEngine::Encrypted; } @@ -220,7 +220,7 @@ return KviCryptEngine::DecryptError; } - if(*inBuffer != KviMircCntrl::CryptEscape) + if(*inBuffer != KviControlCodes::CryptEscape) { plainText = inBuffer; return KviCryptEngine::DecryptOkWasPlainText; diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp index 2ff562d1b..75202cdc0 100644 --- a/src/modules/sharedfile/libkvisharedfile.cpp +++ b/src/modules/sharedfile/libkvisharedfile.cpp @@ -28,7 +28,7 @@ #include "KviFileUtils.h" #include "KviLocale.h" #include "kvi_out.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviWindow.h" #include "KviMainWindow.h" #include "KviPointerHashTable.h" @@ -217,7 +217,7 @@ static bool sharedfile_kvs_cmd_list(KviKvsModuleCommandCall * c) for(KviSharedFile * o = l->first();o;o = l->next()) { c->window()->output(KVI_OUT_NONE,"%c%d. %s", - KviMircCntrl::Bold,idx + 1,it.currentKey().toUtf8().data()); + KviControlCodes::Bold,idx + 1,it.currentKey().toUtf8().data()); c->window()->output(KVI_OUT_NONE,__tr2qs_ctx(" File: %s (%u bytes)","sharedfileswindow"), o->absFilePath().toUtf8().data(),o->fileSize()); c->window()->output(KVI_OUT_NONE,__tr2qs_ctx(" Mask: %s","sharedfileswindow"), diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp index 5725475bb..e2866ae67 100644 --- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp +++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp @@ -31,7 +31,6 @@ #include "KviOptions.h" #include "KviLocale.h" #include "kvi_out.h" -#include "KviMircCntrl.h" #include "KviThemedLabel.h" #include "KviInput.h" #include "KviFileDialog.h" diff --git a/src/modules/spaste/SlowPasteController.cpp b/src/modules/spaste/SlowPasteController.cpp index 6debc6794..fbd1552bb 100644 --- a/src/modules/spaste/SlowPasteController.cpp +++ b/src/modules/spaste/SlowPasteController.cpp @@ -27,7 +27,7 @@ #include "KviWindow.h" #include "KviConsoleWindow.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviApplication.h" #include "KviOptions.h" @@ -105,7 +105,7 @@ void SlowPasteController::pasteFile(void) { line = data; if(line.isEmpty()) - line = QChar(KviMircCntrl::Reset); + line = QChar(KviControlCodes::Reset); line.replace('\t',QString(KVI_OPTION_UINT(KviOption_uintSpacesToExpandTabulationInput),' ')); //expand tabs to spaces diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index 8026a0a6b..668fc8996 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -27,7 +27,7 @@ #include "KviModule.h" #include "KviLocale.h" -#include "KviMircCntrl.h" +#include "KviControlCodes.h" #include "KviQString.h" #include "kvi_debug.h" #include "kvi_settings.h" @@ -886,7 +886,7 @@ static bool str_kvs_fnc_stripcolors(KviKvsModuleFunctionCall * c) KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("string",KVS_PT_STRING,0,szString) KVSM_PARAMETERS_END(c) - c->returnValue()->setString(KviMircCntrl::stripControlBytes(szString)); + c->returnValue()->setString(KviControlCodes::stripControlBytes(szString)); return true; } diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp index 6483de324..3019deb37 100644 --- a/src/modules/theme/libkvitheme.cpp +++ b/src/modules/theme/libkvitheme.cpp @@ -33,7 +33,6 @@ #include "KviError.h" #include "kvi_out.h" #include "KviIconManager.h" -#include "KviMircCntrl.h" #include "KviConfigurationFile.h" #include "kvi_sourcesdate.h" #include "KviFileUtils.h" -- cgit v1.3.1-10-gc9f91