rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

1 files changed, 36 insertions, 36 deletions

diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp
index 5b193220..e736641f 100644
--- a/umbrello/umbrello/codegenerators/rubywriter.cpp
+++ b/umbrello/umbrello/codegenerators/rubywriter.cpp
@@ -80,18 +80,18 @@ void RubyWriter::writeClass(UMLClassifier *c) {
 
     str = getHeadingFile(".rb");
     if(!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"), fileName);
-        str.tqreplace(TQRegExp("%filepath%"), fileh.name());
+        str.replace(TQRegExp("%filename%"), fileName);
+        str.replace(TQRegExp("%filepath%"), fileh.name());
         h<<str<<m_endl;
     }
 
     if(forceDoc() || !c->getDoc().isEmpty()) {
         TQString docStr = c->getDoc();
-        docStr.tqreplace(TQRegExp("\\n"), "\n# ");
-        docStr.tqreplace("@ref ", "");
-        docStr.tqreplace("@see", "_See_");
-        docStr.tqreplace("@short", "_Summary_");
-        docStr.tqreplace("@author", "_Author_");
+        docStr.replace(TQRegExp("\\n"), "\n# ");
+        docStr.replace("@ref ", "");
+        docStr.replace("@see", "_See_");
+        docStr.replace("@short", "_Summary_");
+        docStr.replace("@author", "_Author_");
         h<<"#"<<m_endl;
         h<<"# "<<docStr<<m_endl;
         h<<"#"<<m_endl<<m_endl;
@@ -146,24 +146,24 @@ void RubyWriter::writeClass(UMLClassifier *c) {
 
 TQString RubyWriter::cppToRubyType(const TQString &typeStr) {
     TQString type = cleanName(typeStr);
-    type.tqreplace("const ", "");
-    type.tqreplace(TQRegExp("[*&\\s]"), "");
-    type.tqreplace(TQRegExp("[<>]"), "_");
-    type.tqreplace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array");
-    type.tqreplace(TQSTRING_OBJECT_NAME_STRING, "String");
-    type.tqreplace("bool", "true|false");
-    type.tqreplace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer");
-    type.tqreplace(TQRegExp("^(float|double)$"), "Float");
-    type.tqreplace(TQRegExp("^Q(?=[A-Z])"), "TQt::");
-    type.tqreplace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::");
+    type.replace("const ", "");
+    type.replace(TQRegExp("[*&\\s]"), "");
+    type.replace(TQRegExp("[<>]"), "_");
+    type.replace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array");
+    type.replace(TQSTRING_OBJECT_NAME_STRING, "String");
+    type.replace("bool", "true|false");
+    type.replace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer");
+    type.replace(TQRegExp("^(float|double)$"), "Float");
+    type.replace(TQRegExp("^Q(?=[A-Z])"), "TQt::");
+    type.replace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::");
 
     return type;
 }
 
 TQString RubyWriter::cppToRubyName(const TQString &nameStr) {
     TQString name = cleanName(nameStr);
-    name.tqreplace(TQRegExp("^m_"), "");
-    name.tqreplace(TQRegExp("^[pbn](?=[A-Z])"), "");
+    name.replace(TQRegExp("^m_"), "");
+    name.replace(TQRegExp("^[pbn](?=[A-Z])"), "");
     name = name.mid(0, 1).lower() + name.mid(1);
     return name;
 }
@@ -251,7 +251,7 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op
             methodName = "initialize";
         }
 
-        methodName.tqreplace("operator ", "");
+        methodName.replace("operator ", "");
         methodName = methodName.mid(0, 1).lower() + methodName.mid(1);
 
         UMLAttributeList atl = op->getParmList();
@@ -267,15 +267,15 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op
             h << m_indentation << "#" << m_endl;
             TQString docStr = op->getDoc();
 
-            docStr.tqreplace(TQRegExp("[\\n\\r]+ *"), m_endl);
-            docStr.tqreplace(TQRegExp("[\\n\\r]+\\t*"), m_endl);
+            docStr.replace(TQRegExp("[\\n\\r]+ *"), m_endl);
+            docStr.replace(TQRegExp("[\\n\\r]+\\t*"), m_endl);
 
-            docStr.tqreplace(" m_", " ");
-            docStr.tqreplace(TQRegExp("\\s[npb](?=[A-Z])"), " ");
+            docStr.replace(" m_", " ");
+            docStr.replace(TQRegExp("\\s[npb](?=[A-Z])"), " ");
             TQRegExp re_params("@param (\\w)(\\w*)");
             int pos = re_params.search(docStr);
             while (pos != -1) {
-                docStr.tqreplace( re_params.cap(0),
+                docStr.replace( re_params.cap(0),
                                 TQString("@param _") + re_params.cap(1).lower() + re_params.cap(2) + '_' );
                 commentedParams.append(re_params.cap(1).lower() + re_params.cap(2));
 
@@ -283,31 +283,31 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op
                 pos = re_params.search(docStr, pos);
             }
 
-            docStr.tqreplace("\n", TQString("\n") + m_indentation + "# ");
+            docStr.replace("\n", TQString("\n") + m_indentation + "# ");
 
             // Write parameter documentation
             for (at = atl.first(); at ; at = atl.next()) {
                 // Only write an individual @param entry if one hasn't been found already
                 // in the main doc comment
-                if (commentedParams.tqcontains(cppToRubyName(at->getName())) == 0) {
+                if (commentedParams.contains(cppToRubyName(at->getName())) == 0) {
                     docStr += (m_endl + m_indentation + "# @param _" + cppToRubyName(at->getName()) + '_');
                     if (at->getDoc().isEmpty()) {
                         docStr += (' ' + cppToRubyType(at->getTypeName()));
                     } else {
-                        docStr += (' ' + at->getDoc().tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), m_endl + "   "));
+                        docStr += (' ' + at->getDoc().replace(TQRegExp("[\\n\\r]+[\\t ]*"), m_endl + "   "));
                     }
                 }
             }
 
-            docStr.tqreplace("@ref ", "");
-            docStr.tqreplace("@param", "*");
-            docStr.tqreplace("@return", "* _returns_");
+            docStr.replace("@ref ", "");
+            docStr.replace("@param", "*");
+            docStr.replace("@return", "* _returns_");
 
             // All lines after the first '# *' in the doc comment
             // must be indented correctly. If they aren't a list
             // item starting with '# *', then indent the text with
             // three spaces, '#   ', to line up with the list item.
-            pos = docStr.tqfind("# *");
+            pos = docStr.find("# *");
             TQRegExp re_linestart("# (?!\\*)");
             pos = re_linestart.search(docStr, pos);
             while (pos > 0) {
@@ -320,7 +320,7 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op
             h << m_indentation << "# "<< docStr << m_endl;
 
             TQString typeStr = cppToRubyType(op->getTypeName());
-            if (!typeStr.isEmpty() && typeStr != "void" && docStr.tqcontains("_returns_") == 0) {
+            if (!typeStr.isEmpty() && typeStr != "void" && docStr.contains("_returns_") == 0) {
                 h << m_indentation << "# * _returns_ " << typeStr << m_endl;
             }
         }
@@ -375,9 +375,9 @@ void RubyWriter::writeSingleAttributeAccessorMethods(
         TQTextStream &h)
 {
     TQString description = descr;
-    description.tqreplace(TQRegExp("m_[npb](?=[A-Z])"), "");
-    description.tqreplace("m_", "");
-    description.tqreplace("\n", TQString("\n") + m_indentation + "# ");
+    description.replace(TQRegExp("m_[npb](?=[A-Z])"), "");
+    description.replace("m_", "");
+    description.replace("\n", TQString("\n") + m_indentation + "# ");
 
     if (!description.isEmpty()) {
         h << m_indentation << "# " << description << m_endl;