From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/modules/perl/libkviperl.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/modules/perl/libkviperl.cpp') diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp index a898e43a..3362586c 100644 --- a/src/modules/perl/libkviperl.cpp +++ b/src/modules/perl/libkviperl.cpp @@ -43,7 +43,7 @@ g_pPerlCoreModule = g_pModuleManager->getModule("perlcore"); \ if(!g_pPerlCoreModule) \ { \ - if(!_c->switches()->find('q',"quiet")) \ + if(!_c->switches()->tqfind('q',"quiet")) \ { \ _c->warning(__tr2qs_ctx("The perlcore module can't be loaded: perl support not available","perl")); \ _c->warning(__tr2qs_ctx("To see more details about loading failure try /perlcore.load","perl")); \ @@ -58,7 +58,7 @@ #define KVS_CHECK_MODULE_STATE(_m,_c) KVS_CHECK_PERLCORE(_m,_c) #else // !COMPILE_PERL_SUPPORT #define KVS_CHECK_MODULE_STATE(_m,_c) \ - if(!_c->switches()->find('q',"quiet")) \ + if(!_c->switches()->tqfind('q',"quiet")) \ _c->warning(__tr2qs_ctx("This KVIrc executable has been compiled without perl scripting support","perl")); \ return true; #endif // !COMPILE_PERL_SUPPORT @@ -431,7 +431,7 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c) // The parser sets the perl code as the first parameter of our call, // the remaining params are the context name and the arguments - QString szCode,szContext; + TQString szCode,szContext; KviKvsVariantList vList; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("code",KVS_PT_STRING,0,szCode) @@ -450,31 +450,31 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c) ex.szCode = szCode; for(KviKvsVariant * v = vList.first();v;v = vList.next()) { - QString tmp; + TQString tmp; v->asString(tmp); ex.lArgs.append(tmp); } - ex.bQuiet = c->switches()->find('q',"quiet"); + ex.bQuiet = c->switches()->tqfind('q',"quiet"); if(!g_pPerlCoreModule->ctrl(KVI_PERLCORECTRLCOMMAND_EXECUTE,&ex)) { - if(!c->switches()->find('q',"quiet")) + if(!c->switches()->tqfind('q',"quiet")) c->warning(__tr2qs_ctx("The perlcore module failed to execute the code: something is wrong with the perl support","perl")); return true; } if(!ex.lWarnings.isEmpty()) { - for(QStringList::Iterator it = ex.lWarnings.begin();it != ex.lWarnings.end();++it) + for(TQStringList::Iterator it = ex.lWarnings.begin();it != ex.lWarnings.end();++it) c->warning(*it); } if(!ex.bExitOk) { - if(!c->switches()->find('q',"quiet")) + if(!c->switches()->tqfind('q',"quiet")) { - if(c->switches()->find('f',"fail-on-error")) + if(c->switches()->tqfind('f',"fail-on-error")) { c->warning(__tr2qs_ctx("Perl execution error:","perl")); c->warning(ex.szError); @@ -486,7 +486,7 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c) } } - if(!c->switches()->find('n',"no-return")) + if(!c->switches()->tqfind('n',"no-return")) c->context()->returnValue()->setString(ex.szRetVal); #endif //COMPILE_PERL_SUPPORT @@ -518,7 +518,7 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c) static bool perl_kvs_cmd_destroy(KviKvsModuleCommandCall * c) { - QString szContext; + TQString szContext; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("context",KVS_PT_NONEMPTYSTRING,0,szContext) KVSM_PARAMETERS_END(c) @@ -532,7 +532,7 @@ static bool perl_kvs_cmd_destroy(KviKvsModuleCommandCall * c) if(!g_pPerlCoreModule->ctrl(KVI_PERLCORECTRLCOMMAND_DESTROY,&ex)) { - if(!c->switches()->find('q',"quiet")) + if(!c->switches()->tqfind('q',"quiet")) c->warning(__tr2qs_ctx("The perlcore module failed to execute the code: something is wrong with the perl support","perl")); } #endif //COMPILE_PERL_SUPPORT -- cgit v1.2.1