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, 15 insertions, 15 deletions

diff --git a/quanta/parsers/sagroupparser.cpp b/quanta/parsers/sagroupparser.cpp
index 49973c70..c6c6b57a 100644
--- a/quanta/parsers/sagroupparser.cpp
+++ b/quanta/parsers/sagroupparser.cpp
@@ -144,20 +144,20 @@ void SAGroupParser::parseForScriptGroup(Node *node)
         title = tagStr.mid(pos, group.definitionRx.matchedLength());
         node->tag->beginPos(bl, bc);
         tmpStr = tagStr.left(pos);
-        int newLines = tmpStr.tqcontains('\n');
+        int newLines = tmpStr.contains('\n');
         bl += newLines;
-        int l = tmpStr.tqfindRev('\n'); //the last EOL
+        int l = tmpStr.findRev('\n'); //the last EOL
         bc = (l == -1) ? bc + pos : pos - l - 1;
-        newLines = title.tqcontains('\n');
+        newLines = title.contains('\n');
         l = title.length();
         el = bl + newLines;
-        ec = (newLines > 0) ? l - title.tqfindRev('\n') : bc + l - 1;
+        ec = (newLines > 0) ? l - title.findRev('\n') : bc + l - 1;
         pos += l;
         AreaStruct area(bl, bc, el, ec);
         //get the list of elements which are present in this group and
         //have the same title. For example get the list of all group
         //element which are variable and the matched string was "$i"
-        int cap1Pos = str.tqfind(group.definitionRx.cap(1));
+        int cap1Pos = str.find(group.definitionRx.cap(1));
         TQString s = tagStr.mid(cap1Pos, group.definitionRx.cap(1).length());
         groupElementList = & (globalGroupMap[group.name + "|" + s]);
         //Create a new tag which point to the exact location of the matched string.
@@ -204,7 +204,7 @@ void SAGroupParser::parseForScriptGroup(Node *node)
         {
           TQTag *qTag = new TQTag();
           // The location of the first open bracket '(', also the end of the tag name
-          int nameEnd = s.tqfind('(');
+          int nameEnd = s.find('(');
           qTag->setName(s.left(nameEnd));
           qTag->className = "";
           if (groupElement->parentNode)
@@ -225,18 +225,18 @@ void SAGroupParser::parseForScriptGroup(Node *node)
           {
             qTag->type="variable";
             // If this tag is a class function argument, it should not belong to the class, so we need to remove it
-            if(qTag->className.length() != 0 && tagStr.tqcontains('(') && tagStr.tqcontains(')'))
+            if(qTag->className.length() != 0 && tagStr.contains('(') && tagStr.contains(')'))
             {
             // First we want to determine the whole line the tag is on
               TQString tagWholeLineStr = tagStr;
             // Remove lines before target line
               while(tagWholeLineStr.length() > 0) // this stops infinit looping in case something goes wrong!
               {
-                int firstNewline = tagWholeLineStr.tqfind('\n');
+                int firstNewline = tagWholeLineStr.find('\n');
                 if(firstNewline == -1) //no new lines so we must be on the last
                   break; 
                 TQString checkLineStr = tagWholeLineStr.mid(firstNewline+1,tagWholeLineStr.length());
-                if(checkLineStr.tqcontains(s))
+                if(checkLineStr.contains(s))
                   tagWholeLineStr = checkLineStr;
                 else
                   break;
@@ -244,23 +244,23 @@ void SAGroupParser::parseForScriptGroup(Node *node)
             // Remove lines after target line - essentially same as above
               while(tagWholeLineStr.length() > 0)
               {
-                int lastNewLine = tagWholeLineStr.tqfindRev('\n');
+                int lastNewLine = tagWholeLineStr.findRev('\n');
                 if(lastNewLine == -1)
                   break;
                 TQString checkLineStr = tagWholeLineStr.mid(0,lastNewLine);
-                if(checkLineStr.tqcontains(s))
+                if(checkLineStr.contains(s))
                   tagWholeLineStr = checkLineStr;
                 else
                   break;
               }
             // Now we are left with the current line, lets check if the variable is inside parentheses
-              int lineOpenParenth=tagWholeLineStr.tqfind('(');
+              int lineOpenParenth=tagWholeLineStr.find('(');
               if(lineOpenParenth != -1)
               {
-                int lineCloseParenth=tagWholeLineStr.tqfind(')');
+                int lineCloseParenth=tagWholeLineStr.find(')');
                 if(lineCloseParenth != -1)
                 {
-                  int lineNameLocation=tagWholeLineStr.tqfind(s);
+                  int lineNameLocation=tagWholeLineStr.find(s);
                   if(lineNameLocation > lineOpenParenth || lineNameLocation < lineCloseParenth) // Write the current tag to the list
                     isArgument=true;
                 }
@@ -272,7 +272,7 @@ void SAGroupParser::parseForScriptGroup(Node *node)
             qTag->type="function";
           }
           if(!isArgument)
-            m_write->userTagList.tqreplace(s.lower(), qTag);
+            m_write->userTagList.replace(s.lower(), qTag);
         }