diff options
Diffstat (limited to 'src/kvirc/kernel')
21 files changed, 116 insertions, 116 deletions
diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp index 296de6a..4d92f5e 100644 --- a/src/kvirc/kernel/kvi_actionmanager.cpp +++ b/src/kvirc/kernel/kvi_actionmanager.cpp @@ -60,7 +60,7 @@ KviActionManager::KviActionManager() #define CATEGORY(__var,__name,__vname,__descr) \ __var = new KviActionCategory(__name,__vname,__descr); \ - m_pCategories->tqreplace(__name,__var) + m_pCategories->replace(__name,__var) CATEGORY(m_pCategoryIrc,"irc",__tr2qs("IRC"),__tr2qs("IRC Context related actions")); CATEGORY(m_pCategoryGeneric,"generic",__tr2qs("Generic"),__tr2qs("Generic actions")); @@ -146,7 +146,7 @@ void KviActionManager::killAllKvsUserActions() bool KviActionManager::coreActionExists(const TQString &szName) { - KviAction *a = m_pActions->tqfind(szName); + KviAction *a = m_pActions->find(szName); if(a)return (!a->isKviUserActionNeverOverrideThis()); return false; } @@ -159,7 +159,7 @@ TQString KviActionManager::nameForAutomaticAction(const TQString &szTemplate) do { KviTQString::sprintf(ret,"%Q%d",&szTemplate,i); i++; - } while(m_pActions->tqfind(ret)); + } while(m_pActions->find(ret)); return ret; } @@ -173,7 +173,7 @@ KviActionCategory * KviActionManager::category(const TQString &szName) { if(!szName.isEmpty()) { - KviActionCategory * c = m_pCategories->tqfind(szName); + KviActionCategory * c = m_pCategories->find(szName); if(c)return c; } return m_pCategoryGeneric; @@ -248,7 +248,7 @@ void KviActionManager::delayedRegisterAccelerators() bool KviActionManager::registerAction(KviAction * a) { - if(m_pActions->tqfind(a->name()))return false; + if(m_pActions->find(a->name()))return false; connect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed())); m_pActions->insert(a->name(),a); if(g_pFrame)a->registerAccelerator(); // otherwise it is delayed! @@ -263,7 +263,7 @@ void KviActionManager::actionDestroyed() bool KviActionManager::unregisterAction(const TQString &szName) { - KviAction * a = m_pActions->tqfind(szName); + KviAction * a = m_pActions->find(szName); if(!a)return false; disconnect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed())); a->unregisterAccelerator(); @@ -272,15 +272,15 @@ bool KviActionManager::unregisterAction(const TQString &szName) KviAction * KviActionManager::getAction(const TQString &szName) { - KviAction * a = m_pActions->tqfind(szName); + KviAction * a = m_pActions->find(szName); if(a)return a; - int idx = szName.tqfind('.'); + int idx = szName.find('.'); if(idx < 0) { // backward compatibility: try to lookup the name with the kvirc. prefix TQString s = "kvirc."; s += szName; - return m_pActions->tqfind(s); + return m_pActions->find(s); } if((idx == 5) && (!m_bCoreActionsRegistered)) { @@ -293,14 +293,14 @@ KviAction * KviActionManager::getAction(const TQString &szName) { register_core_actions(this); m_bCoreActionsRegistered = true; - a = m_pActions->tqfind(szName); + a = m_pActions->find(szName); return a; } } // try to preload the module that might register this action... TQString szModule = szName.left(idx); if(!g_pModuleManager->getModule(szModule))return 0; - return m_pActions->tqfind(szName); + return m_pActions->find(szName); } void KviActionManager::listActionsByCategory(const TQString &szCatName,KviPointerList<KviAction> * pBuffer) diff --git a/src/kvirc/kernel/kvi_actionmanager.h b/src/kvirc/kernel/kvi_actionmanager.h index d707e88..693c0c1 100644 --- a/src/kvirc/kernel/kvi_actionmanager.h +++ b/src/kvirc/kernel/kvi_actionmanager.h @@ -96,7 +96,7 @@ public: void emitRemoveActionsHintRequest(); protected: void setCurrentToolBar(KviCustomToolBar * t); - KviAction * findAction(const TQString &szName){ return m_pActions->tqfind(szName); }; + KviAction * findAction(const TQString &szName){ return m_pActions->find(szName); }; void customizeToolBarsDialogCreated(); void customizeToolBarsDialogDestroyed(); void tryFindCurrentToolBar(); diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 3e68ec5..30f26dc 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -482,8 +482,8 @@ void KviApp::setup() { TQString szStyleData; KviFileUtils::readFile(szStylesheetFile,szStyleData); - szStyleData.tqreplace("global://",m_szGlobalKvircDir); - szStyleData.tqreplace("local://",m_szLocalKvircDir); + szStyleData.replace("global://",m_szGlobalKvircDir); + szStyleData.replace("local://",m_szLocalKvircDir); setStyleSheet(szStyleData); } #endif @@ -703,7 +703,7 @@ void KviApp::contextSensitiveHelp() TQMetaObject * o = w->tqmetaObject(); if(o) { - int i = o->tqfindProperty("contextSensitiveHelp",true); + int i = o->findProperty("contextSensitiveHelp",true); if(i != -1) { TQVariant v = w->property("contextSensitiveHelp"); @@ -733,7 +733,7 @@ void KviApp::loadDefaultScript() cmd.prepend("parse \""); cmd.append("\""); #ifdef COMPILE_ON_WINDOWS - cmd.tqreplace("\\","\\\\"); + cmd.replace("\\","\\\\"); #endif KviKvsScript::run(cmd,g_pFrame->firstConsole()); // now line up the toolbars (they may get messed while loading the script) @@ -1785,7 +1785,7 @@ KviConsole * KviApp::topmostConnectedConsole() KviWindow * KviApp::findWindow(const char * windowId) { - return g_pGlobalWindowDict->tqfind(windowId); + return g_pGlobalWindowDict->find(windowId); } KviWindow * KviApp::findWindowByCaption(const TQString &windowCaption,int iContextId) @@ -1869,10 +1869,10 @@ void KviApp::addRecentChannel(const TQString& szChan,const TQString& net) { if(!m_pRecentChannelsDict) buildRecentChannels(); - TQStringList* pList=m_pRecentChannelsDict->tqfind(net.utf8().data()); + TQStringList* pList=m_pRecentChannelsDict->find(net.utf8().data()); if(pList) { - if(!pList->tqcontains(szChan)) pList->append(szChan); + if(!pList->contains(szChan)) pList->append(szChan); } else { @@ -1900,10 +1900,10 @@ void KviApp::buildRecentChannels() szNet = (*it).section( KVI_RECENT_CHANNELS_SEPARATOR, 1 ); if(!szNet.isEmpty()) { - TQStringList* pList=m_pRecentChannelsDict->tqfind(szNet.utf8().data()); + TQStringList* pList=m_pRecentChannelsDict->find(szNet.utf8().data()); if(pList) { - if(!pList->tqcontains(szChan)) pList->append(szChan); + if(!pList->contains(szChan)) pList->append(szChan); } else { @@ -1935,7 +1935,7 @@ void KviApp::saveRecentChannels() TQStringList* KviApp::getRecentChannels(const TQString& net) { if(!m_pRecentChannelsDict) buildRecentChannels(); - return m_pRecentChannelsDict->tqfind(net.utf8().data()); + return m_pRecentChannelsDict->find(net.utf8().data()); } diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index 61272d1..6a9ad8a 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -484,7 +484,7 @@ bool KviApp::mapImageFile(TQString &szRetPath,const char * filename) KviStr szBestMatch; - while(szRetPath.tqfind(KVI_PATH_SEPARATOR) != -1) + while(szRetPath.find(KVI_PATH_SEPARATOR) != -1) { KviTQString::cutToFirst(szRetPath,KVI_PATH_SEPARATOR); diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index 4d2f255..27555f0 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -155,7 +155,7 @@ bool KviApp::checkFileAssociations() return false; } else { TQString szIcon = applicationFilePath()+",1"; - szIcon.tqreplace('/',"\\"); + szIcon.replace('/',"\\"); if(!kvi_strEqualCI(szIcon.local8Bit().data(),buffer)){ free(buffer); return false; @@ -187,7 +187,7 @@ bool KviApp::checkFileAssociations() return false; } else { TQString szCmd = applicationFilePath()+" \"%1\""; - szCmd.tqreplace('/',"\\"); + szCmd.replace('/',"\\"); if(!kvi_strEqualCI(szCmd.local8Bit().data(),buffer)) { free(buffer); return false; @@ -305,7 +305,7 @@ bool KviApp::checkUriAssociations(char * proto) return false; } else { TQString szIcon = applicationFilePath()+",0"; - szIcon.tqreplace('/',"\\"); + szIcon.replace('/',"\\"); if(!kvi_strEqualCI(szIcon.local8Bit().data(),buffer)){ free(buffer); return false; @@ -339,7 +339,7 @@ bool KviApp::checkUriAssociations(char * proto) return false; } else { TQString szCmd = applicationFilePath()+" \"%1\""; - szCmd.tqreplace('/',"\\"); + szCmd.replace('/',"\\"); if(!kvi_strEqualCI(szCmd.local8Bit().data(),buffer)) { free(buffer); return false; @@ -365,7 +365,7 @@ void KviApp::setupUriAssociations(char * proto) KviTQCString tmp; TQString appPath = applicationFilePath(); - appPath.tqreplace('/',"\\"); + appPath.replace('/',"\\"); SHDeleteKey(HKEY_CLASSES_ROOT,key); @@ -399,7 +399,7 @@ void KviApp::setupFileAssociations() KviTQCString tmp; TQString appPath = applicationFilePath(); - appPath.tqreplace('/',"\\"); + appPath.replace('/',"\\"); SHDeleteKey(HKEY_CLASSES_ROOT,".kvs"); diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index 7f32861..b548afd 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -951,9 +951,9 @@ void KviChangeUserModeAction::popupAboutToShow() id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_INVISIBLE)),__tr2qs("Invisible (+i)")); m_pPopup->setItemChecked(id,c->connection()->userInfo()->hasUserMode('i')); - szModes.tqreplace("w",""); - szModes.tqreplace("s",""); - szModes.tqreplace("i",""); + szModes.replace("w",""); + szModes.replace("s",""); + szModes.replace("i",""); while(!szModes.isEmpty()) { TQChar ccc = szModes[0]; @@ -972,7 +972,7 @@ void KviChangeUserModeAction::popupActivated(int id) if(!c->isConnected())return; if(!text.isEmpty()) { - int idx = text.tqfind('+'); + int idx = text.find('+'); if(idx != -1) { idx++; diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp index eac0cdf..33b7ed6 100644 --- a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp +++ b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp @@ -86,7 +86,7 @@ TQString KviCustomToolBarManager::idForNewToolBar(const TQString &szTemplate) tmp.setNum(idx); s += tmp; } - if(!m_pDescriptors->tqfind(s))return s; + if(!m_pDescriptors->find(s))return s; idx++; } return s; @@ -105,20 +105,20 @@ KviCustomToolBarDescriptor * KviCustomToolBarManager::findDescriptorByInternalId bool KviCustomToolBarManager::renameDescriptor(const TQString &szId,const TQString &szNewId,const TQString &szNewLabelCode) { - KviCustomToolBarDescriptor * d = m_pDescriptors->tqfind(szId); + KviCustomToolBarDescriptor * d = m_pDescriptors->find(szId); if(!d)return false; d->rename(szNewLabelCode); if(szId == szNewId)return true; // already done m_pDescriptors->setAutoDelete(false); m_pDescriptors->remove(szId); - m_pDescriptors->tqreplace(szNewId,d); + m_pDescriptors->replace(szNewId,d); m_pDescriptors->setAutoDelete(true); return true; } bool KviCustomToolBarManager::destroyDescriptor(const TQString &szId) { - KviCustomToolBarDescriptor * d = m_pDescriptors->tqfind(szId); + KviCustomToolBarDescriptor * d = m_pDescriptors->find(szId); if(!d)return false; m_pDescriptors->remove(szId); // will delete it too! return true; @@ -131,10 +131,10 @@ void KviCustomToolBarManager::clear() KviCustomToolBarDescriptor * KviCustomToolBarManager::create(const TQString &szId,const TQString &szLabelCode) { - KviCustomToolBarDescriptor * d = m_pDescriptors->tqfind(szId); + KviCustomToolBarDescriptor * d = m_pDescriptors->find(szId); if(d)return d; d = new KviCustomToolBarDescriptor(szId,szLabelCode); - m_pDescriptors->tqreplace(szId,d); + m_pDescriptors->replace(szId,d); return d; } @@ -193,7 +193,7 @@ void KviCustomToolBarManager::load(const TQString &szFileName) KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(it.currentKey(),TQString()); d->m_bVisibleAtStartup = (cfg.readIntEntry("Visible",0) > 0); if(!d->load(&cfg))delete d; - else m_pDescriptors->tqreplace(it.currentKey(),d); + else m_pDescriptors->replace(it.currentKey(),d); ++it; } } @@ -228,7 +228,7 @@ void KviCustomToolBarManager::loadScripttoolbarsCompat(const TQString &szFileNam tmp.sprintf("%d",i); KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(TQString(),TQString()); if(!d->loadScripttoolbarCompat(tmp.ptr(),&cfg))delete d; - else m_pDescriptors->tqreplace(d->id(),d); + else m_pDescriptors->replace(d->id(),d); } // get rid of the file now... diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.h b/src/kvirc/kernel/kvi_customtoolbarmanager.h index cafe743..18320bc 100644 --- a/src/kvirc/kernel/kvi_customtoolbarmanager.h +++ b/src/kvirc/kernel/kvi_customtoolbarmanager.h @@ -57,7 +57,7 @@ public: KviPointerHashTable<TQString,KviCustomToolBarDescriptor> * descriptors(){ return m_pDescriptors; }; KviCustomToolBar * firstExistingToolBar(); KviCustomToolBarDescriptor * create(const TQString &szId,const TQString &szLabelCode); - KviCustomToolBarDescriptor * tqfind(const TQString &szId){ return m_pDescriptors->tqfind(szId); }; + KviCustomToolBarDescriptor * find(const TQString &szId){ return m_pDescriptors->find(szId); }; KviCustomToolBarDescriptor * findDescriptorByInternalId(int id); void updateVisibleToolBars(); void createToolBarsVisibleAtStartup(); diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp index 5c72e7c..3f39398 100644 --- a/src/kvirc/kernel/kvi_filetransfer.cpp +++ b/src/kvirc/kernel/kvi_filetransfer.cpp @@ -90,8 +90,8 @@ void KviFileTransferManager::invokeTransferWindow(KviWindow * pWnd,bool bCreateM { KviPointerHashTable<TQString,TQVariant> d(7,false); d.setAutoDelete(true); - d.tqreplace("bCreateMinimized",new TQVariant(bCreateMinimized,0)); - d.tqreplace("bNoRaise",new TQVariant(bNoRaise,0)); + d.replace("bCreateMinimized",new TQVariant(bCreateMinimized,0)); + d.replace("bNoRaise",new TQVariant(bNoRaise,0)); KviModuleExtensionManager::instance()->allocateExtension( "tool", diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index d990ff5..db36287 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -547,10 +547,10 @@ int KviIconManager::getSmallIconIdFromName(const TQString &szName) { int * pInt = new int; *pInt = i; - m_pIconNames->tqreplace(TQString(g_szIconNames[i]),pInt); + m_pIconNames->replace(TQString(g_szIconNames[i]),pInt); } } - int * pInt = m_pIconNames->tqfind(szName); + int * pInt = m_pIconNames->find(szName); if(!pInt)return 0; return *pInt; } @@ -610,7 +610,7 @@ KviCachedPixmap * KviIconManager::getPixmapWithCache(const TQString &szName) { if(szName.isEmpty())return 0; - KviCachedPixmap * p = m_pCachedImages->tqfind(szName); + KviCachedPixmap * p = m_pCachedImages->find(szName); if(p) { @@ -645,7 +645,7 @@ KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const TQString & { if(szName.isEmpty())return 0; - KviCachedPixmap * p = m_pCachedImages->tqfind(szName); + KviCachedPixmap * p = m_pCachedImages->find(szName); if(p) { @@ -772,16 +772,16 @@ void KviIconManager::urlToCachedFileName(KviStr &szFName) void KviIconManager::urlToCachedFileName(TQString &szFName) { - szFName.tqreplace(":","_"); - szFName.tqreplace(";","_"); - szFName.tqreplace("/","_"); - szFName.tqreplace("\\","_"); - szFName.tqreplace("\"","_"); - szFName.tqreplace("\'","_"); - szFName.tqreplace("(","_"); - szFName.tqreplace(")","_"); - szFName.tqreplace("?","_"); - szFName.tqreplace("___","."); + szFName.replace(":","_"); + szFName.replace(";","_"); + szFName.replace("/","_"); + szFName.replace("\\","_"); + szFName.replace("\"","_"); + szFName.replace("\'","_"); + szFName.replace("(","_"); + szFName.replace(")","_"); + szFName.replace("?","_"); + szFName.replace("___","."); } KviAvatar * KviIconManager::getAvatar(const TQString &szLocalPath,const TQString &szName) diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp index d4d79a9..4c91a48 100644 --- a/src/kvirc/kernel/kvi_ircconnection.cpp +++ b/src/kvirc/kernel/kvi_ircconnection.cpp @@ -723,7 +723,7 @@ void KviIrcConnection::userInfoReceived(const TQString &szUserName,const TQStrin userInfo()->setUserName(szUserName); TQString szUnmaskedHost = m_pUserInfo->unmaskedHostName(); // Update the user entry - KviIrcUserEntry * e = userDataBase()->tqfind(userInfo()->nickName()); + KviIrcUserEntry * e = userDataBase()->find(userInfo()->nickName()); if(e) // should be there! (we have the permanent entry in the notify list view) { e->setUser(szUserName); @@ -1003,7 +1003,7 @@ void KviIrcConnection::loginToIrcServer() m_pConsole->notifyListView()->join(m_pUserInfo->nickName(),"*","*"); // set own avatar if we have it - KviIrcUserEntry * e = userDataBase()->tqfind(userInfo()->nickName()); + KviIrcUserEntry * e = userDataBase()->find(userInfo()->nickName()); if(e) // should be there! { if(!e->avatar()) @@ -1189,7 +1189,7 @@ void KviIrcConnection::loginComplete(const TQString &szNickName) KviIrcUserDataBase * db = userDataBase(); if(db) { - KviIrcUserEntry * e = db->tqfind(szNick); + KviIrcUserEntry * e = db->find(szNick); if(e) { user = e->user(); diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp index 0553354..9c5ef5a 100644 --- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp +++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp @@ -57,19 +57,19 @@ void KviIrcConnectionServerInfo::setSupportedChannelModes(const TQString &szSupp { int pos=-1; - pos=szSupportedChannelModes.tqfind(','); + pos=szSupportedChannelModes.find(','); if(pos>=0) m_szListModes=szSupportedChannelModes.left(pos); - pos=szSupportedChannelModes.tqfindRev(','); + pos=szSupportedChannelModes.findRev(','); if(pos>=0) m_szPlainModes=szSupportedChannelModes.right(szSupportedChannelModes.length()+pos-1); m_szSupportedChannelModes = szSupportedChannelModes; - m_bSupportsModesIe = (szSupportedChannelModes.tqcontains('e') && szSupportedChannelModes.tqcontains('I')); + m_bSupportsModesIe = (szSupportedChannelModes.contains('e') && szSupportedChannelModes.contains('I')); TQChar* aux=(TQChar*)szSupportedChannelModes.ucs2(); while(aux->tqunicode()) { - if(!m_szSupportedChannelModes.tqcontains(*aux)) + if(!m_szSupportedChannelModes.contains(*aux)) m_szSupportedChannelModes.append(*aux); aux++; } @@ -189,11 +189,11 @@ kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromModeChar(TQChar c) void KviIrcConnectionServerInfo::setServerVersion(const TQString & version) { if(m_pServInfo) delete m_pServInfo; - if(version.tqcontains("unreal",false)) + if(version.contains("unreal",false)) m_pServInfo = new KviUnrealIrcServerInfo(version); - else if(version.tqcontains("bahamut",false)) + else if(version.contains("bahamut",false)) m_pServInfo = new KviBahamutIrcServerInfo(version); - else if(version.tqcontains("hyperion",false)) + else if(version.contains("hyperion",false)) m_pServInfo = new KviHyperionIrcServerInfo(version); else m_pServInfo = new KviBasicIrcServerInfo(version); diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp index 49e8864..f092b62 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp @@ -460,8 +460,8 @@ void KviIrcConnectionTargetResolver::haveServerIp() if(!validateLocalAddress(m_pTarget->bindAddress(),bindAddress)) { TQString szBindAddress = m_pTarget->bindAddress(); - if((szBindAddress.tqfind('.') != -1) || - (szBindAddress.tqfind(':') != -1)) + if((szBindAddress.find('.') != -1) || + (szBindAddress.find(':') != -1)) { if(!_OUTPUT_MUTE) m_pConsole->output(KVI_OUT_SYSTEMWARNING, @@ -486,7 +486,7 @@ void KviIrcConnectionTargetResolver::haveServerIp() if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress),bindAddress)) { // if it is not an interface name , kill it for now and let the user correct the address - if(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).tqfind(':') != -1) + if(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).find(':') != -1) { if(!_OUTPUT_MUTE) m_pConsole->output(KVI_OUT_SYSTEMWARNING, @@ -515,7 +515,7 @@ void KviIrcConnectionTargetResolver::haveServerIp() if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress),bindAddress)) { // if it is not an interface name , kill it for now and let the user correct the address - if(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).tqfind(':') != -1) + if(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).find(':') != -1) { if(!_OUTPUT_MUTE) m_pConsole->output(KVI_OUT_SYSTEMWARNING, diff --git a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp index 22674f0..0c7164d 100644 --- a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp +++ b/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp @@ -33,7 +33,7 @@ KviIrcConnectionUserInfo::KviIrcConnectionUserInfo() bool KviIrcConnectionUserInfo::hasUserMode(const TQChar &m) { - return m_szUserMode.tqcontains(m) > 0; + return m_szUserMode.contains(m) > 0; } bool KviIrcConnectionUserInfo::addUserMode(const TQChar &m) @@ -45,9 +45,9 @@ bool KviIrcConnectionUserInfo::addUserMode(const TQChar &m) bool KviIrcConnectionUserInfo::removeUserMode(const TQChar &m) { - int idx = m_szUserMode.tqfind(m,0); + int idx = m_szUserMode.find(m,0); if(idx == -1)return false; - m_szUserMode.tqreplace(m,TQString("")); + m_szUserMode.replace(m,TQString("")); return true; } diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp index ce71efa..18feca1 100644 --- a/src/kvirc/kernel/kvi_irccontext.cpp +++ b/src/kvirc/kernel/kvi_irccontext.cpp @@ -845,8 +845,8 @@ void KviIrcContext::terminateConnectionRequest(bool bForce,const TQString &szQui KVS_TRIGGER_EVENT_0(KviEvent_OnDisconnectRequest,m_pConsole); TQString szQuit = szQuitMsg; if(szQuit.isEmpty())szQuit = KVI_OPTION_STRING(KviOption_stringQuitMessage); - szQuit.tqreplace(";","\\;"); - szQuit.tqreplace("\n"," "); + szQuit.replace(";","\\;"); + szQuit.replace("\n"," "); TQString buffer; KviKvsVariant ret; if(KviKvsScript::evaluate(szQuit,console(),0,&ret)) diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp index 2a35d78..0dafad9 100644 --- a/src/kvirc/kernel/kvi_ircurl.cpp +++ b/src/kvirc/kernel/kvi_ircurl.cpp @@ -151,7 +151,7 @@ void KviIrcUrl::split(TQString url, KviIrcUrlParts& result) result.iPort = 6667; result.iError=0; - int iProtoLen = url.tqfind("://"); + int iProtoLen = url.find("://"); if(iProtoLen!=-1) { if(KviTQString::equalCIN(url,"irc",3)) { // OK, seems to be a valid proto; @@ -168,7 +168,7 @@ void KviIrcUrl::split(TQString url, KviIrcUrlParts& result) //irc(???):// proto?? result.iError |= InvalidProtocol; } - iProtoLen = url.tqfind("://"); + iProtoLen = url.find("://"); url = url.right(url.length()-iProtoLen-3); } else { result.iError |= InvalidProtocol; @@ -176,13 +176,13 @@ void KviIrcUrl::split(TQString url, KviIrcUrlParts& result) } //Ok, we understand a protocol.. Now we shuld find a server name:) int iTmp; - iTmp = url.tqfind(':'); + iTmp = url.find(':'); if(iTmp!=-1) { result.szHost = url.left(iTmp); url = url.right(url.length()-iTmp-1); // Accepted, now the time for the port:) bool bOk; - if( (iTmp = url.tqfind('/')) != -1) { // any channels pending? + if( (iTmp = url.find('/')) != -1) { // any channels pending? result.iPort = url.left(iTmp).toUInt(&bOk); if(!bOk) { result.iPort = 6667; @@ -197,7 +197,7 @@ void KviIrcUrl::split(TQString url, KviIrcUrlParts& result) } url = ""; } - } else if( (iTmp = url.tqfind('/')) != -1) { // have channels?? + } else if( (iTmp = url.find('/')) != -1) { // have channels?? result.szHost = url.left(iTmp); url = url.right(url.length()-iTmp-1); } else { diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp index 959978b..7a55ee9 100644 --- a/src/kvirc/kernel/kvi_main.cpp +++ b/src/kvirc/kernel/kvi_main.cpp @@ -255,16 +255,16 @@ int parseArgs(ParseArgs * a) { if(a->szExecCommand.hasData())a->szExecCommand.append('\n'); a->szExecCommand.append("parse \""); - tmp.tqreplace('$',"\\$"); - tmp.tqreplace('\\',"\\\\"); + tmp.replace('$',"\\$"); + tmp.replace('\\',"\\\\"); a->szExecCommand.append(tmp); a->szExecCommand.append('"'); } else if(KviTQString::equalCI(ri,".kvt")) { if(a->szExecCommand.hasData())a->szExecCommand.append('\n'); a->szExecCommand.append("theme.install \""); - tmp.tqreplace('$',"\\$"); - tmp.tqreplace('\\',"\\\\"); + tmp.replace('$',"\\$"); + tmp.replace('\\',"\\\\"); a->szExecCommand.append(tmp); a->szExecCommand.append('"'); } else diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp index 83b5e0e..029a962 100644 --- a/src/kvirc/kernel/kvi_notifylist.cpp +++ b/src/kvirc/kernel/kvi_notifylist.cpp @@ -172,7 +172,7 @@ void KviNotifyListManager::notifyOnLine(const TQString &nick,const TQString &use while(KviRegisteredUser * u = it.current()) { - if(TQStringList::split(",",u->getProperty("notify")).tqfindIndex(nick)!=-1) + if(TQStringList::split(",",u->getProperty("notify")).findIndex(nick)!=-1) { TQString szComment=u->getProperty("comment"); if(!szComment.isEmpty()) @@ -232,7 +232,7 @@ void KviNotifyListManager::notifyOffLine(const TQString &nick,const TQString &us while(KviRegisteredUser * u = it.current()) { - if(TQStringList::split(",",u->getProperty("notify")).tqfindIndex(nick)!=-1) + if(TQStringList::split(",",u->getProperty("notify")).findIndex(nick)!=-1) { TQString szComment=u->getProperty("comment"); if(!szComment.isEmpty()) @@ -386,14 +386,14 @@ void KviIsOnNotifyListManager::buildRegUserDict() notify.stripWhiteSpace(); while(!notify.isEmpty()) { - int idx = notify.tqfind(' '); + int idx = notify.find(' '); if(idx > 0) { TQString single = notify.left(idx); - m_pRegUserDict->tqreplace(single,new TQString(u->name())); + m_pRegUserDict->replace(single,new TQString(u->name())); notify.remove(0,idx+1); } else { - m_pRegUserDict->tqreplace(notify,new TQString(u->name())); + m_pRegUserDict->replace(notify,new TQString(u->name())); notify = ""; } } @@ -624,7 +624,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) // check if we have a cached tqmask if(db) { - if(KviIrcUserEntry * ue = db->tqfind(*s)) + if(KviIrcUserEntry * ue = db->find(*s)) { // already in the db... do we have a tqmask ? if(ue->hasUser() && ue->hasHost()) @@ -658,7 +658,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) bool KviIsOnNotifyListManager::doMatchUser(const TQString ¬ifyString,const KviIrcMask & tqmask) { - TQString * nam = m_pRegUserDict->tqfind(notifyString); + TQString * nam = m_pRegUserDict->find(notifyString); if(nam) { // ok...find the user @@ -980,7 +980,7 @@ bool KviStupidNotifyListManager::handleIsOn(KviIrcMessage * msg) { TQString nkd = m_pConnection->decodeText(nk.ptr()); TQString nksp = " " + nkd; - m_szLastIsOnMsg.tqreplace(nksp,"",false); + m_szLastIsOnMsg.replace(nksp,"",false); if(!(m_pConsole->notifyListView()->findEntry(nkd))) { // not yet notified @@ -1097,7 +1097,7 @@ void KviWatchNotifyListManager::buildRegUserDict() TQStringList sl = TQStringList::split(' ',notify); for(TQStringList::Iterator it = sl.begin();it != sl.end();++it) { - m_pRegUserDict->tqreplace(*it,new TQString(u->name())); + m_pRegUserDict->replace(*it,new TQString(u->name())); } } ++it; @@ -1116,7 +1116,7 @@ void KviWatchNotifyListManager::start() while(it.current()) { TQString nk = it.currentKey(); - if(nk.tqfind('*') == -1) + if(nk.find('*') == -1) { if((watchStr.length() + nk.length() + 2) > 501) { @@ -1148,7 +1148,7 @@ void KviWatchNotifyListManager::stop() bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString ¬ifyString,const KviIrcMask & tqmask) { - TQString * nam = m_pRegUserDict->tqfind(notifyString); + TQString * nam = m_pRegUserDict->find(notifyString); if(nam) { @@ -1247,7 +1247,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg) if(_OUTPUT_VERBOSE) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Stopped watching for \r!n\r%Q\r"),&dnk); } - if(m_pRegUserDict->tqfind(dnk))m_pRegUserDict->remove(dnk); // kill that + if(m_pRegUserDict->find(dnk))m_pRegUserDict->remove(dnk); // kill that return true; diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp index 3296222..d741bfd 100644 --- a/src/kvirc/kernel/kvi_texticonmanager.cpp +++ b/src/kvirc/kernel/kvi_texticonmanager.cpp @@ -91,13 +91,13 @@ void KviTextIconManager::clear() void KviTextIconManager::insert(const TQString &name,int id) { - m_pTextIconDict->tqreplace(name,new KviTextIcon(id)); + m_pTextIconDict->replace(name,new KviTextIcon(id)); emit changed(); } void KviTextIconManager::insert(const TQString &name,KviTextIcon& icon) { - m_pTextIconDict->tqreplace(name,new KviTextIcon(&icon)); + m_pTextIconDict->replace(name,new KviTextIcon(&icon)); emit changed(); } @@ -129,7 +129,7 @@ void KviTextIconManager::checkDefaultAssociations() { for(int i=0;default_associations[i].name;i++) { - if(!m_pTextIconDict->tqfind(default_associations[i].name)) + if(!m_pTextIconDict->find(default_associations[i].name)) insert(TQString::fromUtf8(default_associations[i].name),default_associations[i].iVal); } emit changed(); @@ -172,7 +172,7 @@ int KviTextIconManager::load(const TQString &filename,bool bMerge) cfg.setGroup("Manager"); int upd = cfg.readIntEntry("ConfigUpdate",0); - KviConfigGroup * dict = cfg.dict()->tqfind("TextIcons"); + KviConfigGroup * dict = cfg.dict()->find("TextIcons"); if(dict) { KviConfigGroupIterator it(*dict); @@ -209,16 +209,16 @@ int KviTextIconManager::load(const TQString &filename,bool bMerge) { if(bMerge) { - if(!m_pTextIconDict->tqfind(*s)) + if(!m_pTextIconDict->find(*s)) if(id!=-1) - m_pTextIconDict->tqreplace(*s,new KviTextIcon(id)); + m_pTextIconDict->replace(*s,new KviTextIcon(id)); else - m_pTextIconDict->tqreplace(*s,new KviTextIcon(szTmp)); + m_pTextIconDict->replace(*s,new KviTextIcon(szTmp)); } else { if(id!=-1) - m_pTextIconDict->tqreplace(*s,new KviTextIcon(id)); + m_pTextIconDict->replace(*s,new KviTextIcon(id)); else - m_pTextIconDict->tqreplace(*s,new KviTextIcon(szTmp)); + m_pTextIconDict->replace(*s,new KviTextIcon(szTmp)); } } } diff --git a/src/kvirc/kernel/kvi_texticonmanager.h b/src/kvirc/kernel/kvi_texticonmanager.h index 8358014..0083b60 100644 --- a/src/kvirc/kernel/kvi_texticonmanager.h +++ b/src/kvirc/kernel/kvi_texticonmanager.h @@ -70,7 +70,7 @@ public: void clear(); void insert(const TQString &name,int id); void insert(const TQString &name,KviTextIcon& icon); - KviTextIcon * lookupTextIcon(const TQString &name){ return m_pTextIconDict->tqfind(name); }; + KviTextIcon * lookupTextIcon(const TQString &name){ return m_pTextIconDict->find(name); }; void load(); void save(); protected: diff --git a/src/kvirc/kernel/kvi_userinput.cpp b/src/kvirc/kernel/kvi_userinput.cpp index 07849cf..6de1110 100644 --- a/src/kvirc/kernel/kvi_userinput.cpp +++ b/src/kvirc/kernel/kvi_userinput.cpp @@ -80,14 +80,14 @@ namespace KviUserInput static TQString szUserFriendlyCommandlineContext(__tr2qs("commandline::userfriendly")); TQString szCmd=szData; // escape any -$;\%( - szCmd.tqreplace("\\","\\\\"); - szCmd.tqreplace("\"","\\\""); - szCmd.tqreplace("$","\\$"); - szCmd.tqreplace("%","\\%"); - szCmd.tqreplace("(","\\("); - szCmd.tqreplace(";","\\;"); - szCmd.tqreplace("-","\\-"); - szCmd.tqreplace("+","\\+"); + szCmd.replace("\\","\\\\"); + szCmd.replace("\"","\\\""); + szCmd.replace("$","\\$"); + szCmd.replace("%","\\%"); + szCmd.replace("(","\\("); + szCmd.replace(";","\\;"); + szCmd.replace("-","\\-"); + szCmd.replace("+","\\+"); KviKvsScript kvs(szContext.isEmpty() ? szUserFriendlyCommandlineContext : szContext,szCmd); return (kvs.run(pWindow,0,0) != KviKvsScript::Error); } else { |