From 72aaee9802d447ee21340b011856b9b355a58f1a Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/modules/addon/libkviaddon.cpp | 28 ++++++++++++++-------------- src/modules/addon/managementdialog.cpp | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/modules/addon') diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp index 6e984779..08f18081 100644 --- a/src/modules/addon/libkviaddon.cpp +++ b/src/modules/addon/libkviaddon.cpp @@ -188,13 +188,13 @@ static bool addon_kvs_cmd_uninstall(KviKvsModuleCommandCall * c) KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(szName); if(a) { - if(!c->switches()->tqfind('q',"quiet")) + if(!c->switches()->find('q',"quiet")) c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Uninstalling existing addon version %Q"),&(a->version())); // uninstall the existing version - KviKvsScriptAddonManager::instance()->unregisterAddon(szName,c->window(),!c->switches()->tqfind('n',"no-callback")); + KviKvsScriptAddonManager::instance()->unregisterAddon(szName,c->window(),!c->switches()->find('n',"no-callback")); } else { - if(!c->switches()->tqfind('q',"quiet")) + if(!c->switches()->find('q',"quiet")) c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName)); } @@ -234,13 +234,13 @@ static bool addon_kvs_cmd_configure(KviKvsModuleCommandCall * c) TQString ss = a->configureCallbackCode(); if(ss.isEmpty()) { - if(!c->switches()->tqfind('q',"quiet")) + if(!c->switches()->find('q',"quiet")) c->warning(__tr2qs("The addon \"%1\" has no configure callback set").tqarg(szName)); } else { a->executeConfigureCallback(c->window()); } } else { - if(!c->switches()->tqfind('q',"quiet")) + if(!c->switches()->find('q',"quiet")) c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName)); } @@ -281,13 +281,13 @@ static bool addon_kvs_cmd_help(KviKvsModuleCommandCall * c) TQString ss = a->helpCallbackCode(); if(ss.isEmpty()) { - if(!c->switches()->tqfind('q',"quiet")) + if(!c->switches()->find('q',"quiet")) c->warning(__tr2qs("The addon \"%1\" has no help callback set").tqarg(szName)); } else { a->executeHelpCallback(c->window()); } } else { - if(!c->switches()->tqfind('q',"quiet")) + if(!c->switches()->find('q',"quiet")) c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName)); } @@ -333,7 +333,7 @@ static bool addon_kvs_cmd_setconfigurecallback(KviKvsModuleCallbackCommandCall * { a->setConfigureCallback(c->callback()->code()); } else { - if(!c->switches()->tqfind('q',"quiet")) + if(!c->switches()->find('q',"quiet")) c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName)); } @@ -380,7 +380,7 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c) { a->setHelpCallback(c->callback()->code()); } else { - if(!c->switches()->tqfind('q',"quiet")) + if(!c->switches()->find('q',"quiet")) c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName)); } @@ -549,7 +549,7 @@ static bool addon_kvs_cmd_register(KviKvsModuleCallbackCommandCall * c) return false; } - if(!c->switches()->tqfind('q',"quiet")) + if(!c->switches()->find('q',"quiet")) c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Attempting to register addon \"%Q\" with version %Q"),&(rd.szName),&(rd.szVersion)); KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(rd.szName); @@ -560,18 +560,18 @@ static bool addon_kvs_cmd_register(KviKvsModuleCallbackCommandCall * c) { // and it has a higher version... // complain unless -f is used - if(!c->switches()->tqfind('f',"force")) + if(!c->switches()->find('f',"force")) { c->error(__tr2qs("The script addon \"%Q\" already exists with version %Q which is higher than %Q"),&(rd.szName),&(a->version()),&(rd.szVersion)); return false; } } - if(!c->switches()->tqfind('q',"quiet")) + if(!c->switches()->find('q',"quiet")) c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Uninstalling existing addon version %Q"),&(a->version())); // uninstall the existing version - KviKvsScriptAddonManager::instance()->unregisterAddon(rd.szName,c->window(),!c->switches()->tqfind('n',"no-uninstall")); + KviKvsScriptAddonManager::instance()->unregisterAddon(rd.szName,c->window(),!c->switches()->find('n',"no-uninstall")); } if(!KviKvsScriptAddonManager::instance()->registerAddon(&rd)) @@ -580,7 +580,7 @@ static bool addon_kvs_cmd_register(KviKvsModuleCallbackCommandCall * c) return false; } - if(!c->switches()->tqfind('q',"quiet")) + if(!c->switches()->find('q',"quiet")) c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Script succesfully registered")); return true; diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index 5a587792..24c539f2 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -353,7 +353,7 @@ void KviScriptManagementDialog::installScript() if(!KviFileDialog::askForOpenFileName(buffer,__tr2qs("Please select the addon installation file"),TQString(),"install.kvs",false,true))return; - buffer.tqreplace("\\","\\\\"); + buffer.replace("\\","\\\\"); TQString szCmd = "parse \""; szCmd += buffer; -- cgit v1.2.1