rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 9 deletions

diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 90a8ef28..da699bd2 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -52,7 +52,7 @@ static ParseNode f_stringLength(Parser*, const ParameterList& params)
 
 static ParseNode f_stringContains(Parser*, const ParameterList& params)
 {
-  return params[0].toString().tqcontains(params[1].toString());
+  return params[0].toString().contains(params[1].toString());
 }
 
 static ParseNode f_stringCompare(Parser*, const ParameterList& params)
@@ -71,12 +71,12 @@ static ParseNode f_stringCompare(Parser*, const ParameterList& params)
 
 static ParseNode f_stringFind(Parser*, const ParameterList& params)
 {
-  return params[0].toString().tqfind(params[1].toString(), params.count() == 3 ? params[2].toInt() : 0);
+  return params[0].toString().find(params[1].toString(), params.count() == 3 ? params[2].toInt() : 0);
 }
 
 static ParseNode f_stringFindRev(Parser*, const ParameterList& params)
 {
-  return params[0].toString().tqfindRev(params[1].toString(), 
+  return params[0].toString().findRev(params[1].toString(), 
     params.count() == 3 ? params[2].toInt() : params[0].toString().length());
 }
 
@@ -102,7 +102,7 @@ static ParseNode f_stringRemove(Parser*, const ParameterList& params)
 
 static ParseNode f_stringReplace(Parser*, const ParameterList& params)
 {
-  return params[0].toString().tqreplace(params[1].toString(), params[2].toString());
+  return params[0].toString().replace(params[1].toString(), params[2].toString());
 }
 
 static ParseNode f_stringLower(Parser*, const ParameterList& params)
@@ -354,7 +354,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
     else if (*it == "bool")
       byteDataStream << (bool)params[i++].toInt();
     else if (*it == TQSTRINGLIST_OBJECT_NAME_STRING)
-      if (params[i].toString().tqfind('\n') != -1)
+      if (params[i].toString().find('\n') != -1)
         byteDataStream << TQStringList::split("\n", params[i++].toString(), true);
       else
         byteDataStream << TQStringList::split("\\n", params[i++].toString(), true);
@@ -648,7 +648,7 @@ static ParseNode f_arrayIndexedRemoveElements(Parser* P, const ParameterList& pa
     return ParseNode(); //out of index range
   for (int i = 0; i < count; i++)
   {
-    if (keys.tqcontains(TQString::number(i)) != 1)
+    if (keys.contains(TQString::number(i)) != 1)
       return ParseNode(); //array is not indexed
   }
   for (int i = key; i <= key + num; i++)
@@ -910,15 +910,15 @@ static ParseNode f_write_setting(Parser* parser, const ParameterList& params)
 void ParserData::registerStandardFunctions()
 {
   registerFunction("str_length", Function(&f_stringLength, ValueInt, ValueString));
-  registerFunction("str_tqcontains", Function(&f_stringContains, ValueInt, ValueString, ValueString));
+  registerFunction("str_contains", Function(&f_stringContains, ValueInt, ValueString, ValueString));
   registerFunction("str_compare", Function(&f_stringCompare, ValueInt, ValueString, ValueString));
-  registerFunction("str_tqfind", Function(&f_stringFind, ValueInt, ValueString, ValueString, ValueInt, 2));
+  registerFunction("str_find", Function(&f_stringFind, ValueInt, ValueString, ValueString, ValueInt, 2));
   registerFunction("str_findrev", Function(&f_stringFindRev, ValueInt, ValueString, ValueString, ValueInt, 2));
   registerFunction("str_left", Function(&f_stringLeft, ValueString, ValueString, ValueInt));
   registerFunction("str_right", Function(&f_stringRight, ValueString, ValueString, ValueInt));
   registerFunction("str_mid", Function(&f_stringMid, ValueString, ValueString, ValueInt, ValueInt, 2));
   registerFunction("str_remove", Function(&f_stringRemove, ValueString, ValueString, ValueString));
-  registerFunction("str_tqreplace", Function(&f_stringReplace, ValueString, ValueString, ValueString, ValueString));
+  registerFunction("str_replace", Function(&f_stringReplace, ValueString, ValueString, ValueString, ValueString));
   registerFunction("str_lower", Function(&f_stringLower, ValueString, ValueString));
   registerFunction("str_upper", Function(&f_stringUpper, ValueString, ValueString));
   registerFunction("str_section", Function(&f_stringSection, ValueString, ValueString, ValueString, ValueInt, ValueInt, 3));