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/perlcore/KVIrc.xs | 4 ++-- src/modules/perlcore/libkviperlcore.cpp | 6 +++--- src/modules/perlcore/ppport.h | 6 +++--- src/modules/perlcore/xs.inc | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/modules/perlcore') diff --git a/src/modules/perlcore/KVIrc.xs b/src/modules/perlcore/KVIrc.xs index 72ee5fd3..017350c5 100644 --- a/src/modules/perlcore/KVIrc.xs +++ b/src/modules/perlcore/KVIrc.xs @@ -56,7 +56,7 @@ char * getLocal(varname) KviStr hack; if(g_pCurrentKvsContext) { - KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->tqfind(varname); + KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->find(varname); if(pVar) { pVar->asString(tmp); @@ -89,7 +89,7 @@ char * getGlobal(varname) KviStr hack; if(g_pCurrentKvsContext) { - KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->tqfind(varname); + KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->find(varname); if(pVar) { pVar->asString(tmp); diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp index 4325ccda..a7c9a282 100644 --- a/src/modules/perlcore/libkviperlcore.cpp +++ b/src/modules/perlcore/libkviperlcore.cpp @@ -299,7 +299,7 @@ static KviPointerHashTable * g_pInterpreters = 0; static KviPerlInterpreter * perlcore_get_interpreter(const TQString &szContextName) { - KviPerlInterpreter * i = g_pInterpreters->tqfind(szContextName); + KviPerlInterpreter * i = g_pInterpreters->find(szContextName); if(i)return i; i = new KviPerlInterpreter(szContextName); if(!i->init()) @@ -307,13 +307,13 @@ static KviPerlInterpreter * perlcore_get_interpreter(const TQString &szContextNa delete i; return 0; } - g_pInterpreters->tqreplace(szContextName,i); + g_pInterpreters->replace(szContextName,i); return i; } static void perlcore_destroy_interpreter(const TQString &szContextName) { - KviPerlInterpreter * i = g_pInterpreters->tqfind(szContextName); + KviPerlInterpreter * i = g_pInterpreters->find(szContextName); if(!i)return; g_pInterpreters->remove(szContextName); i->done(); diff --git a/src/modules/perlcore/ppport.h b/src/modules/perlcore/ppport.h index 86d03bce..2a802132 100644 --- a/src/modules/perlcore/ppport.h +++ b/src/modules/perlcore/ppport.h @@ -81,11 +81,11 @@ /* #!/usr/bin/perl @ARGV = ("*.xs") if !@ARGV; -%badmacros = %funcs = %macros = (); $tqreplace = 0; +%badmacros = %funcs = %macros = (); $replace = 0; foreach () { $funcs{$1} = 1 if /Provide:\s+(\S+)/; $macros{$1} = 1 if /^#\s*define\s+([a-zA-Z0-9_]+)/; - $tqreplace = $1 if /Replace:\s+(\d+)/; + $replace = $1 if /Replace:\s+(\d+)/; $badmacros{$2}=$1 if $replace and /^#\s*define\s+([a-zA-Z0-9_]+).*?\s+([a-zA-Z0-9_]+)/; $badmacros{$1}=$2 if /Replace (\S+) with (\S+)/; } @@ -404,7 +404,7 @@ SV *sv; * * Code that uses these macros is responsible for the following: * 1. #define MY_CXT_KEY to a unique string, e.g. "DynaLoader_guts" - * 2. Declare a typedef named my_cxt_t that is a structure that tqcontains + * 2. Declare a typedef named my_cxt_t that is a structure that contains * all the data that needs to be interpreter-local. * 3. Use the START_MY_CXT macro after the declaration of my_cxt_t. * 4. Use the MY_CXT_INIT macro such that it is called exactly once diff --git a/src/modules/perlcore/xs.inc b/src/modules/perlcore/xs.inc index 092e9369..a0741207 100644 --- a/src/modules/perlcore/xs.inc +++ b/src/modules/perlcore/xs.inc @@ -129,7 +129,7 @@ XS(XS_KVIrc_getLocal) KviStr hack; if(g_pCurrentKvsContext) { - KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->tqfind(varname); + KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->find(varname); if(pVar) { pVar->asString(tmp); @@ -183,7 +183,7 @@ XS(XS_KVIrc_getGlobal) KviStr hack; if(g_pCurrentKvsContext) { - KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->tqfind(varname); + KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->find(varname); if(pVar) { pVar->asString(tmp); -- cgit v1.2.1