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

diff --git a/umbrello/umbrello/codegenerators/tclwriter.cpp b/umbrello/umbrello/codegenerators/tclwriter.cpp
index 913211c4..6d40b4b0 100644
--- a/umbrello/umbrello/codegenerators/tclwriter.cpp
+++ b/umbrello/umbrello/codegenerators/tclwriter.cpp
@@ -58,7 +58,7 @@ static const char *tclwords[] = {
                                  "llength",
                                  "load",
                                  "lrange",
-                                 "ltqreplace",
+                                 "lreplace",
                                  "method",
                                  "namespace",
                                  "private",
@@ -165,8 +165,8 @@ TclWriter::writeHeaderFile(UMLClassifier * c, TQFile & fileh)
     // write header blurb
     TQString         str = getHeadingFile(".tcl");
     if (!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"), classifierInfo->fileName);
-        str.tqreplace(TQRegExp("%filepath%"), fileh.name());
+        str.replace(TQRegExp("%filename%"), classifierInfo->fileName);
+        str.replace(TQRegExp("%filepath%"), fileh.name());
         writeCode(str);
     }
     // set current namespace
@@ -337,8 +337,8 @@ TclWriter::writeSourceFile(UMLClassifier * c, TQFile & filetcl)
     TQString         str;
     str = getHeadingFile(".tclbody");
     if (!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"), classifierInfo->fileName + "body");
-        str.tqreplace(TQRegExp("%filepath%"), filetcl.name());
+        str.replace(TQRegExp("%filename%"), classifierInfo->fileName + "body");
+        str.replace(TQRegExp("%filepath%"), filetcl.name());
         writeCode(str);
     }
     // Start body of class
@@ -599,13 +599,13 @@ TclWriter::writeAssociationRoleDecl(const TQString &fieldClassName, const TQStri
     // declare the association based on whether it is this a single variable
     // or a List (Vector). One day this will be done correctly with special
     // multiplicity object that we don't have to figure out what it means via regex.
-    if (multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) {
+    if (multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) {
         TQString         fieldVarName = roleName.lower();
 
         // record this for later consideration of initialization IF the
         // multi value requires 1 of these objects
-        if (ObjectFieldVariables.tqfindIndex(fieldVarName) == -1 &&
-                multi.tqcontains(TQRegExp("^1$"))
+        if (ObjectFieldVariables.findIndex(fieldVarName) == -1 &&
+                multi.contains(TQRegExp("^1$"))
            ) {
             // ugh. UGLY. Storing variable name and its class in pairs.
             ObjectFieldVariables.append(fieldVarName);
@@ -619,7 +619,7 @@ TclWriter::writeAssociationRoleDecl(const TQString &fieldClassName, const TQStri
 
         // record unique occurrences for later when we want to check
         // for initialization of this vector
-        if (VectorFieldVariables.tqfindIndex(fieldVarName) == -1)
+        if (VectorFieldVariables.findIndex(fieldVarName) == -1)
             VectorFieldVariables.append(fieldVarName);
         writeDocu(m_endl + "@var" + scope + " variable <" + fieldClassName +
                   "*> " + fieldVarName + m_endl + doc);
@@ -888,7 +888,7 @@ TclWriter::writeAssociationRoleSource(const TQString &fieldClassName,
     // declare the association based on whether it is this a single variable
     // or a List (Vector). One day this will be done correctly with special
     // multiplicity object that we don't have to figure out what it means via regex.
-    if (multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) {
+    if (multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) {
         TQString         fieldVarName = roleName.lower();
 
         writeCode("configbody " + mClassGlobal + "::" + fieldVarName + " {} {");