diff options
Diffstat (limited to 'src/kvirc/kvs')
44 files changed, 227 insertions, 227 deletions
diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.h b/src/kvirc/kvs/kvi_kvs_aliasmanager.h index 49fda27..5f503de 100644 --- a/src/kvirc/kvs/kvi_kvs_aliasmanager.h +++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.h @@ -48,9 +48,9 @@ public: KviPointerHashTable<TQString,KviKvsScript> * aliasDict(){ return m_pAliasDict; }; const KviKvsScript * lookup(const TQString & szName) - { return m_pAliasDict->tqfind(szName); }; + { return m_pAliasDict->find(szName); }; void add(const TQString &szName,KviKvsScript * pAlias) - { m_pAliasDict->tqreplace(szName,pAlias); }; + { m_pAliasDict->replace(szName,pAlias); }; bool remove(const TQString & szName) { return m_pAliasDict->remove(szName); }; void clear() diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp index e925492..398fabd 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp @@ -143,8 +143,8 @@ namespace KviKvsCoreCallbackCommands KVSCCC_PARAMETERS_END KviDns::QueryType queryType = KviDns::IpV4; - if(KVSCCC_pSwitches->tqfind('i',"ipv6"))queryType = KviDns::IpV6; - if(KVSCCC_pSwitches->tqfind('a',"any"))queryType = KviDns::Any; + if(KVSCCC_pSwitches->find('i',"ipv6"))queryType = KviDns::IpV6; + if(KVSCCC_pSwitches->find('a',"any"))queryType = KviDns::Any; KviKvsVariant * pMagic = pMagicPtr ? new KviKvsVariant(*pMagicPtr) : new KviKvsVariant(); @@ -256,14 +256,14 @@ namespace KviKvsCoreCallbackCommands // make sure that we have only doubled "::" and not ":" or ":::..." TQString tmp = szName; - tmp.tqreplace("::","@"); // @ is not allowed by the rule above - if(tmp.tqfind(":") != -1) + tmp.replace("::","@"); // @ is not allowed by the rule above + if(tmp.find(":") != -1) { KVSCCC_pContext->error(__tr2qs("Stray ':' character in alias name: did you mean ...<namespace>::<name> ?")); return false; } - if(tmp.tqfind("@@") != -1) + if(tmp.find("@@") != -1) { KVSCCC_pContext->error(__tr2qs("Found an empty namespace in alias name")); return false; @@ -273,7 +273,7 @@ namespace KviKvsCoreCallbackCommands { if(!KviKvsAliasManager::instance()->remove(szName)) { - if(!KVSCCC_pSwitches->tqfind('q',"quiet")) + if(!KVSCCC_pSwitches->find('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("The alias %Q is not existing"),&szName); } } else { @@ -359,7 +359,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC_pConnection->asyncWhoisData()->add(info); - if(KVSCCC_pSwitches->tqfind('i',"idle-time"))KVSCCC_pConnection->sendFmtData("WHOIS %s %s",szN.data(),szN.data()); + if(KVSCCC_pSwitches->find('i',"idle-time"))KVSCCC_pConnection->sendFmtData("WHOIS %s %s",szN.data(),szN.data()); else KVSCCC_pConnection->sendFmtData("WHOIS %s",szN.data()); return true; @@ -432,7 +432,7 @@ namespace KviKvsCoreCallbackCommands if(!KVSCCC_pWindow->buttonContainer()) { - if(!KVSCCC_pSwitches->tqfind('q',"quiet")) + if(!KVSCCC_pSwitches->find('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("The specified window has no button containers")); return true; } @@ -443,7 +443,7 @@ namespace KviKvsCoreCallbackCommands { if(pButton)delete pButton; else { - if(!KVSCCC_pSwitches->tqfind('q',"quiet")) + if(!KVSCCC_pSwitches->find('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("Window button '%Q' not found"),&szName); } return true; @@ -471,12 +471,12 @@ namespace KviKvsCoreCallbackCommands { pButton->setButtonPixmap(*pix); } else { - if(!KVSCCC_pSwitches->tqfind('q',"quiet")) + if(!KVSCCC_pSwitches->find('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&szIcon); } } - pButton->setEnabled(!(KVSCCC_pSwitches->tqfind('d',"disabled"))); + pButton->setEnabled(!(KVSCCC_pSwitches->find('d',"disabled"))); return true; } @@ -528,7 +528,7 @@ namespace KviKvsCoreCallbackCommands { if(!KviKvsEventManager::instance()->isValidRawEvent(iNumber)) { - if(!KVSCCC_pSwitches->tqfind('q',"quiet")) + if(!KVSCCC_pSwitches->find('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } @@ -536,7 +536,7 @@ namespace KviKvsCoreCallbackCommands iNumber = KviKvsEventManager::instance()->findAppEventIndexByName(szEventName); if(!KviKvsEventManager::instance()->isValidAppEvent(iNumber)) { - if(!KVSCCC_pSwitches->tqfind('q',"quiet")) + if(!KVSCCC_pSwitches->find('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } @@ -548,13 +548,13 @@ namespace KviKvsCoreCallbackCommands { if(!KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName)) { - if(!KVSCCC_pSwitches->tqfind('q',"quiet")) + if(!KVSCCC_pSwitches->find('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber); } } else { if(!KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName)) { - if(!KVSCCC_pSwitches->tqfind('q',"quiet")) + if(!KVSCCC_pSwitches->find('q',"quiet")) KVSCCC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } } @@ -679,7 +679,7 @@ namespace KviKvsCoreCallbackCommands The stderr data event is similar to the stdout one but there are three differences. The first one is that the stderr event is NOT triggered by default: you must use the -e switch to enable it. The second difference is that $0 - tqcontains "stderr" instead of "stdout". The last difference is that $1 contains data + contains "stderr" instead of "stdout". The last difference is that $1 contains data coming from the slave process stderr stream.[br] [br] [b]Termination event[/b][br] @@ -914,13 +914,13 @@ namespace KviKvsCoreCallbackCommands int f = 0; - if(KVSCCC_pSwitches->tqfind('t',"trigger-termination") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED; - if(KVSCCC_pSwitches->tqfind('n',"no-stdout") == 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT; - if(KVSCCC_pSwitches->tqfind('e',"trigger-stderr") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR; - if(KVSCCC_pSwitches->tqfind('x',"trigger-startup") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTARTED; - if(KVSCCC_pSwitches->tqfind('b',"output-block") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS; - if(KVSCCC_pSwitches->tqfind('w',"bind-to-window") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_KILLIFNOWINDOW; - if(KVSCCC_pSwitches->tqfind('d',"direct") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_NOSHELL; + if(KVSCCC_pSwitches->find('t',"trigger-termination") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED; + if(KVSCCC_pSwitches->find('n',"no-stdout") == 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT; + if(KVSCCC_pSwitches->find('e',"trigger-stderr") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR; + if(KVSCCC_pSwitches->find('x',"trigger-startup") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTARTED; + if(KVSCCC_pSwitches->find('b',"output-block") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS; + if(KVSCCC_pSwitches->find('w',"bind-to-window") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_KILLIFNOWINDOW; + if(KVSCCC_pSwitches->find('d',"direct") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_NOSHELL; TQString szShell; KVSCCC_pSwitches->getAsStringIfExisting('s',"shell",szShell); @@ -928,7 +928,7 @@ namespace KviKvsCoreCallbackCommands kvs_int_t iPingTime = 0; kvs_int_t iMaxRunTime = 0; - KviKvsVariant * pPing = KVSCCC_pSwitches->tqfind('p',"trigger-ping"); + KviKvsVariant * pPing = KVSCCC_pSwitches->find('p',"trigger-ping"); if(pPing) { if(!(pPing->asInteger(iPingTime) && iPingTime > 0)) @@ -938,7 +938,7 @@ namespace KviKvsCoreCallbackCommands } } - KviKvsVariant * pKill = KVSCCC_pSwitches->tqfind('k',"kill-after"); + KviKvsVariant * pKill = KVSCCC_pSwitches->find('k',"kill-after"); if(pKill) { if(!(pKill->asInteger(iMaxRunTime) && iMaxRunTime > 0)) @@ -962,7 +962,7 @@ namespace KviKvsCoreCallbackCommands KviKvsProcessAsyncOperation * op = new KviKvsProcessAsyncOperation(d); if(!op->start()) { - if(KVSCCC_pSwitches->tqfind('q',"quiet") == 0)KVSCCC_pContext->warning(__tr2qs("Failed to start the process")); + if(KVSCCC_pSwitches->find('q',"quiet") == 0)KVSCCC_pContext->warning(__tr2qs("Failed to start the process")); delete op; } @@ -1132,8 +1132,8 @@ namespace KviKvsCoreCallbackCommands KviKvsTimer::Lifetime lt; - if(KVSCCC_pSwitches->tqfind('s',"single-shot"))lt = KviKvsTimer::SingleShot; - else if(KVSCCC_pSwitches->tqfind('p',"persistent"))lt = KviKvsTimer::Persistent; + if(KVSCCC_pSwitches->find('s',"single-shot"))lt = KviKvsTimer::SingleShot; + else if(KVSCCC_pSwitches->find('p',"persistent"))lt = KviKvsTimer::Persistent; else lt = KviKvsTimer::WindowLifetime; // prepare the callback parameters diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp index 508ec52..60fbe44 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp @@ -784,7 +784,7 @@ namespace KviKvsCoreFunctions { //Check for right Characters #ifdef COMPILE_ON_WINDOWS - if (szAllowedCharacters.tqfind((char)(c->tqunicode()),0,true) >= 0) tmpFormat += '%'; + if (szAllowedCharacters.find((char)(c->tqunicode()),0,true) >= 0) tmpFormat += '%'; #else if (c->isLetter()) tmpFormat += '%'; #endif diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp index 4e9f3c7..e8aae4f 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp @@ -182,7 +182,7 @@ namespace KviKvsCoreFunctions { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick); if(e) { KVSCF_pRetBuffer->setString(e->host()); @@ -678,7 +678,7 @@ namespace KviKvsCoreFunctions { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick); if(e) { KVSCF_pRetBuffer->setBoolean(e->hasHost() && e->hasUser()); diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp index 459f024..4fb92ce 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp @@ -118,7 +118,7 @@ namespace KviKvsCoreFunctions { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick.isEmpty() ? KVSCF_pContext->window()->connection()->currentNickName() : szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick.isEmpty() ? KVSCF_pContext->window()->connection()->currentNickName() : szNick); if(e) { KviIrcMask u; diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp index 8b4ef73..a5478dc 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp @@ -399,14 +399,14 @@ namespace KviKvsCoreFunctions if(szSwitch.length() > 1) { if(szLongSwitch.isEmpty()) - v = sl->tqfind(szSwitch); + v = sl->find(szSwitch); else - v = sl->tqfind(szSwitch[0].tqunicode(),szLongSwitch); + v = sl->find(szSwitch[0].tqunicode(),szLongSwitch); }else { if(szLongSwitch.isEmpty()) - v = sl->tqfind(szSwitch[0]); + v = sl->find(szSwitch[0]); else - v = sl->tqfind(szSwitch[0].tqunicode(),szLongSwitch); + v = sl->find(szSwitch[0].tqunicode(),szLongSwitch); } if(v)KVSCF_pRetBuffer->copyFrom(*v); @@ -981,7 +981,7 @@ namespace KviKvsCoreFunctions { if(KVSCF_pContext->window()->console()->isConnected()) { - KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick); + KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick); if(e) { KVSCF_pRetBuffer->setString(e->user()); @@ -1035,9 +1035,9 @@ namespace KviKvsCoreFunctions if(szType.isEmpty()) KVSCF_pRetBuffer->setString(KVI_VERSION); else { - if(szType.tqfind('r') != -1)KVSCF_pRetBuffer->setString(KVI_RELEASE_NAME); - else if(szType.tqfind('s') != -1)KVSCF_pRetBuffer->setString(KVI_SOURCES_DATE); - else if(szType.tqfind('b') != -1)KVSCF_pRetBuffer->setString(KVI_BUILD_DATE); + if(szType.find('r') != -1)KVSCF_pRetBuffer->setString(KVI_RELEASE_NAME); + else if(szType.find('s') != -1)KVSCF_pRetBuffer->setString(KVI_SOURCES_DATE); + else if(szType.find('b') != -1)KVSCF_pRetBuffer->setString(KVI_BUILD_DATE); else KVSCF_pRetBuffer->setString(KVI_VERSION); } return true; diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index c79e832..e46af6e 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -122,7 +122,7 @@ namespace KviKvsCoreSimpleCommands if(szReason.isEmpty())szReason = KVI_OPTION_STRING(KviOption_stringAwayMessage); - if(KVSCSC_pSwitches->tqfind('a',"all-networks")) + if(KVSCSC_pSwitches->find('a',"all-networks")) { KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) @@ -176,7 +176,7 @@ namespace KviKvsCoreSimpleCommands KVSCSC(back) { - if(KVSCSC_pSwitches->tqfind('a',"all-networks")) + if(KVSCSC_pSwitches->find('a',"all-networks")) { KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) @@ -291,10 +291,10 @@ namespace KviKvsCoreSimpleCommands kvs_int_t pitch = -1; kvs_int_t duration = -1; - bool bSync = (KVSCSC_pSwitches->tqfind('s',"sync") != 0); + bool bSync = (KVSCSC_pSwitches->find('s',"sync") != 0); bool bOk = false; - KviKvsVariant * pPitch = KVSCSC_pSwitches->tqfind('p',"pitch"); + KviKvsVariant * pPitch = KVSCSC_pSwitches->find('p',"pitch"); if(pPitch) { if(!pPitch->asInteger(pitch)) @@ -304,7 +304,7 @@ namespace KviKvsCoreSimpleCommands } } - KviKvsVariant * pDuration = KVSCSC_pSwitches->tqfind('d',"duration"); + KviKvsVariant * pDuration = KVSCSC_pSwitches->find('d',"duration"); if(pDuration) { if(!pDuration->asInteger(duration)) @@ -410,7 +410,7 @@ namespace KviKvsCoreSimpleCommands if(!KVSCSC_pWindow->buttonContainer()) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The specified window has no button containers")); + if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The specified window has no button containers")); return true; } @@ -418,7 +418,7 @@ namespace KviKvsCoreSimpleCommands if(!pButton) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No button with type %Q named %Q"),&tbTypeUnused,&tbName); + if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No button with type %Q named %Q"),&tbTypeUnused,&tbName); return true; } TQChar o; @@ -442,7 +442,7 @@ namespace KviKvsCoreSimpleCommands { pButton->setButtonPixmap(*pix); } else { - if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&tbPar); + if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&tbPar); } } break; @@ -527,7 +527,7 @@ namespace KviKvsCoreSimpleCommands KviTQCString szD = KVSCSC_pConnection->encodeText(szCtcpData); if(!(KVSCSC_pConnection->sendFmtData("%s %s :%c%s%c", - KVSCSC_pSwitches->tqfind('n',"notice") ? "NOTICE" : "PRIVMSG",szT.data(),0x01,szD.data(),0x01))) + KVSCSC_pSwitches->find('n',"notice") ? "NOTICE" : "PRIVMSG",szT.data(),0x01,szD.data(),0x01))) return KVSCSC_pContext->warningNoIrcConnection(); return true; @@ -628,16 +628,16 @@ namespace KviKvsCoreSimpleCommands KVSCSC_PARAMETERS_END if(hObject == (kvs_hobject_t)0) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Can't delete a null object reference")); } else { KviKvsObject * o = KviKvsKernel::instance()->objectController()->lookupObject(hObject); if(!o) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Can't delete an inexisting object")); } else { - if(KVSCSC_pSwitches->tqfind('i',"immediate")) + if(KVSCSC_pSwitches->find('i',"immediate")) o->dieNow(); else o->die(); @@ -688,7 +688,7 @@ namespace KviKvsCoreSimpleCommands KviKvsPopupMenu * p = KviKvsPopupManager::instance()->lookup(szPopupName); if(!p) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Inexisting popup \"%Q\""),&szPopupName); return true; } @@ -699,9 +699,9 @@ namespace KviKvsCoreSimpleCommands return false; } - if(!p->removeItemByName(szItemId,KVSCSC_pSwitches->tqfind('d',"deep"))) + if(!p->removeItemByName(szItemId,KVSCSC_pSwitches->find('d',"deep"))) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("The menu item with id \"%Q\" does not exist in popup \"%Q\""),&szItemId,&szPopupName); } @@ -849,7 +849,7 @@ namespace KviKvsCoreSimpleCommands if(!KVSCSC_pSwitches->isEmpty()) { KviKvsVariant * v; - if((v = KVSCSC_pSwitches->tqfind('w',"window"))) + if((v = KVSCSC_pSwitches->find('w',"window"))) { TQString szWnd; v->asString(szWnd); @@ -862,7 +862,7 @@ namespace KviKvsCoreSimpleCommands } } - if((v = KVSCSC_pSwitches->tqfind('i',"icon"))) + if((v = KVSCSC_pSwitches->find('i',"icon"))) { if(!v->asInteger(iMsgType)) { @@ -873,13 +873,13 @@ namespace KviKvsCoreSimpleCommands } } - if(KVSCSC_pSwitches->tqfind('d',"debug")) + if(KVSCSC_pSwitches->find('d',"debug")) { pWnd = KviDebugWindow::getInstance(); } } - int iFlags = KVSCSC_pSwitches->tqfind('n',"no-timestamp") ? KviIrcView::NoTimestamp : 0; + int iFlags = KVSCSC_pSwitches->find('n',"no-timestamp") ? KviIrcView::NoTimestamp : 0; pWnd->outputNoFmt(iMsgType,szAll,iFlags); return true; } @@ -971,7 +971,7 @@ namespace KviKvsCoreSimpleCommands KviKvsVariant * v; - if(v = KVSCSC_pSwitches->tqfind('i',"color-set")) + if(v = KVSCSC_pSwitches->find('i',"color-set")) { kvs_int_t msgType; if(v->asInteger(msgType)) @@ -981,7 +981,7 @@ namespace KviKvsCoreSimpleCommands } else KVSCSC_pContext->warning(__tr2qs("Invalid color-set specification, using default")); } - if(v = KVSCSC_pSwitches->tqfind('w',"window")) + if(v = KVSCSC_pSwitches->find('w',"window")) { TQString szWin; v->asString(szWin); @@ -998,21 +998,21 @@ namespace KviKvsCoreSimpleCommands bool bPrefix = false; bool bSuffix = false; - if(v = KVSCSC_pSwitches->tqfind('p',"prefix")) + if(v = KVSCSC_pSwitches->find('p',"prefix")) { v->asString(szPrefix); bPrefix = true; } - if(v = KVSCSC_pSwitches->tqfind('s',"suffix")) + if(v = KVSCSC_pSwitches->find('s',"suffix")) { v->asString(szSuffix); bSuffix = true; } int iFlags = 0; - if(KVSCSC_pSwitches->tqfind('n',"no-highlighting"))iFlags |= KviConsole::NoHighlighting; - if(KVSCSC_pSwitches->tqfind('f',"no-flashing"))iFlags |= KviConsole::NoWindowFlashing; - if(KVSCSC_pSwitches->tqfind('x',"no-notifier"))iFlags |= KviConsole::NoNotifier; + if(KVSCSC_pSwitches->find('n',"no-highlighting"))iFlags |= KviConsole::NoHighlighting; + if(KVSCSC_pSwitches->find('f',"no-flashing"))iFlags |= KviConsole::NoWindowFlashing; + if(KVSCSC_pSwitches->find('x',"no-notifier"))iFlags |= KviConsole::NoNotifier; pConsole->outputPrivmsg(pWnd,type, szNick,szUser,szHost,szText, @@ -1121,12 +1121,12 @@ namespace KviKvsCoreSimpleCommands KviKvsScript s("eval::inner",szCommands); int iRunFlags = 0; - if(KVSCSC_pContext->reportingDisabled() || KVSCSC_pSwitches->tqfind('q',"quiet")) + if(KVSCSC_pContext->reportingDisabled() || KVSCSC_pSwitches->find('q',"quiet")) iRunFlags |= KviKvsScript::Quiet; bool bRet = s.run(KVSCSC_pContext,iRunFlags) ? true : false; if(!bRet) { - if(!KVSCSC_pSwitches->tqfind('f',"force")) + if(!KVSCSC_pSwitches->find('f',"force")) return false; KVSCSC_pContext->clearError(); } @@ -1185,7 +1185,7 @@ namespace KviKvsCoreSimpleCommands { if(!KviKvsEventManager::instance()->isValidRawEvent(iNumber)) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } @@ -1193,36 +1193,36 @@ namespace KviKvsCoreSimpleCommands iNumber = KviKvsEventManager::instance()->findAppEventIndexByName(szEventName); if(!KviKvsEventManager::instance()->isValidAppEvent(iNumber)) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName); return true; } } - if(KVSCSC_pSwitches->tqfind('u',"unregister")) + if(KVSCSC_pSwitches->find('u',"unregister")) { // unregister it if(bIsRaw) { if(!KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName)) - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber); } else { if(!KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName)) - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } - } else if(KVSCSC_pSwitches->tqfind('e',"enable") || KVSCSC_pSwitches->tqfind('d',"disable")) + } else if(KVSCSC_pSwitches->find('e',"enable") || KVSCSC_pSwitches->find('d',"disable")) { // enable it if(bIsRaw) { - if(!KviKvsEventManager::instance()->enableScriptRawHandler(iNumber,szHandlerName,KVSCSC_pSwitches->tqfind('e',"enable"))) - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KviKvsEventManager::instance()->enableScriptRawHandler(iNumber,szHandlerName,KVSCSC_pSwitches->find('e',"enable"))) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber); } else { - if(!KviKvsEventManager::instance()->enableScriptAppHandler(iNumber,szHandlerName,KVSCSC_pSwitches->tqfind('e',"enable"))) - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KviKvsEventManager::instance()->enableScriptAppHandler(iNumber,szHandlerName,KVSCSC_pSwitches->find('e',"enable"))) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } } else { @@ -1244,7 +1244,7 @@ namespace KviKvsCoreSimpleCommands KviKvsVariant retVal; copy.run(KVSCSC_pWindow,&vList,0,KviKvsScript::PreserveParams); } else { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName); } } diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp index 43222d4..fcb2b03 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp @@ -291,8 +291,8 @@ try_again: KVSCSC_PARAMETERS_END KviDns::QueryType queryType = KviDns::IpV4; - if(KVSCSC_pSwitches->tqfind('i',"ipv6"))queryType = KviDns::IpV6; - if(KVSCSC_pSwitches->tqfind('a',"any"))queryType = KviDns::Any; + if(KVSCSC_pSwitches->find('i',"ipv6"))queryType = KviDns::IpV6; + if(KVSCSC_pSwitches->find('a',"any"))queryType = KviDns::Any; KviKvsAsyncDnsOperation * op = new KviKvsAsyncDnsOperation( KVSCSC_pContext->window(), @@ -518,7 +518,7 @@ try_again: KVSCSC_PARAMETER("name",KVS_PT_STRING,KVS_PF_OPTIONAL,szName) KVSCSC_PARAMETERS_END - if(KVSCSC_pSwitches->tqfind('a',"active")) + if(KVSCSC_pSwitches->find('a',"active")) { KviKvsTimerManager::instance()->deleteAllTimers(); return true; @@ -528,13 +528,13 @@ try_again: { if(!KviKvsTimerManager::instance()->deleteCurrentTimer()) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Timer name omitted but there is not current timer (this is not a timer callback)")); } } else { if(!KviKvsTimerManager::instance()->deleteTimer(szName)) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Can't kill the timer '%Q' since it is not running"),&szName); } } diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp index 9744b6f..e79fb9b 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp @@ -278,7 +278,7 @@ namespace KviKvsCoreSimpleCommands if(!(KVSCSC_pConnection->sendFmtData("NOTICE %s :%s",szT.data(),szD.data()))) return KVSCSC_pContext->warningNoIrcConnection(); - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pWindow->output(KVI_OUT_OWNPRIVMSG,"[NOTICE >>> %Q]: %Q",&szTarget,&szText); return true; @@ -634,12 +634,12 @@ namespace KviKvsCoreSimpleCommands TQString szBuffer; if(!KviFileUtils::loadFile(szFileName,szBuffer,true)) // <-- scripts SHOULD be shipped in utf8 format { - if(KVSCSC_pSwitches->tqfind('e',"fail-on-load")) + if(KVSCSC_pSwitches->find('e',"fail-on-load")) { KVSCSC_pContext->error(__tr2qs("Failed to load the file '%Q' for parsing"),&szFileName); return false; } else { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Failed to load the file '%Q' for parsing"),&szFileName); return true; } @@ -647,7 +647,7 @@ namespace KviKvsCoreSimpleCommands KviKvsScript s(szFileName,szBuffer); - KviKvsVariant * pRetVal = KVSCSC_pSwitches->tqfind('r',"propagate-return") ? KVSCSC_pContext->returnValue() : 0; + KviKvsVariant * pRetVal = KVSCSC_pSwitches->find('r',"propagate-return") ? KVSCSC_pContext->returnValue() : 0; KviKvsVariant vFileName(szFileName); vList.prepend(&vFileName); @@ -655,7 +655,7 @@ namespace KviKvsCoreSimpleCommands if(!s.run(KVSCSC_pContext->window(),&vList,pRetVal,KviKvsScript::PreserveParams,&rtd)) { - if(KVSCSC_pSwitches->tqfind('f',"fail-on-error"))return false; + if(KVSCSC_pSwitches->find('f',"fail-on-error"))return false; } return true; } @@ -712,7 +712,7 @@ namespace KviKvsCoreSimpleCommands if(KVSCSC_pWindow->type() == KVI_WINDOW_TYPE_CHANNEL) szChans = KVSCSC_pWindow->target(); else { - if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Missing channel list")); + if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Missing channel list")); return true; } } @@ -748,9 +748,9 @@ namespace KviKvsCoreSimpleCommands KviChannel * ch = KVSCSC_pConnection->findChannel(*it); if(ch) { - ch->partMessageSent(!KVSCSC_pSwitches->tqfind('k',"keep"),!KVSCSC_pSwitches->tqfind('s',"silent")); + ch->partMessageSent(!KVSCSC_pSwitches->find('k',"keep"),!KVSCSC_pSwitches->find('s',"silent")); } else { - if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("You don't appear to be on channel %s"),(*it).utf8().data()); + if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("You don't appear to be on channel %s"),(*it).utf8().data()); } } @@ -875,13 +875,13 @@ namespace KviKvsCoreSimpleCommands TQPoint pnt = TQCursor::pos(); - KviKvsVariant * pCoords = KVSCSC_pSwitches->tqfind('p',"point"); + KviKvsVariant * pCoords = KVSCSC_pSwitches->find('p',"point"); if(pCoords) { TQString szCoords; pCoords->asString(szCoords); - int idx = szCoords.tqfind(','); + int idx = szCoords.find(','); bool bCoordsOk = true; if(idx == -1)bCoordsOk = false; else { @@ -956,7 +956,7 @@ namespace KviKvsCoreSimpleCommands if(!(KVSCSC_pConnection->sendFmtData("PRIVMSG %s :%s",szT.data(),szD.data()))) return KVSCSC_pContext->warningNoIrcConnection(); - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pWindow->output(KVI_OUT_OWNPRIVMSG,"[PRIVMSG >>> %Q]: %Q",&szTarget,&szText); } @@ -1018,7 +1018,7 @@ namespace KviKvsCoreSimpleCommands KviIrcUserDataBase * db = KVSCSC_pWindow->connection()->userDataBase(); if(db) { - KviIrcUserEntry * e = db->tqfind(szNick); + KviIrcUserEntry * e = db->find(szNick); if(e) { user = e->user(); @@ -1084,12 +1084,12 @@ namespace KviKvsCoreSimpleCommands KVSCSC_PARAMETER("reason",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szReason) KVSCSC_PARAMETERS_END - if(KVSCSC_pSwitches->tqfind('q',"quit")) + if(KVSCSC_pSwitches->find('q',"quit")) { TQTimer::singleShot(0,g_pApp,TQT_SLOT(quit())); } else { KVSCSC_RETQUIRE_CONNECTION - KVSCSC_pWindow->context()->terminateConnectionRequest(KVSCSC_pSwitches->tqfind('f',"force"),szReason,KVSCSC_pSwitches->tqfind('u',"unexpected")); + KVSCSC_pWindow->context()->terminateConnectionRequest(KVSCSC_pSwitches->find('f',"force"),szReason,KVSCSC_pSwitches->find('u',"unexpected")); } return true; } @@ -1183,7 +1183,7 @@ namespace KviKvsCoreSimpleCommands if(!KVSCSC_pConnection->sendData(szData.data())) return KVSCSC_pContext->warningNoIrcConnection(); - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pWindow->output(KVI_OUT_RAW,__tr2qs("[RAW]: %Q"),&szRawCommand); return true; @@ -1233,7 +1233,7 @@ namespace KviKvsCoreSimpleCommands KviWindow * pAux = g_pApp->findWindow(szWinId.utf8().data()); if(pAux)KVSCSC_pContext->setWindow(pAux); else { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Window with id %Q not found: no rebinding performed"),&szWinId); } return true; diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp index 9fbffbd..5ee31b7 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp @@ -86,12 +86,12 @@ namespace KviKvsCoreSimpleCommands KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szText) KVSCSC_PARAMETERS_END - if(KVSCSC_pSwitches->tqfind('x',"allow-exec")) + if(KVSCSC_pSwitches->find('x',"allow-exec")) { // allow execution of commands if(!KviUserInput::parse(szText,KVSCSC_pWindow,__tr2qs("say: injected commandline"))) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Say parse error: Broken command")); } } else { @@ -213,9 +213,9 @@ namespace KviKvsCoreSimpleCommands KVSCSC_PARAMETERS_END KviConsole * console = 0; - if(KVSCSC_pSwitches->tqfind('n',"new-context"))console = KVSCSC_pWindow->frame()->createNewConsole(); + if(KVSCSC_pSwitches->find('n',"new-context"))console = KVSCSC_pWindow->frame()->createNewConsole(); else { - if(KVSCSC_pSwitches->tqfind('u',"unused-context")) + if(KVSCSC_pSwitches->find('u',"unused-context")) { // first try the current console console = KVSCSC_pWindow->console(); @@ -261,7 +261,7 @@ namespace KviKvsCoreSimpleCommands return false; } else { KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData(); - d->bUseLastServerInContext = KVSCSC_pSwitches->tqfind('l',"last") != 0; + d->bUseLastServerInContext = KVSCSC_pSwitches->find('l',"last") != 0; d->szCommandToExecAfterConnect = szCmd; d->szBindAddress = szBindAddress; d->szPass = szPassword; @@ -273,13 +273,13 @@ namespace KviKvsCoreSimpleCommands } else { // server is not empty. KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData(); - d->bUseSSL = (KVSCSC_pSwitches->tqfind('s',"ssl") != 0); + d->bUseSSL = (KVSCSC_pSwitches->find('s',"ssl") != 0); d->szServer = szServer; d->uPort = (kvi_u32_t)uPort; d->szLinkFilter = szSocketFilter; d->bPortIsOk = (uPort > 0); #ifdef COMPILE_IPV6_SUPPORT - d->bUseIpV6 = (KVSCSC_pSwitches->tqfind('i',"ipv6") != 0) || KviNetUtils::isValidStringIp_V6(szServer); + d->bUseIpV6 = (KVSCSC_pSwitches->find('i',"ipv6") != 0) || KviNetUtils::isValidStringIp_V6(szServer); #else d->bUseIpV6 = false; #endif @@ -367,20 +367,20 @@ namespace KviKvsCoreSimpleCommands { if(!(KVSCSC_pWindow->frame()->mainMenuBar()->removeMenu(szVisibleText))) { - if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No menu bar item with text '%Q'"),&szPopupName); + if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No menu bar item with text '%Q'"),&szPopupName); } return true; } KviKvsPopupMenu * p = KviKvsPopupManager::instance()->lookup(szPopupName); int idx = -1; - if(KviKvsVariant * pIdx = KVSCSC_pSwitches->tqfind('i',"index")) + if(KviKvsVariant * pIdx = KVSCSC_pSwitches->find('i',"index")) { kvs_int_t iIdx; if(pIdx->asInteger(iIdx)) idx = iIdx; else { - if(!KVSCSC_pSwitches->tqfind('q',"quiet")) + if(!KVSCSC_pSwitches->find('q',"quiet")) KVSCSC_pContext->warning(__tr2qs("Invalid index specified: ignored")); } } @@ -390,7 +390,7 @@ namespace KviKvsCoreSimpleCommands if(p)KVSCSC_pWindow->frame()->mainMenuBar()->addMenu(szVisibleText,p,idx); else { - if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The popup '%Q' is not defined"),&szPopupName); + if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The popup '%Q' is not defined"),&szPopupName); } return true; @@ -702,7 +702,7 @@ namespace KviKvsCoreSimpleCommands if(KviLocale::loadCatalogue(szCatalogue,szDir)) return true; - if(KVSCSC_pSwitches->tqfind('v',"verbose")) + if(KVSCSC_pSwitches->find('v',"verbose")) KVSCSC_pContext->warning(__tr2qs("No catalogue %Q for the current language found"),&szCatalogue); return true; @@ -741,7 +741,7 @@ namespace KviKvsCoreSimpleCommands if(!KviLocale::unloadCatalogue(szCatalogue)) { - if(KVSCSC_pSwitches->tqfind('v',"verbose")) + if(KVSCSC_pSwitches->find('v',"verbose")) KVSCSC_pContext->warning(__tr2qs("The catalogue %Q was not loaded"),&szCatalogue); } return true; diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp index 2170362..478b7ad 100644 --- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp @@ -102,13 +102,13 @@ void KviKvsDnsManager::addDns(KviKvsDnsObject * pObject) m_pDnsObjects = new KviPointerHashTable<void *,KviKvsDnsObject>; m_pDnsObjects->setAutoDelete(true); } - m_pDnsObjects->tqreplace(pObject->dns(),pObject); + m_pDnsObjects->replace(pObject->dns(),pObject); connect(pObject->dns(),TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(dnsLookupTerminated(KviDns *))); } void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) { - KviKvsDnsObject * o = m_pDnsObjects->tqfind(pDns); + KviKvsDnsObject * o = m_pDnsObjects->find(pDns); if(!o) { debug("KviKvsDnsManager::dnsLookupTerminated(): can't find the KviKvsDnsObject structure"); diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp index e2bab77..a046dc3 100644 --- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp @@ -2107,7 +2107,7 @@ channel $5 contains the original color/icon set of the message that depends on the type of the message itself.[br] Since the CTCP ACTION messages generally have different format of output - then for your convenience $6 tqcontains 1 if the message was caused by a + then for your convenience $6 contains 1 if the message was caused by a CTCP ACTION and 0 otherwise.[br] If you call [cmd]halt[/cmd] in this event the message output will be completely disabled (thus, KVIrc assumes that YOU have provided the necessary output and feedback to the user).[br] @@ -2967,7 +2967,7 @@ channel channel @description: Triggered when a channel mode has been changed, AFTER all the mode specific events - were triggered. $3 contains the unparsed mode flags (-o+b...) and $4 tqcontains + were triggered. $3 contains the unparsed mode flags (-o+b...) and $4 contains the unparsed mode parameter string (you need to split it!). */ EVENT("OnChannelModeChange","$0 = sourcenick\n$1 = sourceusername\n$2 = sourcehost\n$3 = modeflags\n$4 = mode params"), diff --git a/src/kvirc/kvs/kvi_kvs_hash.cpp b/src/kvirc/kvs/kvi_kvs_hash.cpp index 0d4c93f..b0add78 100644 --- a/src/kvirc/kvs/kvi_kvs_hash.cpp +++ b/src/kvirc/kvs/kvi_kvs_hash.cpp @@ -39,7 +39,7 @@ KviKvsHash::KviKvsHash(const KviKvsHash &h) KviPointerHashTableIterator<TQString,KviKvsVariant> it(*(h.m_pDict)); while(it.current()) { - m_pDict->tqreplace(it.currentKey(),new KviKvsVariant(*(it.current()))); + m_pDict->replace(it.currentKey(),new KviKvsVariant(*(it.current()))); ++it; } } @@ -88,9 +88,9 @@ void KviKvsHash::serialize(TQString& result) KviKvsVariant * KviKvsHash::get(const TQString &szKey) { - KviKvsVariant * v = m_pDict->tqfind(szKey); + KviKvsVariant * v = m_pDict->find(szKey); if(v)return v; v = new KviKvsVariant(); - m_pDict->tqreplace(szKey,v); + m_pDict->replace(szKey,v); return v; } diff --git a/src/kvirc/kvs/kvi_kvs_hash.h b/src/kvirc/kvs/kvi_kvs_hash.h index 69ce692..c7663cf 100644 --- a/src/kvirc/kvs/kvi_kvs_hash.h +++ b/src/kvirc/kvs/kvi_kvs_hash.h @@ -47,8 +47,8 @@ protected: KviPointerHashTable<TQString,KviKvsVariant> * m_pDict; public: void unset(const TQString &szKey){ m_pDict->remove(szKey); }; - void set(const TQString &szKey,KviKvsVariant * pVal){ m_pDict->tqreplace(szKey,pVal); }; - KviKvsVariant * tqfind(const TQString &szKey) const { return m_pDict->tqfind(szKey); }; + void set(const TQString &szKey,KviKvsVariant * pVal){ m_pDict->replace(szKey,pVal); }; + KviKvsVariant * find(const TQString &szKey) const { return m_pDict->find(szKey); }; KviKvsVariant * get(const TQString &szKey); bool isEmpty() const { return m_pDict->isEmpty(); }; diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp index e16bed3..4ec97bc 100644 --- a/src/kvirc/kvs/kvi_kvs_kernel.cpp +++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp @@ -114,7 +114,7 @@ void KviKvsKernel::done() void KviKvsKernel::completeCommand(const TQString &szCommandBegin,KviPointerList<TQString> * pMatches) { - int idx = szCommandBegin.tqfind(TQChar('.')); + int idx = szCommandBegin.find(TQChar('.')); if(idx == -1) { // no module name inside @@ -157,7 +157,7 @@ void KviKvsKernel::completeModuleCommand(const TQString &szModuleName,const TQSt void KviKvsKernel::completeFunction(const TQString &szFunctionBegin,KviPointerList<TQString> * pMatches) { - int idx = szFunctionBegin.tqfind(TQChar('.')); + int idx = szFunctionBegin.find(TQChar('.')); if(idx == -1) { // no module name inside diff --git a/src/kvirc/kvs/kvi_kvs_kernel.h b/src/kvirc/kvs/kvi_kvs_kernel.h index 7c15655..51846f5 100644 --- a/src/kvirc/kvs/kvi_kvs_kernel.h +++ b/src/kvirc/kvs/kvi_kvs_kernel.h @@ -101,24 +101,24 @@ public: KviKvsAsyncOperationManager * asyncOperationManager(){ return m_pAsyncOperationManager; }; void registerSpecialCommandParsingRoutine(const TQString &szCmdName,KviKvsSpecialCommandParsingRoutine * r) - { m_pSpecialCommandParsingRoutineDict->tqreplace(szCmdName,r); }; + { m_pSpecialCommandParsingRoutineDict->replace(szCmdName,r); }; KviKvsSpecialCommandParsingRoutine * findSpecialCommandParsingRoutine(const TQString &szCmdName) - { return m_pSpecialCommandParsingRoutineDict->tqfind(szCmdName); }; + { return m_pSpecialCommandParsingRoutineDict->find(szCmdName); }; void registerCoreSimpleCommandExecRoutine(const TQString &szCmdName,KviKvsCoreSimpleCommandExecRoutine * r) - { m_pCoreSimpleCommandExecRoutineDict->tqreplace(szCmdName,r); }; + { m_pCoreSimpleCommandExecRoutineDict->replace(szCmdName,r); }; KviKvsCoreSimpleCommandExecRoutine * findCoreSimpleCommandExecRoutine(const TQString &szCmdName) - { return m_pCoreSimpleCommandExecRoutineDict->tqfind(szCmdName); }; + { return m_pCoreSimpleCommandExecRoutineDict->find(szCmdName); }; void registerCoreFunctionExecRoutine(const TQString &szFncName,KviKvsCoreFunctionExecRoutine * r) - { m_pCoreFunctionExecRoutineDict->tqreplace(szFncName,r); }; + { m_pCoreFunctionExecRoutineDict->replace(szFncName,r); }; KviKvsCoreFunctionExecRoutine * findCoreFunctionExecRoutine(const TQString &szFncName) - { return m_pCoreFunctionExecRoutineDict->tqfind(szFncName); }; + { return m_pCoreFunctionExecRoutineDict->find(szFncName); }; void registerCoreCallbackCommandExecRoutine(const TQString &szCmdName,KviKvsCoreCallbackCommandExecRoutine * r) - { m_pCoreCallbackCommandExecRoutineDict->tqreplace(szCmdName,r); }; + { m_pCoreCallbackCommandExecRoutineDict->replace(szCmdName,r); }; KviKvsCoreCallbackCommandExecRoutine * findCoreCallbackCommandExecRoutine(const TQString &szCmdName) - { return m_pCoreCallbackCommandExecRoutineDict->tqfind(szCmdName); }; + { return m_pCoreCallbackCommandExecRoutineDict->find(szCmdName); }; void completeCommand(const TQString &szCommandBegin,KviPointerList<TQString> * pMatches); void completeFunction(const TQString &szFunctionBegin,KviPointerList<TQString> * pMatches); diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp index c678cef..47cdebd 100644 --- a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp +++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp @@ -90,17 +90,17 @@ void KviKvsModuleInterface::completeFunction(const TQString &szFunctionBegin,Kvi void KviKvsModuleInterface::kvsRegisterSimpleCommand(const TQString &szCommand,KviKvsModuleSimpleCommandExecRoutine r) { - m_pModuleSimpleCommandExecRoutineDict->tqreplace(szCommand,new KviKvsModuleSimpleCommandExecRoutine(r)); + m_pModuleSimpleCommandExecRoutineDict->replace(szCommand,new KviKvsModuleSimpleCommandExecRoutine(r)); } void KviKvsModuleInterface::kvsRegisterCallbackCommand(const TQString &szCommand,KviKvsModuleCallbackCommandExecRoutine r) { - m_pModuleCallbackCommandExecRoutineDict->tqreplace(szCommand,new KviKvsModuleCallbackCommandExecRoutine(r)); + m_pModuleCallbackCommandExecRoutineDict->replace(szCommand,new KviKvsModuleCallbackCommandExecRoutine(r)); } void KviKvsModuleInterface::kvsRegisterFunction(const TQString &szFunction,KviKvsModuleFunctionExecRoutine r) { - m_pModuleFunctionExecRoutineDict->tqreplace(szFunction,new KviKvsModuleFunctionExecRoutine(r)); + m_pModuleFunctionExecRoutineDict->replace(szFunction,new KviKvsModuleFunctionExecRoutine(r)); } @@ -161,7 +161,7 @@ static bool default_module_kvs_cmd_unload(KviKvsModuleCommandCall *c) { if(c->module()->isLocked()) { - if(!c->switches()->tqfind('f',"force")) + if(!c->switches()->find('f',"force")) { c->warning(__tr2qs("Can't unload the module: it has locked itself in memory")); return true; diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.h b/src/kvirc/kvs/kvi_kvs_moduleinterface.h index 698c393..0b47154 100644 --- a/src/kvirc/kvs/kvi_kvs_moduleinterface.h +++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.h @@ -79,8 +79,8 @@ public: KviKvsSwitchList * switchList(){ return m_pSwitchList; }; // forwarders for the switch list - bool hasSwitch(unsigned short u,const TQString &szSwitch){ return (m_pSwitchList->tqfind(u,szSwitch) != 0); }; - KviKvsVariant * getSwitch(unsigned short u,const TQString &szSwitch){ return m_pSwitchList->tqfind(u,szSwitch); }; + bool hasSwitch(unsigned short u,const TQString &szSwitch){ return (m_pSwitchList->find(u,szSwitch) != 0); }; + KviKvsVariant * getSwitch(unsigned short u,const TQString &szSwitch){ return m_pSwitchList->find(u,szSwitch); }; }; class KVIRC_API KviKvsModuleCallbackCommandCall : public KviKvsModuleCommandCall @@ -167,11 +167,11 @@ public: void kvsUnregisterAllEventHandlers(); KviKvsModuleSimpleCommandExecRoutine * kvsFindSimpleCommand(const TQString &szCommand) - { return m_pModuleSimpleCommandExecRoutineDict->tqfind(szCommand); }; + { return m_pModuleSimpleCommandExecRoutineDict->find(szCommand); }; KviKvsModuleCallbackCommandExecRoutine * kvsFindCallbackCommand(const TQString &szCommand) - { return m_pModuleCallbackCommandExecRoutineDict->tqfind(szCommand); }; + { return m_pModuleCallbackCommandExecRoutineDict->find(szCommand); }; KviKvsModuleFunctionExecRoutine * kvsFindFunction(const TQString &szFunction) - { return m_pModuleFunctionExecRoutineDict->tqfind(szFunction); }; + { return m_pModuleFunctionExecRoutineDict->find(szFunction); }; void completeCommand(const TQString &cmd,KviPointerList<TQString> * matches); void completeFunction(const TQString &cmd,KviPointerList<TQString> * matches); diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 572ea1a..c6d9fcb 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -742,7 +742,7 @@ bool KviKvsObject::connectSignal(const TQString &sigName,KviKvsObject * pTarget, m_pSignalDict->setAutoDelete(true); } - KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); if(!l) { l = new KviKvsObjectConnectionList; @@ -776,7 +776,7 @@ bool KviKvsObject::disconnectSignal(const TQString &sigName,KviKvsObject * pTarg { if(!m_pSignalDict)return false; //no such signal to disconnect - KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); if(!l)return false; KviKvsObjectConnectionListIterator it(*l); @@ -806,11 +806,11 @@ bool KviKvsObject::disconnectSignal(const TQString &sigName,KviKvsObject * pTarg bool KviKvsObject::disconnectSignal(const TQString &sigName,KviKvsObjectConnection * pConnection) { if(!m_pSignalDict)return false; - KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); //__range_valid(l); if(!l)return false; pConnection->pTargetObject->unregisterConnection(pConnection); - //__range_valid(l->tqfindRef(pConnection) > -1); + //__range_valid(l->findRef(pConnection) > -1); l->removeRef(pConnection); if(l->isEmpty())m_pSignalDict->remove(sigName); if(m_pSignalDict->isEmpty()) @@ -838,7 +838,7 @@ int KviKvsObject::emitSignal(const TQString &sigName,KviKvsObjectFunctionCall * { if(!m_pSignalDict)return 0; - KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName); + KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName); if(!l)return 0; // no slots registered KviKvsVariant retVal; @@ -1156,7 +1156,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) #ifdef COMPILE_USE_QT4 int idx = m_pObject->tqmetaObject()->indexOfProperty(szName); #else - int idx = m_pObject->tqmetaObject()->tqfindProperty(szName,true); + int idx = m_pObject->tqmetaObject()->findProperty(szName,true); #endif if(idx < 0) { @@ -1305,12 +1305,12 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) TQFont fnt; fnt.setFamily(szFf); fnt.setPointSize(iPs); - if(szFl.tqfind('b') != -1)fnt.setBold(true); - if(szFl.tqfind('i') != -1)fnt.setItalic(true); - if(szFl.tqfind('u') != -1)fnt.setUnderline(true); - if(szFl.tqfind('o') != -1)fnt.setOverline(true); - if(szFl.tqfind('f') != -1)fnt.setFixedPitch(true); - if(szFl.tqfind('s') != -1)fnt.setStrikeOut(true); + if(szFl.find('b') != -1)fnt.setBold(true); + if(szFl.find('i') != -1)fnt.setItalic(true); + if(szFl.find('u') != -1)fnt.setUnderline(true); + if(szFl.find('o') != -1)fnt.setOverline(true); + if(szFl.find('f') != -1)fnt.setFixedPitch(true); + if(szFl.find('s') != -1)fnt.setStrikeOut(true); m_pObject->setProperty(szName,TQVariant(fnt)); } break; @@ -1387,7 +1387,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) #ifdef COMPILE_USE_QT4 int idx = m_pObject->tqmetaObject()->indexOfProperty(szName); #else - int idx = m_pObject->tqmetaObject()->tqfindProperty(szName,true); + int idx = m_pObject->tqmetaObject()->findProperty(szName,true); #endif if(idx < 0) { @@ -1564,7 +1564,7 @@ KviKvsObjectFunctionHandler * KviKvsObject::lookupFunctionHandler(const TQString if(classOverride.isEmpty() && m_pFunctionHandlers) { // lookup the local overrides - h = m_pFunctionHandlers->tqfind(funcName); + h = m_pFunctionHandlers->find(funcName); } if(!h) @@ -1711,7 +1711,7 @@ void KviKvsObject::registerPrivateImplementation(const TQString &szFunctionName, szContext += "[privateimpl]::"; szContext += szFunctionName; - m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szCode)); + m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szCode)); } } diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/kvi_kvs_object_class.cpp index 7a01532..f995238 100644 --- a/src/kvirc/kvs/kvi_kvs_object_class.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_class.cpp @@ -91,7 +91,7 @@ KviKvsObjectClass::~KviKvsObjectClass() void KviKvsObjectClass::registerFunctionHandler(const TQString & szFunctionName,KviKvsObjectFunctionHandlerProc pProc,unsigned int uFlags) { - m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectCoreCallFunctionHandler(pProc,uFlags)); + m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectCoreCallFunctionHandler(pProc,uFlags)); } void KviKvsObjectClass::registerFunctionHandler(const TQString & szFunctionName,const TQString &szBuffer,unsigned int uFlags) @@ -99,22 +99,22 @@ void KviKvsObjectClass::registerFunctionHandler(const TQString & szFunctionName, TQString szContext = m_szName; szContext += "::"; szContext += szFunctionName; - m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szBuffer,uFlags)); + m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szBuffer,uFlags)); } void KviKvsObjectClass::registerStandardNothingReturnFunctionHandler(const TQString &szFunctionName) { - m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardNothingReturnFunctionHandler()); + m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardNothingReturnFunctionHandler()); } void KviKvsObjectClass::registerStandardTrueReturnFunctionHandler(const TQString &szFunctionName) { - m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardTrueReturnFunctionHandler()); + m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardTrueReturnFunctionHandler()); } void KviKvsObjectClass::registerStandardFalseReturnFunctionHandler(const TQString &szFunctionName) { - m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardFalseReturnFunctionHandler()); + m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardFalseReturnFunctionHandler()); } diff --git a/src/kvirc/kvs/kvi_kvs_object_class.h b/src/kvirc/kvs/kvi_kvs_object_class.h index 646b616..5815743 100644 --- a/src/kvirc/kvs/kvi_kvs_object_class.h +++ b/src/kvirc/kvs/kvi_kvs_object_class.h @@ -88,7 +88,7 @@ public: // retisters an empty handler that returns $false void registerStandardFalseReturnFunctionHandler(const TQString & szFunc); - KviKvsObjectFunctionHandler * lookupFunctionHandler(const TQString & szFunc){ return m_pFunctionHandlers->tqfind(szFunc); }; + KviKvsObjectFunctionHandler * lookupFunctionHandler(const TQString & szFunc){ return m_pFunctionHandlers->find(szFunc); }; KviKvsObject * allocateInstance(KviKvsObject * pParent,const TQString &szName,KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams); bool save(const TQString &szFileName); diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp index 583641e..3ec6ea7 100644 --- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp @@ -166,7 +166,7 @@ void KviKvsObjectController::flushUserClasses() TQString szPath; TQString szFileName = c->name().lower(); szFileName += ".kvs"; - szFileName.tqreplace("::","--"); + szFileName.replace("::","--"); g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName); if(c->save(szPath)) c->clearDirtyFlag(); @@ -180,7 +180,7 @@ void KviKvsObjectController::flushUserClasses() KviKvsObjectClass * KviKvsObjectController::lookupClass(const TQString &szClass,bool bBuiltinOnly) { - KviKvsObjectClass * pC = m_pClassDict->tqfind(szClass); + KviKvsObjectClass * pC = m_pClassDict->find(szClass); if(!pC) { // maybe we need to load the object library ? @@ -189,7 +189,7 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const TQString &szClass, { debug("ops...something wrong with the libkviobjects module!"); return 0; - } else pC = m_pClassDict->tqfind(szClass); + } else pC = m_pClassDict->find(szClass); if(!pC) { if(bBuiltinOnly)return 0; @@ -197,13 +197,13 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const TQString &szClass, TQString szPath; TQString szFileName = szClass.lower(); szFileName += ".kvs"; - szFileName.tqreplace("::","--"); + szFileName.replace("::","--"); g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName); if(!KviFileUtils::fileExists(szPath)) g_pApp->getGlobalKvircDirectory(szPath,KviApp::Classes,szFileName); if(!KviFileUtils::fileExists(szPath))return 0; if(!KviKvsObjectClass::load(szPath))return 0; - pC = m_pClassDict->tqfind(szClass); + pC = m_pClassDict->find(szClass); if(pC)pC->clearDirtyFlag(); // just loaded from disk: no need to sync it } } else { @@ -221,7 +221,7 @@ void KviKvsObjectController::deleteClass(KviKvsObjectClass * pClass) TQString szPath; TQString szFileName = pClass->name().lower(); szFileName += ".kvs"; - szFileName.tqreplace("::","--"); + szFileName.replace("::","--"); g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName); KviFileUtils::removeFile(szPath); delete pClass; diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.h b/src/kvirc/kvs/kvi_kvs_object_controller.h index 28b9ae5..870131e 100644 --- a/src/kvirc/kvs/kvi_kvs_object_controller.h +++ b/src/kvirc/kvs/kvi_kvs_object_controller.h @@ -62,7 +62,7 @@ public: void flushUserClasses(); void killAllObjectsWithClass(KviKvsObjectClass * pClass); KviKvsObjectClass * lookupClass(const TQString &szClass,bool bBuiltinOnly = false); - KviKvsObject * lookupObject(kvs_hobject_t hObject){ return m_pObjectDict->tqfind(hObject); }; + KviKvsObject * lookupObject(kvs_hobject_t hObject){ return m_pObjectDict->find(hObject); }; KviPointerHashTable<void *,KviKvsObject> * objectDict(){ return m_pObjectDict; }; KviPointerHashTable<TQString,KviKvsObjectClass> * classDict(){ return m_pClassDict; }; }; diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp index 24f3ac9..fc483f5 100644 --- a/src/kvirc/kvs/kvi_kvs_parser.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser.cpp @@ -2675,7 +2675,7 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope) if(m_pGlobals) { - if(m_pGlobals->tqfind(szIdentifier))return new KviKvsTreeNodeGlobalVariable(pBegin,szIdentifier); + if(m_pGlobals->find(szIdentifier))return new KviKvsTreeNodeGlobalVariable(pBegin,szIdentifier); } if(m_iFlags & AssumeLocals) diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp index bfb0bd5..3733f55 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp @@ -229,12 +229,12 @@ [example] %var << Pragma [/example] - %var now tqcontains "Ciao ciao Pragma"[br] + %var now contains "Ciao ciao Pragma"[br] Append a '!' character [example] %var <+ ! [/example] - %var now tqcontains "Ciao ciao Pragma!" + %var now contains "Ciao ciao Pragma!" Now reset it. [example] %var = @@ -245,7 +245,7 @@ %var = Pragma,Diabl0,Arter|o %var <, MalboroLi [/example] - %var now tqcontains "Pragma,Diabl0,Arter|o,MalboroLi"[br] + %var now contains "Pragma,Diabl0,Arter|o,MalboroLi"[br] [br] Now a longer example. [example] diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp index 4cf0cbc..6f78ad1 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp @@ -263,7 +263,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal() m_pGlobals = new KviPointerHashTable<TQString,TQString>(17,false); m_pGlobals->setAutoDelete(true); } - m_pGlobals->tqreplace(szIdentifier,new TQString()); + m_pGlobals->replace(szIdentifier,new TQString()); skipSpaces(); diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.h b/src/kvirc/kvs/kvi_kvs_popupmanager.h index 2b7a52e..87b992f 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmanager.h +++ b/src/kvirc/kvs/kvi_kvs_popupmanager.h @@ -43,9 +43,9 @@ public: KviPointerHashTable<TQString,KviKvsPopupMenu> * popupDict(){ return m_pPopupDict; }; - KviKvsPopupMenu * lookup(const TQString &szPopupName){ return m_pPopupDict->tqfind(szPopupName); }; + KviKvsPopupMenu * lookup(const TQString &szPopupName){ return m_pPopupDict->find(szPopupName); }; KviKvsPopupMenu * get(const TQString &szPopupName); - void add(const TQString &szPopupName,KviKvsPopupMenu * pPopup){ m_pPopupDict->tqreplace(szPopupName,pPopup); }; + void add(const TQString &szPopupName,KviKvsPopupMenu * pPopup){ m_pPopupDict->replace(szPopupName,pPopup); }; void remove(const TQString &szPopupName){ m_pPopupDict->remove(szPopupName); }; void clear(){ m_pPopupDict->clear(); }; diff --git a/src/kvirc/kvs/kvi_kvs_report.cpp b/src/kvirc/kvs/kvi_kvs_report.cpp index 9953591..aa40ef3 100644 --- a/src/kvirc/kvs/kvi_kvs_report.cpp +++ b/src/kvirc/kvs/kvi_kvs_report.cpp @@ -124,7 +124,7 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP TQString * pListingStr = new TQString(); KviTQString::sprintf(*pListingStr,"%d ",iLine - 1); *pListingStr += TQString(pPrevLine,pLineBegin - pPrevLine); - pListingStr->tqreplace("\n",""); + pListingStr->replace("\n",""); pListing->append(pListingStr); } @@ -143,7 +143,7 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP TQString * pListingStr = new TQString(); KviTQString::sprintf(*pListingStr,"%c%d ",KVI_TEXT_BOLD,iLine); *pListingStr += TQString(pLineBegin,pBegin - pLineBegin); - pListingStr->tqreplace("\n",""); + pListingStr->replace("\n",""); pListing->append(pListingStr); } @@ -164,7 +164,7 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP TQString * pListingStr = new TQString(); KviTQString::sprintf(*pListingStr,"%d ",iLine + 1); *pListingStr += TQString(pLineBegin,pBegin - pLineBegin); - pListingStr->tqreplace("\n",""); + pListingStr->replace("\n",""); pListing->append(pListingStr); } diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp index 23f6ade..afcd97d 100644 --- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp @@ -324,7 +324,7 @@ void KviKvsScriptAddonManager::delayedLoad() TQString szName = it.currentKey(); KviKvsScriptAddon * a = new KviKvsScriptAddon(); if(a->load(&cfg,szName)) - m_pAddonDict->tqreplace(szName,a); + m_pAddonDict->replace(szName,a); else delete a; ++it; @@ -351,14 +351,14 @@ bool KviKvsScriptAddonManager::registerAddon(KviKvsScriptAddonRegistrationData * d->szDescriptionScript, d->szUninstallCallbackScript, d->szIconId); - m_pAddonDict->tqreplace(d->szName,a); + m_pAddonDict->replace(d->szName,a); return true; } KviKvsScriptAddon * KviKvsScriptAddonManager::findAddon(const TQString &szName) { if(!m_bLoaded)delayedLoad(); - return m_pAddonDict->tqfind(szName); + return m_pAddonDict->find(szName); } bool KviKvsScriptAddonManager::unregisterAddon(const TQString &szName,KviWindow * pWnd,bool bExecuteUninstallCallback) diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_switchlist.cpp index 7c56c85..7a47a91 100644 --- a/src/kvirc/kvs/kvi_kvs_switchlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_switchlist.cpp @@ -60,7 +60,7 @@ void KviKvsSwitchList::addShort(unsigned short uShortKey,KviKvsVariant * pVarian m_pShortSwitchDict = new KviPointerHashTable<unsigned short,KviKvsVariant>(11); m_pShortSwitchDict->setAutoDelete(true); } - m_pShortSwitchDict->tqreplace(uShortKey,pVariant); + m_pShortSwitchDict->replace(uShortKey,pVariant); } void KviKvsSwitchList::addLong(const TQString &szLongKey,KviKvsVariant * pVariant) @@ -70,6 +70,6 @@ void KviKvsSwitchList::addLong(const TQString &szLongKey,KviKvsVariant * pVarian m_pLongSwitchDict = new KviPointerHashTable<TQString,KviKvsVariant>(11); m_pLongSwitchDict->setAutoDelete(true); } - m_pLongSwitchDict->tqreplace(szLongKey,pVariant); + m_pLongSwitchDict->replace(szLongKey,pVariant); } diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.h b/src/kvirc/kvs/kvi_kvs_switchlist.h index b660569..b82d93f 100644 --- a/src/kvirc/kvs/kvi_kvs_switchlist.h +++ b/src/kvirc/kvs/kvi_kvs_switchlist.h @@ -46,35 +46,35 @@ public: bool isEmpty(){ return ((m_pShortSwitchDict == 0) && (m_pLongSwitchDict == 0)); }; - KviKvsVariant * tqfind(const TQChar &c) + KviKvsVariant * find(const TQChar &c) { - return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind(c.tqunicode()) : 0; + return m_pShortSwitchDict ? m_pShortSwitchDict->find(c.tqunicode()) : 0; }; - KviKvsVariant * tqfind(unsigned short uShortKey) + KviKvsVariant * find(unsigned short uShortKey) { - return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind((int)uShortKey) : 0; + return m_pShortSwitchDict ? m_pShortSwitchDict->find((int)uShortKey) : 0; }; - KviKvsVariant * tqfind(const TQString &szLongKey) + KviKvsVariant * find(const TQString &szLongKey) { - return m_pLongSwitchDict ? m_pLongSwitchDict->tqfind(szLongKey) : 0; + return m_pLongSwitchDict ? m_pLongSwitchDict->find(szLongKey) : 0; }; - KviKvsVariant * tqfind(unsigned short uShortKey,const TQString &szLongKey) + KviKvsVariant * find(unsigned short uShortKey,const TQString &szLongKey) { if(m_pLongSwitchDict) { KviKvsVariant * t; - t = m_pLongSwitchDict->tqfind(szLongKey); + t = m_pLongSwitchDict->find(szLongKey); if(t)return t; } - return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind((int)uShortKey) : 0; + return m_pShortSwitchDict ? m_pShortSwitchDict->find((int)uShortKey) : 0; }; bool getAsStringIfExisting(unsigned short uShortKey,const TQString &szLongKey,TQString &szBuffer) { - KviKvsVariant * v = tqfind(uShortKey,szLongKey); + KviKvsVariant * v = find(uShortKey,szLongKey); if(v) { v->asString(szBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.cpp b/src/kvirc/kvs/kvi_kvs_timermanager.cpp index 3bd4301..ca21598 100644 --- a/src/kvirc/kvs/kvi_kvs_timermanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_timermanager.cpp @@ -122,7 +122,7 @@ bool KviKvsTimerManager::addTimer(const TQString &szName,KviKvsTimer::Lifetime l } KviKvsTimer * t = new KviKvsTimer(szName,l,pWnd,iDelay,iId,pCallback,pParams); - KviKvsTimer * old = m_pTimerDictByName->tqfind(szName); + KviKvsTimer * old = m_pTimerDictByName->find(szName); if(old)deleteTimer(old->id()); m_pTimerDictByName->insert(szName,t); m_pTimerDictById->insert(t->id(),t); @@ -131,7 +131,7 @@ bool KviKvsTimerManager::addTimer(const TQString &szName,KviKvsTimer::Lifetime l bool KviKvsTimerManager::deleteTimer(const TQString &szName) { - KviKvsTimer * t = m_pTimerDictByName->tqfind(szName); + KviKvsTimer * t = m_pTimerDictByName->find(szName); if(!t)return false; killTimer(t->id()); m_pTimerDictById->remove(t->id()); @@ -142,7 +142,7 @@ bool KviKvsTimerManager::deleteTimer(const TQString &szName) bool KviKvsTimerManager::deleteTimer(int iId) { - KviKvsTimer * t = m_pTimerDictById->tqfind(iId); + KviKvsTimer * t = m_pTimerDictById->find(iId); if(!t)return false; killTimer(t->id()); m_pTimerDictById->remove(t->id()); @@ -206,7 +206,7 @@ void KviKvsTimerManager::timerEvent(TQTimerEvent *e) return; } - KviKvsTimer * t = m_pTimerDictById->tqfind(iId); + KviKvsTimer * t = m_pTimerDictById->find(iId); if(!t) { debug("Internal error: got an nonexistant timer event"); diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.h b/src/kvirc/kvs/kvi_kvs_timermanager.h index e316118..83b73d1 100644 --- a/src/kvirc/kvs/kvi_kvs_timermanager.h +++ b/src/kvirc/kvs/kvi_kvs_timermanager.h @@ -112,7 +112,7 @@ public: // the current timer will be unique bool deleteCurrentTimer(); void deleteAllTimers(); - bool timerExists(const TQString &szName){ return m_pTimerDictByName->tqfind(szName); }; + bool timerExists(const TQString &szName){ return m_pTimerDictByName->find(szName); }; KviPointerHashTable<TQString,KviKvsTimer> * timerDict() { return m_pTimerDictByName; }; protected: diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp index 74f5829..74a5e84 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp @@ -57,7 +57,7 @@ bool KviKvsTreeNodeExtendedScopeVariable::evaluateReadOnly(KviKvsRunTimeContext return false; } - KviKvsVariant * v = c->extendedScopeVariables()->tqfind(m_szIdentifier); + KviKvsVariant * v = c->extendedScopeVariables()->find(m_szIdentifier); if(v) { pBuffer->copyFrom(v); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp index a74ebc0..c78691d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp @@ -51,7 +51,7 @@ void KviKvsTreeNodeGlobalVariable::dump(const char * prefix) bool KviKvsTreeNodeGlobalVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { - KviKvsVariant * v = c->globalVariables()->tqfind(m_szIdentifier); + KviKvsVariant * v = c->globalVariables()->find(m_szIdentifier); if(v)pBuffer->copyFrom(v); else pBuffer->setNothing(); return true; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp index 196b992..59c8e85 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp @@ -102,7 +102,7 @@ bool KviKvsTreeNodeHashElement::evaluateReadOnlyInObjectScope(KviKvsObject *o,Kv return true; } - KviKvsVariant * v = val.hash()->tqfind(szKey); + KviKvsVariant * v = val.hash()->find(szKey); if(!v) { pBuffer->setNothing(); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp index f98dfb4..54872d5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp @@ -55,7 +55,7 @@ void KviKvsTreeNodeLocalVariable::dump(const char * prefix) bool KviKvsTreeNodeLocalVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { #ifdef COMPILE_NEW_KVS - KviKvsVariant * v = c->localVariables()->tqfind(m_szIdentifier); + KviKvsVariant * v = c->localVariables()->find(m_szIdentifier); if(v) { pBuffer->copyFrom(v); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp index f0e4957..f407e2c 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp @@ -62,7 +62,7 @@ bool KviKvsTreeNodeObjectField::canEvaluateInObjectScope() bool KviKvsTreeNodeObjectField::evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer) { #ifdef COMPILE_NEW_KVS - KviKvsVariant * v = o->dataContainer()->tqfind(m_szIdentifier); + KviKvsVariant * v = o->dataContainer()->find(m_szIdentifier); if(v)pBuffer->copyFrom(v); else pBuffer->setNothing(); #endif diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp index e8c50b9..26b05b9 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp @@ -1443,10 +1443,10 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c TQString str; target->result()->asString(str); - bool bGlobal = szF.tqfind('g',false) != -1; + bool bGlobal = szF.find('g',false) != -1; - TQRegExp re(szL,szF.tqfind('i',false) == -1,szF.tqfind('w',false) != -1); - re.setMinimal(szF.tqfind('m',false) != -1); // greedy or minimal ? + TQRegExp re(szL,szF.find('i',false) == -1,szF.find('w',false) != -1); + re.setMinimal(szF.find('m',false) != -1); // greedy or minimal ? int idx = 0; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp index 7462130..e5647bf 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp @@ -410,7 +410,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopup::execute(KviKvsRunTimeContext * c) } // we want to (re)create it - if(!swl.tqfind('m',"--merge"))pPopup->doClear(); + if(!swl.find('m',"--merge"))pPopup->doClear(); } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp index 90e0d1c..94f9dc2 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp @@ -84,7 +84,7 @@ bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c) if(!(m_pSwitches->evaluate(c,&swl)))return false; } - bool bIncludeEmptyScalars = swl.tqfind('a',"all") != 0; + bool bIncludeEmptyScalars = swl.find('a',"all") != 0; for(KviKvsVariant * pArg = l.first();pArg;pArg = l.next()) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp index 32018c2..305483d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp @@ -86,7 +86,7 @@ void KviKvsTreeNodeSwitchList::addShort(int iShortKey,KviKvsTreeNodeData * p) m_pShortSwitchDict->setAutoDelete(true); } - m_pShortSwitchDict->tqreplace(iShortKey,p); + m_pShortSwitchDict->replace(iShortKey,p); p->setParent(this); } @@ -98,7 +98,7 @@ void KviKvsTreeNodeSwitchList::addLong(const TQString &szLongKey,KviKvsTreeNodeD m_pLongSwitchDict->setAutoDelete(true); } - m_pLongSwitchDict->tqreplace(szLongKey,p); + m_pLongSwitchDict->replace(szLongKey,p); p->setParent(this); } @@ -145,7 +145,7 @@ KviKvsTreeNodeData * KviKvsTreeNodeSwitchList::getStandardRebindingSwitch() KviKvsTreeNodeData * d; if(m_pShortSwitchDict) { - d = m_pShortSwitchDict->tqfind('r'); + d = m_pShortSwitchDict->find('r'); if(d) { m_pShortSwitchDict->setAutoDelete(false); @@ -156,7 +156,7 @@ KviKvsTreeNodeData * KviKvsTreeNodeSwitchList::getStandardRebindingSwitch() } if(m_pLongSwitchDict) { - d = m_pLongSwitchDict->tqfind("rebind"); + d = m_pLongSwitchDict->find("rebind"); if(d) { m_pLongSwitchDict->setAutoDelete(false); diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp index 01ad59e..9a77d51 100644 --- a/src/kvirc/kvs/kvi_kvs_useraction.cpp +++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp @@ -148,23 +148,23 @@ void KviKvsUserAction::exportToKvs(TQString &szBuffer, szBuffer += szName; szBuffer += "\","; TQString tmp = szVisibleName; - if(tmp.tqcontains('$')) + if(tmp.contains('$')) { szBuffer += tmp; szBuffer += ","; } else { - tmp.tqreplace("\"","\\\""); + tmp.replace("\"","\\\""); szBuffer += "\""; szBuffer += tmp; szBuffer += "\","; } tmp = szDescription; - if(tmp.tqcontains('$')) + if(tmp.contains('$')) { szBuffer += tmp; szBuffer += ",\""; } else { - tmp.tqreplace("\"","\\\""); + tmp.replace("\"","\\\""); szBuffer += "\""; szBuffer += tmp; szBuffer += "\",\""; diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp index 492bd26..c4e457f 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.cpp +++ b/src/kvirc/kvs/kvi_kvs_variant.cpp @@ -931,14 +931,14 @@ public: }; void KviKvsVariant::serializeString(TQString& buffer) { - buffer.tqreplace('\\',"\\\\"); - buffer.tqreplace('\n',"\\n"); - buffer.tqreplace('\r',"\\r"); - buffer.tqreplace('\b',"\\b"); - buffer.tqreplace('\t',"\\t"); - buffer.tqreplace('\f',"\\f"); - buffer.tqreplace('/',"\\/"); - buffer.tqreplace('"',"\\\""); + buffer.replace('\\',"\\\\"); + buffer.replace('\n',"\\n"); + buffer.replace('\r',"\\r"); + buffer.replace('\b',"\\b"); + buffer.replace('\t',"\\t"); + buffer.replace('\f',"\\f"); + buffer.replace('/',"\\/"); + buffer.replace('"',"\\\""); buffer.prepend('"'); buffer.append('"'); } |