diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/action/libkviaction.cpp | 4 | ||||
| -rw-r--r-- | src/modules/addon/libkviaddon.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dcc/chat.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dcc/requests.cpp | 4 | ||||
| -rw-r--r-- | src/modules/links/linkswindow.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/libkviobjects.cpp | 6 | ||||
| -rw-r--r-- | src/modules/options/libkvioptions.cpp | 2 | ||||
| -rw-r--r-- | src/modules/options/optw_messages.cpp | 4 | ||||
| -rw-r--r-- | src/modules/regchan/libkviregchan.cpp | 2 | ||||
| -rw-r--r-- | src/modules/reguser/libkvireguser.cpp | 2 | ||||
| -rw-r--r-- | src/modules/rijndael/libkvirijndael.cpp | 4 | ||||
| -rw-r--r-- | src/modules/sharedfile/libkvisharedfile.cpp | 2 | ||||
| -rw-r--r-- | src/modules/spaste/controller.cpp | 2 |
13 files changed, 19 insertions, 19 deletions
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp index 507b7385d..a47d89ed0 100644 --- a/src/modules/action/libkviaction.cpp +++ b/src/modules/action/libkviaction.cpp @@ -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"),KVI_TEXT_BOLD,&(a->name())); + pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cCore action: %Q"),KviMircCntrl::Bold,&(a->name())); else - pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cUser action: %Q"),KVI_TEXT_BOLD,&(a->name())); + pOut->output(KVI_OUT_VERBOSE,__tr2qs("%cUser action: %Q"),KviMircCntrl::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 bae5914bd..79f39a851 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -143,7 +143,7 @@ static bool addon_kvs_cmd_list(KviKvsModuleCommandCall * c) KviPointerHashTableIterator<QString,KviKvsScriptAddon> it(*da); while(KviKvsScriptAddon * a = it.current()) { - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("%cAddon id %Q, version %Q%c","addon"),KVI_TEXT_BOLD,&(a->name()),&(a->version()),KVI_TEXT_BOLD); + 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("Name: %Q","addon"),&(a->visibleName())); c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Description: %Q","addon"),&(a->description())); diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index a882c569f..f7dbf6048 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -308,7 +308,7 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback) { if(cryptSessionInfo()->m_bDoEncrypt) { - if(*d != KVI_TEXT_CRYPTESCAPE) + if(*d != KviMircCntrl::CryptEscape) { KviCString encrypted; cryptSessionInfo()->m_pEngine->setMaxEncryptLen(-1); diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp index 7ecbb8900..5dbe4cea5 100644 --- a/src/modules/dcc/requests.cpp +++ b/src/modules/dcc/requests.cpp @@ -719,12 +719,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"), - KVI_TEXT_BOLD, + KviMircCntrl::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()), - KVI_TEXT_BOLD); + KviMircCntrl::Bold); } } diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index 88c71c023..10f68f782 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -283,7 +283,7 @@ void KviLinksWindow::endOfLinks() if(root) { m_szRootServer = root->text(0); - output(KVI_OUT_LINKS,__tr2qs("%c%cLinks for %Q"),KVI_TEXT_BOLD,KVI_TEXT_UNDERLINE,&m_szRootServer); + output(KVI_OUT_LINKS,__tr2qs("%c%cLinks for %Q"),KviMircCntrl::Bold,KviMircCntrl::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/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 7c2d29092..3ad1673a7 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -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), - KVI_TEXT_BOLD, list.at(i)->objectName().data(), KVI_TEXT_BOLD, + KviMircCntrl::Bold, list.at(i)->objectName().data(), KviMircCntrl::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), KVI_TEXT_BOLD, - list.at(i)->objectName().data(), KVI_TEXT_BOLD, list.at(i)->metaObject()->className() + spacing, list.at(i), KviMircCntrl::Bold, + list.at(i)->objectName().data(), KviMircCntrl::Bold, list.at(i)->metaObject()->className() ); } QString szClass=list.at(i)->metaObject()->className(); diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index e5187588d..47c9793ed 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -152,7 +152,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c) static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,KviOptionsWidgetInstanceEntry * e,const char * prefix) { - c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c (%Q)",prefix,KVI_TEXT_BOLD,e->szClassName,KVI_TEXT_BOLD,&(e->szName)); + c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c (%Q)",prefix,KviMircCntrl::Bold,e->szClassName,KviMircCntrl::Bold,&(e->szName)); KviCString szPre = prefix; szPre.append(" "); if(e->pChildList) diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index c2cfa791c..576bde517 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -366,7 +366,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent) m_pBackListWidgetDelegate = new KviMessageColorListWidgetItemDelegate(m_pBackListWidget); m_pBackListWidget->setItemDelegate(m_pBackListWidgetDelegate); - m_pBackItems[16] = new KviMessageColorListWidgetItem(m_pBackListWidget,KVI_TRANSPARENT); + m_pBackItems[16] = new KviMessageColorListWidgetItem(m_pBackListWidget,KviMircCntrl::Transparent); for(i=0;i<16;i++) { m_pBackItems[i] = new KviMessageColorListWidgetItem(m_pBackListWidget,i); @@ -630,7 +630,7 @@ void KviMessageColorsOptionsWidget::load() tmp.sprintf("Back%d",it->optionId()); int back = cfg.readIntEntry(tmp,it->msgType()->back()); - if(back < 0 || back > 15)back = KVI_TRANSPARENT; + if(back < 0 || back > 15)back = KviMircCntrl::Transparent; it->msgType()->setBack(back); tmp.sprintf("Icon%d",it->optionId()); diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp index b9dcda6a9..1bf1bf749 100644 --- a/src/modules/regchan/libkviregchan.cpp +++ b/src/modules/regchan/libkviregchan.cpp @@ -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(KVI_TEXT_BOLD)) + .arg(QChar(KviMircCntrl::Bold)) .arg(ch->name()) .arg(ch->netMask()) ); diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp index b8a33a910..0c94650c3 100644 --- a/src/modules/reguser/libkvireguser.cpp +++ b/src/modules/reguser/libkvireguser.cpp @@ -809,7 +809,7 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c) KviPointerList<KviIrcMask> * ml = u->maskList(); if(u->matches(mask) || (ml->count() == 0)) { - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx(" User: %c%Q","register"),KVI_TEXT_BOLD,&(u->name())); + c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx(" User: %c%Q","register"),KviMircCntrl::Bold,&(u->name())); if(ml->count() == 0) { diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index 3ec5e46a7..c5cf5bd0b 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -206,7 +206,7 @@ return KviCryptEngine::EncryptError; } } - outBuffer.prepend(KVI_TEXT_CRYPTESCAPE); + outBuffer.prepend(KviMircCntrl::CryptEscape); return KviCryptEngine::Encrypted; } @@ -218,7 +218,7 @@ return KviCryptEngine::DecryptError; } - if(*inBuffer != KVI_TEXT_CRYPTESCAPE) + if(*inBuffer != KviMircCntrl::CryptEscape) { plainText = inBuffer; return KviCryptEngine::DecryptOkWasPlainText; diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp index 7af94d332..2ff562d1b 100644 --- a/src/modules/sharedfile/libkvisharedfile.cpp +++ b/src/modules/sharedfile/libkvisharedfile.cpp @@ -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", - KVI_TEXT_BOLD,idx + 1,it.currentKey().toUtf8().data()); + KviMircCntrl::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/spaste/controller.cpp b/src/modules/spaste/controller.cpp index 5b79881e8..525838e05 100644 --- a/src/modules/spaste/controller.cpp +++ b/src/modules/spaste/controller.cpp @@ -105,7 +105,7 @@ void SPasteController::pasteFile(void) { line = data; if(line.isEmpty()) - line = QChar(KVI_TEXT_RESET); + line = QChar(KviMircCntrl::Reset); line.replace('\t',QString(KVI_OPTION_UINT(KviOption_uintSpacesToExpandTabulationInput),' ')); //expand tabs to spaces |
