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

33 files changed, 244 insertions, 244 deletions

diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp
index d081ce0e..6dc6e4e7 100644
--- a/umbrello/umbrello/codegenerators/adawriter.cpp
+++ b/umbrello/umbrello/codegenerators/adawriter.cpp
@@ -124,7 +124,7 @@ void AdaWriter::computeAssocTypeAndRole(UMLClassifier *c,
         return;
     const TQString multi = a->getMulti(Uml::B);
     bool hasNonUnityMultiplicity = (!multi.isEmpty() && multi != "1");
-    hasNonUnityMultiplicity &= !multi.tqcontains(TQRegExp("^1 *\\.\\. *1$"));
+    hasNonUnityMultiplicity &= !multi.contains(TQRegExp("^1 *\\.\\. *1$"));
     roleName = cleanName(a->getRoleName(Uml::B));
     if (roleName.isEmpty())
         roleName = cleanName(a->getName());
@@ -154,7 +154,7 @@ void AdaWriter::writeClass(UMLClassifier *c) {
     const bool isClass = !c->isInterface();
     TQString classname = cleanName(c->getName());
     TQString fileName = packageName(c).lower();
-    fileName.tqreplace('.', '-');
+    fileName.replace('.', '-');
 
     //find an appropriate name for our file
     fileName = overwritableName(c, fileName, ".ads");
@@ -176,8 +176,8 @@ void AdaWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".ads");
     if (!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"), fileName);
-        str.tqreplace(TQRegExp("%filepath%"), file.name());
+        str.replace(TQRegExp("%filename%"), fileName);
+        str.replace(TQRegExp("%filepath%"), file.name());
         ada << str << endl;
     }
 
diff --git a/umbrello/umbrello/codegenerators/aswriter.cpp b/umbrello/umbrello/codegenerators/aswriter.cpp
index 20f9a4a4..e973a55e 100644
--- a/umbrello/umbrello/codegenerators/aswriter.cpp
+++ b/umbrello/umbrello/codegenerators/aswriter.cpp
@@ -67,8 +67,8 @@ void ASWriter::writeClass(UMLClassifier *c)
     str = getHeadingFile(".as");
     if(!str.isEmpty())
     {
-        str.tqreplace(TQRegExp("%filename%"),fileName+".as");
-        str.tqreplace(TQRegExp("%filepath%"),fileas.name());
+        str.replace(TQRegExp("%filename%"),fileName+".as");
+        str.replace(TQRegExp("%filepath%"),fileas.name());
         as << str << m_endl;
     }
 
diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
index 1e0bf353..bdba3604 100644
--- a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
@@ -65,7 +65,7 @@ TQString CPPCodeClassField::getFieldName() {
         UMLRole * role = (UMLRole*) getParentObject();
         TQString roleName = role->getName();
         if(fieldIsSingleValue()) {
-            return roleName.tqreplace(0, 1, roleName.left(1).lower());
+            return roleName.replace(0, 1, roleName.left(1).lower());
         } else {
             return roleName.lower() + "Vector";
         }
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
index 8fa473cb..d14d92b9 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
@@ -224,40 +224,40 @@ void CPPCodeGenerationPolicy::setVectorIncludeIsGlobal(bool value) {
 TQString CPPCodeGenerationPolicy::getVectorMethodAppend(const TQString & variableName, const TQString & itemClassName) {
     TQString value = m_vectorMethodAppendBase;
     if(!variableName.isEmpty())
-        value.tqreplace(TQRegExp("%VARNAME%"),variableName);
-    value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
+        value.replace(TQRegExp("%VARNAME%"),variableName);
+    value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
     if(!itemClassName.isEmpty())
-        value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName);
+        value.replace(TQRegExp("%ITEMCLASS%"),itemClassName);
     return value;
 }
 
 TQString CPPCodeGenerationPolicy::getVectorMethodRemove(const TQString & variableName, const TQString & itemClassName) {
     TQString value = m_vectorMethodRemoveBase;
     if(!variableName.isEmpty())
-        value.tqreplace(TQRegExp("%VARNAME%"),variableName);
-    value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
+        value.replace(TQRegExp("%VARNAME%"),variableName);
+    value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
     if(!itemClassName.isEmpty())
-        value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName);
+        value.replace(TQRegExp("%ITEMCLASS%"),itemClassName);
     return value;
 }
 
 TQString CPPCodeGenerationPolicy::getVectorMethodInit(const TQString & variableName, const TQString & itemClassName) {
     TQString value = m_vectorMethodInitBase;
     if(!variableName.isEmpty())
-        value.tqreplace(TQRegExp("%VARNAME%"),variableName);
-    value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
+        value.replace(TQRegExp("%VARNAME%"),variableName);
+    value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
     if(!itemClassName.isEmpty())
-        value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName);
+        value.replace(TQRegExp("%ITEMCLASS%"),itemClassName);
     return value;
 }
 
 TQString CPPCodeGenerationPolicy::getObjectMethodInit(const TQString & variableName, const TQString & itemClassName) {
     TQString value = m_objectMethodInitBase;
     if(!variableName.isEmpty())
-        value.tqreplace(TQRegExp("%VARNAME%"),variableName);
-    value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
+        value.replace(TQRegExp("%VARNAME%"),variableName);
+    value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName);
     if(!itemClassName.isEmpty())
-        value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName);
+        value.replace(TQRegExp("%ITEMCLASS%"),itemClassName);
     return value;
 }
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
index 1893ce65..b5571d02 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
@@ -95,7 +95,7 @@ bool CPPCodeGenerator::addHeaderCodeDocument ( CPPHeaderCodeDocument * doc )
         doc->setID(tag);
     }
 
-    if(m_codeDocumentDictionary.tqfind(tag))
+    if(m_codeDocumentDictionary.find(tag))
         return false; // return false, we already have some object with this tag in the list
     else
         m_codeDocumentDictionary.insert(tag, doc);
diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
index 1e1bab84..c725439f 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
@@ -412,7 +412,7 @@ void CPPHeaderCodeDocument::updateContent( )
 
     CodeGenerator::findObjectsRelated(c,includes);
     for(UMLPackage *con = includes.first(); con ; con = includes.next())
-        if (con->getBaseType() != Uml::ot_Datatype && !packageMap.tqcontains(con))
+        if (con->getBaseType() != Uml::ot_Datatype && !packageMap.contains(con))
         {
             packageMap.insert(con,con->getPackage());
             if(con != getParentClassifier())
diff --git a/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp b/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp
index 873cd8c8..ac926426 100644
--- a/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp
@@ -63,10 +63,10 @@ TQString CPPMakefileCodeDocument::getPath ( )
     path.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
-    path.tqreplace(TQRegExp(" "), "_");
+    path.replace(TQRegExp(" "), "_");
 
-    path.tqreplace(TQRegExp("\\."),"/");
-    path.tqreplace(TQRegExp("::"),"/");
+    path.replace(TQRegExp("\\."),"/");
+    path.replace(TQRegExp("::"),"/");
 
     path.lower();
 
diff --git a/umbrello/umbrello/codegenerators/cppwriter.cpp b/umbrello/umbrello/codegenerators/cppwriter.cpp
index 3f22a300..d58ceae4 100644
--- a/umbrello/umbrello/codegenerators/cppwriter.cpp
+++ b/umbrello/umbrello/codegenerators/cppwriter.cpp
@@ -113,7 +113,7 @@ void CppWriter::writeClass(UMLClassifier *c)
         need_impl = false;
     }
     if (need_impl) {
-        fileName.tqreplace( TQRegExp(".h$"), ".cpp");
+        fileName.replace( TQRegExp(".h$"), ".cpp");
         if( !openFile(filecpp, fileName)) {
             emit codeGenerated(c, false);
             return;
@@ -141,13 +141,13 @@ void CppWriter::writeHeaderFile (UMLClassifier *c, TQFile &fileh) {
     // write header blurb
     TQString str = getHeadingFile(".h");
     if(!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".h");
-        str.tqreplace(TQRegExp("%filepath%"),fileh.name());
+        str.replace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".h");
+        str.replace(TQRegExp("%filepath%"),fileh.name());
         h << str<< m_endl;
     }
 
     // Write the hash define stuff to prevent multiple parsing/inclusion of header
-    TQString hashDefine = m_classifierInfo->className.upper().simplifyWhiteSpace().tqreplace(TQRegExp(" "),  "_");
+    TQString hashDefine = m_classifierInfo->className.upper().simplifyWhiteSpace().replace(TQRegExp(" "),  "_");
     writeBlankLine(h);
     h << "#ifndef "<< hashDefine + "_H" << m_endl;
     h << "#define "<< hashDefine + "_H" << m_endl;
@@ -206,8 +206,8 @@ void CppWriter::writeSourceFile (UMLClassifier *c, TQFile &filecpp ) {
     TQString str;
     str = getHeadingFile(".cpp");
     if(!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".cpp");
-        str.tqreplace(TQRegExp("%filepath%"),filecpp.name());
+        str.replace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".cpp");
+        str.replace(TQRegExp("%filepath%"),filecpp.name());
         cpp << str << m_endl;
     }
 
@@ -627,7 +627,7 @@ void CppWriter::writeAttributeMethods(UMLAttributeList *attribs,
         // from what I can tell, this IS the default behavior for
         // cleanName. I dunno why its not working -b.t.
         methodBaseName = methodBaseName.stripWhiteSpace();
-        methodBaseName.tqreplace(0,1,methodBaseName.tqat(0).upper());
+        methodBaseName.replace(0,1,methodBaseName.tqat(0).upper());
 
         writeSingleAttributeAccessorMethods(at->getTypeName(), varName,
                                             methodBaseName, at->getDoc(), Uml::chg_Changeable, isHeaderMethod,
@@ -641,7 +641,7 @@ void CppWriter::writeComment(const TQString &comment, const TQString &myIndent,
     // in the case we have several line comment..
     // NOTE: this part of the method has the problem of adopting UNIX newline,
     // need to resolve for using with MAC/WinDoze eventually I assume
-    if (comment.tqcontains(TQRegExp("\n"))) {
+    if (comment.contains(TQRegExp("\n"))) {
 
         TQStringList lines = TQStringList::split( "\n", comment);
         for(uint i= 0; i < lines.count(); i++)
@@ -736,14 +736,14 @@ void CppWriter::writeAssociationRoleDecl(TQString fieldClassName, TQString roleN
     // 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 = "m_" + 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.
@@ -759,7 +759,7 @@ void CppWriter::writeAssociationRoleDecl(TQString fieldClassName, TQString roleN
 
         // 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);
 
         stream << indent << policyExt()->getVectorClassName() <<"<" << fieldClassName << "*";
@@ -823,7 +823,7 @@ void CppWriter::writeAssociationRoleMethod (const TQString &fieldClassName,
         const TQString &description, Uml::Changeability_Type change,
         TQTextStream &stream)
 {
-    if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$")))
+    if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$")))
     {
         TQString fieldVarName = "m_" + roleName.lower();
         writeSingleAttributeAccessorMethods(fieldClassName, fieldVarName, roleName,
@@ -860,9 +860,9 @@ void CppWriter::writeVectorAttributeAccessorMethods (
         stream << "add" << fldName << " ( " << className << " add_object )";
         if (writeMethodBody) {
             TQString method = VECTOR_METHOD_APPEND;
-            method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName);
-            method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
-            method.tqreplace(TQRegExp("%ITEMCLASS%"),className);
+            method.replace(TQRegExp("%VARNAME%"),fieldVarName);
+            method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
+            method.replace(TQRegExp("%ITEMCLASS%"),className);
             stream << indent << " {" << m_endl;
             m_indentLevel++;
             printTextAsSeparateLinesWithIndent(method,getIndent(),stream);
@@ -883,9 +883,9 @@ void CppWriter::writeVectorAttributeAccessorMethods (
         stream << "remove" << fldName << " ( " << className << " remove_object )";
         if (writeMethodBody) {
             TQString method = VECTOR_METHOD_REMOVE;
-            method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName);
-            method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
-            method.tqreplace(TQRegExp("%ITEMCLASS%"),className);
+            method.replace(TQRegExp("%VARNAME%"),fieldVarName);
+            method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
+            method.replace(TQRegExp("%ITEMCLASS%"),className);
             stream << indent << " {" << m_endl;
             m_indentLevel++;
             printTextAsSeparateLinesWithIndent(method,getIndent(),stream);
@@ -1034,8 +1034,8 @@ void CppWriter::writeInitAttibuteMethod (TQTextStream &stream)
         for( it = VectorFieldVariables.begin(); it != VectorFieldVariables.end(); ++it ) {
             TQString fieldVarName = *it;
             TQString method = VECTOR_METHOD_INIT;
-            method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName);
-            method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
+            method.replace(TQRegExp("%VARNAME%"),fieldVarName);
+            method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName());
             stream << getIndent() << method << m_endl;
         }
     }
@@ -1047,8 +1047,8 @@ void CppWriter::writeInitAttibuteMethod (TQTextStream &stream)
             it++;
             TQString fieldClassName = *it;
             TQString method = OBJECT_METHOD_INIT;
-            method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName);
-            method.tqreplace(TQRegExp("%ITEMCLASS%"),fieldClassName);
+            method.replace(TQRegExp("%VARNAME%"),fieldVarName);
+            method.replace(TQRegExp("%ITEMCLASS%"),fieldClassName);
             stream << getIndent() << method << m_endl;
         }
     }
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp
index 601ca84b..884661b5 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp
@@ -169,8 +169,8 @@ void CSharpWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".cs");
     if (!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"),fileName);
-        str.tqreplace(TQRegExp("%filepath%"),filecs.name());
+        str.replace(TQRegExp("%filename%"),fileName);
+        str.replace(TQRegExp("%filepath%"),filecs.name());
         cs<<str<<m_endl;
     }
 
@@ -199,7 +199,7 @@ void CSharpWriter::writeClass(UMLClassifier *c) {
             UMLClassifier *cl = dynamic_cast<UMLClassifier*>(p);
             if (cl)
                 p = cl->getUMLPackage();
-            if (p != logicalView && m_seenIncludes.tqfindRef(p) == -1 && p != container) {
+            if (p != logicalView && m_seenIncludes.findRef(p) == -1 && p != container) {
                 cs << "using " << p->getFullyQualifiedName(".") << ";" << m_endl;
                 m_seenIncludes.append(p);
             }
@@ -470,7 +470,7 @@ void CSharpWriter::writeOperations(UMLOperationList opList,
                 if (forceDoc() || !at->getDoc().isEmpty()) {
                     cs << m_container_indent << m_indentation << "/// <param name=\"" << cleanName(at->getName()) << "\">";
                     //removing newlines from parameter doc
-                    cs << formatDoc(at->getDoc(), "").tqreplace("\n", " ").remove('\r').tqreplace(TQRegExp(" $"), "");
+                    cs << formatDoc(at->getDoc(), "").replace("\n", " ").remove('\r').replace(TQRegExp(" $"), "");
                     cs << "</param>" << m_endl;
                 }
             }
@@ -693,7 +693,7 @@ void CSharpWriter::writeAttribute(TQString doc, Uml::Visibility visibility, bool
 
 TQString CSharpWriter::makeLocalTypeName(UMLClassifierListItem *cl) {
     UMLPackage *p = cl->getType()->getUMLPackage();
-    if (m_seenIncludes.tqfindRef(p) != -1) {
+    if (m_seenIncludes.findRef(p) != -1) {
         return cl->getType()->getName();
     }
     else {
diff --git a/umbrello/umbrello/codegenerators/dwriter.cpp b/umbrello/umbrello/codegenerators/dwriter.cpp
index 60bc2abb..088ab9c1 100644
--- a/umbrello/umbrello/codegenerators/dwriter.cpp
+++ b/umbrello/umbrello/codegenerators/dwriter.cpp
@@ -114,8 +114,8 @@ void DWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".d");
     if(!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"),fileName);
-        str.tqreplace(TQRegExp("%filepath%"),file.name());
+        str.replace(TQRegExp("%filename%"),fileName);
+        str.replace(TQRegExp("%filepath%"),file.name());
         d<<str<<m_endl;
     }
 
@@ -442,8 +442,8 @@ void DWriter::writeComment(const TQString &comment, const TQString &myIndent,
         TQString tmp = lines[i];
 
         while (tmp.length() > 77) {
-            uint l = tmp.left(77).tqfindRev(' ');
-            if (l < 1) l = tmp.tqfind(' ', 77);
+            uint l = tmp.left(77).findRev(' ');
+            if (l < 1) l = tmp.find(' ', 77);
             if (l < 1 || l > tmp.length()) {
                 d << myIndent << (dDocStyle ? " * " : "// ") << tmp << m_endl;
                 break;
@@ -527,7 +527,7 @@ void DWriter::writeAssociationRoleDecl(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]$"))) {
         d << m_indentation << fieldClassName << " ";
 
         if (hasAccessors) d << "m_";
@@ -584,7 +584,7 @@ void DWriter::writeAssociationMethods (UMLAssociationList associations, UMLClass
 void DWriter::writeAssociationRoleMethod (TQString fieldClassName, TQString roleName, TQString multi,
         TQString description, Uml::Visibility visib, Uml::Changeability_Type change,
         TQTextStream &d) {
-    if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) {
+    if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) {
         TQString fieldVarName = "m_" + deCapitaliseFirstLetter(roleName);
 
         writeSingleAttributeAccessorMethods(
@@ -942,7 +942,7 @@ TQString DWriter::getUMLObjectName(UMLObject *obj) {
 }
 
 TQString DWriter::deCapitaliseFirstLetter(TQString string) {
-    string.tqreplace( 0, 1, string[0].lower());
+    string.replace( 0, 1, string[0].lower());
     return string;
 }
 
diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp
index 8e5688ac..1d517fbb 100644
--- a/umbrello/umbrello/codegenerators/idlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/idlwriter.cpp
@@ -129,8 +129,8 @@ void IDLWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".idl");
     if (!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"), fileName);
-        str.tqreplace(TQRegExp("%filepath%"), file.name());
+        str.replace(TQRegExp("%filename%"), fileName);
+        str.replace(TQRegExp("%filepath%"), file.name());
         idl << str << m_endl;
     }
 
diff --git a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp
index 99f0d862..cc9e394b 100644
--- a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp
@@ -297,10 +297,10 @@ TQString JavaANTCodeDocument::getPath ( )
     path.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
-    path.tqreplace(TQRegExp(" "), "_");
+    path.replace(TQRegExp(" "), "_");
 
-    path.tqreplace(TQRegExp("\\."),"/");
-    path.tqreplace(TQRegExp("::"), "/");
+    path.replace(TQRegExp("\\."),"/");
+    path.replace(TQRegExp("::"), "/");
 
     path.lower();
 
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
index e386d01d..877111e1 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
@@ -89,10 +89,10 @@ TQString JavaClassifierCodeDocument::getPath ( )
     path.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
-    path.tqreplace(TQRegExp(" "), "_");
+    path.replace(TQRegExp(" "), "_");
 
-    path.tqreplace(TQRegExp("\\."),"/");
-    path.tqreplace(TQRegExp("::"), "/");
+    path.replace(TQRegExp("\\."),"/");
+    path.replace(TQRegExp("::"), "/");
 
     path.lower();
 
@@ -371,7 +371,7 @@ void JavaClassifierCodeDocument::updateContent( )
     // PACKAGE CODE BLOCK
     //
     TQString pkgs = getPackage();
-    pkgs.tqreplace(TQRegExp("::"), ".");
+    pkgs.replace(TQRegExp("::"), ".");
     TQString packageText = getPackage().isEmpty() ? "" : "package "+pkgs+';'+endLine;
     CodeBlockWithComments * pblock = addOrUpdateTaggedCodeBlockWithComments("packages", packageText, "", 0, false);
     if(packageText.isEmpty() && pblock->getContentType() == CodeBlock::AutoGenerated)
@@ -397,7 +397,7 @@ void JavaClassifierCodeDocument::updateContent( )
         // NO (default) datatypes in the import statement.. use defined
         // ones whould be possible, but no idea how to do that...at least for now.
         // Dynamic casting is slow..not an optimal way to do this.
-        if (!packageMap.tqcontains(con) && con->getBaseType() != Uml::ot_Datatype)
+        if (!packageMap.contains(con) && con->getBaseType() != Uml::ot_Datatype)
         {
             packageMap.insert(con, con->getPackage());
 
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
index 200594e9..c3ebb9e2 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
@@ -68,7 +68,7 @@ TQString JavaCodeClassField::getFieldName() {
         UMLRole * role = (UMLRole*) getParentObject();
         TQString roleName = role->getName();
         if(fieldIsSingleValue()) {
-            return roleName.tqreplace(0, 1, roleName.left(1).lower());
+            return roleName.replace(0, 1, roleName.left(1).lower());
         } else {
             return roleName.lower() + "Vector";
         }
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.cpp b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
index 12462784..d51a7b3c 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
@@ -115,7 +115,7 @@ TQString JavaCodeGenerator::getListFieldClassName () {
 // Same thing again for "bool" to "boolean"
 TQString JavaCodeGenerator::fixTypeName(const TQString &string)
 {
-    if (string.isEmpty() || string.tqcontains(TQRegExp("^\\s+$")))
+    if (string.isEmpty() || string.contains(TQRegExp("^\\s+$")))
         return "void";
     if (string == "string")
         return "String";
diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp
index 9c351555..19f3c1fd 100644
--- a/umbrello/umbrello/codegenerators/javawriter.cpp
+++ b/umbrello/umbrello/codegenerators/javawriter.cpp
@@ -137,8 +137,8 @@ void JavaWriter::writeClass(UMLClassifier *c)
     TQString str;
     str = getHeadingFile(".java");
     if(!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"),fileName);
-        str.tqreplace(TQRegExp("%filepath%"),file.name());
+        str.replace(TQRegExp("%filename%"),fileName);
+        str.replace(TQRegExp("%filepath%"),file.name());
         java<<str<<m_endl;
     }
 
@@ -408,7 +408,7 @@ void JavaWriter::writeAttributeMethods(UMLAttributeList &atpub, Uml::Visibility
         // from what I can tell, this IS the default behavior for
         // cleanName. I dunno why its not working -b.t.
         fieldName.stripWhiteSpace();
-        fieldName.tqreplace(0,1,fieldName.tqat(0).upper());
+        fieldName.replace(0,1,fieldName.tqat(0).upper());
 
         writeSingleAttributeAccessorMethods(at->getTypeName(),
                                             cleanName(at->getName()),
@@ -425,7 +425,7 @@ void JavaWriter::writeComment(const TQString &comment, const TQString &myIndent,
     // in the case we have several line comment..
     // NOTE: this part of the method has the problem of adopting UNIX newline,
     // need to resolve for using with MAC/WinDoze eventually I assume
-    if (comment.tqcontains(TQRegExp("\n"))) {
+    if (comment.contains(TQRegExp("\n"))) {
 
         if(javaDocStyle)
             java << myIndent << "/**" << m_endl;
@@ -530,9 +530,9 @@ void JavaWriter::writeAssociationRoleDecl(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 = "m_" + roleName.tqreplace(0, 1, roleName.left(1).lower());
+        TQString fieldVarName = "m_" + roleName.replace(0, 1, roleName.left(1).lower());
         java<<startline<<scope<<" "<<fieldClassName<<" "<<fieldVarName<<";";
     }
     else
@@ -589,9 +589,9 @@ void JavaWriter::writeAssociationRoleMethod (TQString fieldClassName, TQString r
         TQString description, Uml::Visibility visib, Uml::Changeability_Type change,
         TQTextStream &java)
 {
-    if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$")))
+    if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$")))
     {
-        TQString fieldVarName = "m_" + roleName.tqreplace(0, 1, roleName.left(1).lower());
+        TQString fieldVarName = "m_" + roleName.replace(0, 1, roleName.left(1).lower());
         writeSingleAttributeAccessorMethods(fieldClassName, fieldVarName, roleName,
                                             description, visib, change, false, java);
     }
diff --git a/umbrello/umbrello/codegenerators/jswriter.cpp b/umbrello/umbrello/codegenerators/jswriter.cpp
index b53cd9f6..ea4cc2e1 100644
--- a/umbrello/umbrello/codegenerators/jswriter.cpp
+++ b/umbrello/umbrello/codegenerators/jswriter.cpp
@@ -68,8 +68,8 @@ void JSWriter::writeClass(UMLClassifier *c)
     str = getHeadingFile(".js");
     if(!str.isEmpty())
     {
-        str.tqreplace(TQRegExp("%filename%"),fileName);
-        str.tqreplace(TQRegExp("%filepath%"),filejs.name());
+        str.replace(TQRegExp("%filename%"),fileName);
+        str.replace(TQRegExp("%filepath%"),filejs.name());
         js << str << m_endl;
     }
 
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp
index 2a42bef7..8d11b893 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp
@@ -129,7 +129,7 @@ void PascalWriter::writeClass(UMLClassifier *c) {
     const bool isClass = !c->isInterface();
     TQString classname = cleanName(c->getName());
     TQString fileName = qualifiedName(c).lower();
-    fileName.tqreplace('.', '-');
+    fileName.replace('.', '-');
 
     //find an appropriate name for our file
     fileName = overwritableName(c, fileName, ".pas");
@@ -151,8 +151,8 @@ void PascalWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".pas");
     if (!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"), fileName);
-        str.tqreplace(TQRegExp("%filepath%"), file.name());
+        str.replace(TQRegExp("%filename%"), fileName);
+        str.replace(TQRegExp("%filepath%"), file.name());
         pas << str << endl;
     }
 
@@ -434,7 +434,7 @@ const TQStringList PascalWriter::reservedKeywords() const {
         keywords.append( "class" );
         keywords.append( "const" );
         keywords.append( "constructor" );
-        keywords.append( "tqcontains" );
+        keywords.append( "contains" );
         keywords.append( "default" );
         keywords.append( "deprecated" );
         keywords.append( "destructor" );
diff --git a/umbrello/umbrello/codegenerators/perlwriter.cpp b/umbrello/umbrello/codegenerators/perlwriter.cpp
index 93195090..9d51ffde 100644
--- a/umbrello/umbrello/codegenerators/perlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/perlwriter.cpp
@@ -54,7 +54,7 @@ bool PerlWriter::GetUseStatements(UMLClassifier *c, TQString &Ret,
     TQString neatName = cleanName(conc->getName());
     if (neatName != AV && neatName != SV && neatName != HV) {
       TQString OtherPkgName =  conc->getPackage(".");
-      OtherPkgName.tqreplace(TQRegExp("\\."),"::");
+      OtherPkgName.replace(TQRegExp("\\."),"::");
       TQString OtherName = OtherPkgName + "::" + cleanName(conc->getName());
 
       // Only print out the use statement if the other package isn't the
@@ -75,7 +75,7 @@ bool PerlWriter::GetUseStatements(UMLClassifier *c, TQString &Ret,
     for (UMLClassifier *obj = superclasses.first();
          obj; obj = superclasses.next()) {
       TQString packageName =  obj->getPackage(".");
-      packageName.tqreplace(TQRegExp("\\."),"::");
+      packageName.replace(TQRegExp("\\."),"::");
 
       Ret += packageName + "::" + cleanName(obj->getName()) + ' ';
     }
@@ -100,11 +100,11 @@ void PerlWriter::writeClass(UMLClassifier *c) {
   packageName.simplifyWhiteSpace();
 
   // Replace all blanks with underscore
-  packageName.tqreplace(TQRegExp(" "), "_");
+  packageName.replace(TQRegExp(" "), "_");
 
   // Replace all dots (".") with double colon scope resolution operators
   // ("::")
-  packageName.tqreplace(TQRegExp("\\."),"::");
+  packageName.replace(TQRegExp("\\."),"::");
 
   // Store complete package name
   TQString ThisPkgName = packageName + "::" + classname;
@@ -118,7 +118,7 @@ void PerlWriter::writeClass(UMLClassifier *c) {
 
   CodeGenerationPolicy *pol = UMLApp::app()->getCommonPolicy();
   TQString curDir = pol->getOutputDirectory().absPath();
-  if (fileName.tqcontains("::")) {
+  if (fileName.contains("::")) {
     // create new directories for each level
     TQString newDir;
     newDir = curDir;
@@ -166,14 +166,14 @@ void PerlWriter::writeClass(UMLClassifier *c) {
 
   str = getHeadingFile(".pm");   // what this mean?
   if(!str.isEmpty()) {
-    str.tqreplace(TQRegExp("%filename%"),fileName);
-    str.tqreplace(TQRegExp("%filepath%"),fileperl.name());
-    str.tqreplace(TQRegExp("%year%"),TQDate::tqcurrentDate().toString("yyyy"));
-    str.tqreplace(TQRegExp("%date%"),TQDate::tqcurrentDate().toString());
-    str.tqreplace(TQRegExp("%time%"),TQTime::currentTime().toString());
-    str.tqreplace(TQRegExp("%package-name%"),ThisPkgName);
-    if(str.tqfind(TQRegExp("%PACKAGE-DECLARE%"))){
-      str.tqreplace(TQRegExp("%PACKAGE-DECLARE%"),
+    str.replace(TQRegExp("%filename%"),fileName);
+    str.replace(TQRegExp("%filepath%"),fileperl.name());
+    str.replace(TQRegExp("%year%"),TQDate::tqcurrentDate().toString("yyyy"));
+    str.replace(TQRegExp("%date%"),TQDate::tqcurrentDate().toString());
+    str.replace(TQRegExp("%time%"),TQTime::currentTime().toString());
+    str.replace(TQRegExp("%package-name%"),ThisPkgName);
+    if(str.find(TQRegExp("%PACKAGE-DECLARE%"))){
+      str.replace(TQRegExp("%PACKAGE-DECLARE%"),
                   "package " + ThisPkgName + ';'
                   + m_endl + m_endl
                   + "#UML_MODELER_BEGIN_PERSONAL_VARS_" + classname
@@ -184,10 +184,10 @@ void PerlWriter::writeClass(UMLClassifier *c) {
       bPackageDeclared = true;
     }
 
-    if(str.tqfind(TQRegExp("%USE-STATEMENTS%"))){
+    if(str.find(TQRegExp("%USE-STATEMENTS%"))){
       TQString UseStms;
       if(GetUseStatements(c,UseStms,ThisPkgName)){
-        str.tqreplace(TQRegExp("%USE-STATEMENTS%"), UseStms);
+        str.replace(TQRegExp("%USE-STATEMENTS%"), UseStms);
         bUseStmsWritten = true;
       }
     }
diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp
index c33ad3aa..e0fe4828 100644
--- a/umbrello/umbrello/codegenerators/php5writer.cpp
+++ b/umbrello/umbrello/codegenerators/php5writer.cpp
@@ -345,7 +345,7 @@ static const char *php5words[] =
         "dba_open",
         "dba_optimize",
         "dba_popen",
-        "dba_tqreplace",
+        "dba_replace",
         "dbase_add_record",
         "dbase_close",
         "dbase_create",
@@ -367,7 +367,7 @@ static const char *php5words[] =
         "dbminsert",
         "dbmnextkey",
         "dbmopen",
-        "dbmtqreplace",
+        "dbmreplace",
         "dbplus_add",
         "dbplus_aql",
         "dbplus_chdir",
@@ -375,7 +375,7 @@ static const char *php5words[] =
         "dbplus_curr",
         "dbplus_errcode",
         "dbplus_errno",
-        "dbplus_tqfind",
+        "dbplus_find",
         "dbplus_first",
         "dbplus_flush",
         "dbplus_freealllocks",
@@ -511,8 +511,8 @@ static const char *php5words[] =
         "E_PARSE",
         "ereg",
         "eregi",
-        "eregi_tqreplace",
-        "ereg_tqreplace",
+        "eregi_replace",
+        "ereg_replace",
         "error_log",
         "error_reporting",
         "escapeshellarg",
@@ -646,7 +646,7 @@ static const char *php5words[] =
         "_FILES",
         "filesize",
         "filetype",
-        "tqfind",
+        "find",
         "first_child",
         "floatval",
         "flock",
@@ -1293,7 +1293,7 @@ static const char *php5words[] =
         "ldap_mod_add",
         "ldap_mod_del",
         "ldap_modify",
-        "ldap_mod_tqreplace",
+        "ldap_mod_replace",
         "ldap_next_attribute",
         "ldap_next_entry",
         "ldap_next_reference",
@@ -1350,9 +1350,9 @@ static const char *php5words[] =
         "mb_encode_numericentity",
         "mb_ereg",
         "mb_eregi",
-        "mb_eregi_tqreplace",
+        "mb_eregi_replace",
         "mb_ereg_match",
-        "mb_ereg_tqreplace",
+        "mb_ereg_replace",
         "mb_ereg_search",
         "mb_ereg_search_getpos",
         "mb_ereg_search_getregs",
@@ -1565,7 +1565,7 @@ static const char *php5words[] =
         "msession_create",
         "msession_destroy",
         "msession_disconnect",
-        "msession_tqfind",
+        "msession_find",
         "msession_get",
         "msession_get_array",
         "msession_getdata",
@@ -2323,7 +2323,7 @@ static const char *php5words[] =
         "preg_match",
         "preg_match_all",
         "preg_quote",
-        "preg_tqreplace",
+        "preg_replace",
         "preg_replace_callback",
         "preg_split",
         "prev",
@@ -2424,7 +2424,7 @@ static const char *php5words[] =
         "remove_attribute",
         "remove_child",
         "rename",
-        "tqreplace",
+        "replace",
         "replace_child",
         "replace_node",
         "_REQUEST",
@@ -2661,7 +2661,7 @@ static const char *php5words[] =
         "strpos",
         "strrchr",
         "str_repeat",
-        "str_tqreplace",
+        "str_replace",
         "strrev",
         "str_rot13",
         "strrpos",
@@ -2677,7 +2677,7 @@ static const char *php5words[] =
         "str_word_count",
         "substr",
         "substr_count",
-        "substr_tqreplace",
+        "substr_replace",
         "SWFAction",
         "swf_actiongeturl",
         "swf_actiongotoframe",
@@ -2816,7 +2816,7 @@ static const char *php5words[] =
         "udm_crc32",
         "udm_errno",
         "udm_error",
-        "udm_tqfind",
+        "udm_find",
         "udm_free_agent",
         "udm_free_ispell_data",
         "udm_free_res",
@@ -3024,8 +3024,8 @@ void Php5Writer::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".php");
     if(!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"),fileName);
-        str.tqreplace(TQRegExp("%filepath%"),filephp.name());
+        str.replace(TQRegExp("%filename%"),fileName);
+        str.replace(TQRegExp("%filepath%"),filephp.name());
         php<<str<<m_endl;
     }
 
diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp
index b68417c7..b3c8a43e 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/phpwriter.cpp
@@ -343,7 +343,7 @@ static const char *words[] =
         "dba_open",
         "dba_optimize",
         "dba_popen",
-        "dba_tqreplace",
+        "dba_replace",
         "dbase_add_record",
         "dbase_close",
         "dbase_create",
@@ -365,7 +365,7 @@ static const char *words[] =
         "dbminsert",
         "dbmnextkey",
         "dbmopen",
-        "dbmtqreplace",
+        "dbmreplace",
         "dbplus_add",
         "dbplus_aql",
         "dbplus_chdir",
@@ -373,7 +373,7 @@ static const char *words[] =
         "dbplus_curr",
         "dbplus_errcode",
         "dbplus_errno",
-        "dbplus_tqfind",
+        "dbplus_find",
         "dbplus_first",
         "dbplus_flush",
         "dbplus_freealllocks",
@@ -509,8 +509,8 @@ static const char *words[] =
         "E_PARSE",
         "ereg",
         "eregi",
-        "eregi_tqreplace",
-        "ereg_tqreplace",
+        "eregi_replace",
+        "ereg_replace",
         "error_log",
         "error_reporting",
         "escapeshellarg",
@@ -644,7 +644,7 @@ static const char *words[] =
         "_FILES",
         "filesize",
         "filetype",
-        "tqfind",
+        "find",
         "first_child",
         "floatval",
         "flock",
@@ -1289,7 +1289,7 @@ static const char *words[] =
         "ldap_mod_add",
         "ldap_mod_del",
         "ldap_modify",
-        "ldap_mod_tqreplace",
+        "ldap_mod_replace",
         "ldap_next_attribute",
         "ldap_next_entry",
         "ldap_next_reference",
@@ -1346,9 +1346,9 @@ static const char *words[] =
         "mb_encode_numericentity",
         "mb_ereg",
         "mb_eregi",
-        "mb_eregi_tqreplace",
+        "mb_eregi_replace",
         "mb_ereg_match",
-        "mb_ereg_tqreplace",
+        "mb_ereg_replace",
         "mb_ereg_search",
         "mb_ereg_search_getpos",
         "mb_ereg_search_getregs",
@@ -1561,7 +1561,7 @@ static const char *words[] =
         "msession_create",
         "msession_destroy",
         "msession_disconnect",
-        "msession_tqfind",
+        "msession_find",
         "msession_get",
         "msession_get_array",
         "msession_getdata",
@@ -2319,7 +2319,7 @@ static const char *words[] =
         "preg_match",
         "preg_match_all",
         "preg_quote",
-        "preg_tqreplace",
+        "preg_replace",
         "preg_replace_callback",
         "preg_split",
         "prev",
@@ -2420,7 +2420,7 @@ static const char *words[] =
         "remove_attribute",
         "remove_child",
         "rename",
-        "tqreplace",
+        "replace",
         "replace_child",
         "replace_node",
         "_REQUEST",
@@ -2657,7 +2657,7 @@ static const char *words[] =
         "strpos",
         "strrchr",
         "str_repeat",
-        "str_tqreplace",
+        "str_replace",
         "strrev",
         "str_rot13",
         "strrpos",
@@ -2673,7 +2673,7 @@ static const char *words[] =
         "str_word_count",
         "substr",
         "substr_count",
-        "substr_tqreplace",
+        "substr_replace",
         "SWFAction",
         "swf_actiongeturl",
         "swf_actiongotoframe",
@@ -2812,7 +2812,7 @@ static const char *words[] =
         "udm_crc32",
         "udm_errno",
         "udm_error",
-        "udm_tqfind",
+        "udm_find",
         "udm_free_agent",
         "udm_free_ispell_data",
         "udm_free_res",
@@ -3020,8 +3020,8 @@ void PhpWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".php");
     if(!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"),fileName);
-        str.tqreplace(TQRegExp("%filepath%"),filephp.name());
+        str.replace(TQRegExp("%filename%"),fileName);
+        str.replace(TQRegExp("%filepath%"),filephp.name());
         php<<str<<m_endl;
     }
 
diff --git a/umbrello/umbrello/codegenerators/pythonwriter.cpp b/umbrello/umbrello/codegenerators/pythonwriter.cpp
index ba1a636e..8c913022 100644
--- a/umbrello/umbrello/codegenerators/pythonwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pythonwriter.cpp
@@ -64,7 +64,7 @@ void PythonWriter::writeClass(UMLClassifier *c) {
     //Replace the first letter of the filename because
     //python class begin with an upper caracter (convention)
     first = first.upper();
-    fileName = fileName.tqreplace(0, 1, first);
+    fileName = fileName.replace(0, 1, first);
 
     TQFile fileh;
     if( !openFile(fileh, fileName) ) {
@@ -83,8 +83,8 @@ void PythonWriter::writeClass(UMLClassifier *c) {
 
     str = getHeadingFile(".py");
     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;
     }
 
@@ -115,9 +115,9 @@ void PythonWriter::writeClass(UMLClassifier *c) {
             headerName.remove(TQRegExp(".py$"));
             first = headerName.at(0);
             first = first.upper();
-            headerName = headerName.tqreplace(0, 1, first);
-            str = headerName.tqreplace(TQChar('/'),TQChar('.'));
-            if (includesList.tqfindIndex(str) < 0)  // not yet imported
+            headerName = headerName.replace(0, 1, first);
+            str = headerName.replace(TQChar('/'),TQChar('.'));
+            if (includesList.findIndex(str) < 0)  // not yet imported
                 h << "from " << str << " import *" << m_endl;
         }
     }
diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp
index 89eb8bd2..f75ff165 100644
--- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp
@@ -79,10 +79,10 @@ void RubyClassDeclarationBlock::updateContent ( )
 
     // COMMENT
     TQString comment = c->getDoc();
-    comment.tqreplace("@ref ", "");
-    comment.tqreplace("@see", "_See_");
-    comment.tqreplace("@short", "_Summary_");
-    comment.tqreplace("@author", "_Author_");
+    comment.replace("@ref ", "");
+    comment.replace("@see", "_See_");
+    comment.replace("@short", "_Summary_");
+    comment.replace("@author", "_Author_");
 
     if (isInterface)
         getComment()->setText("Module " + RubyClassName + endLine + comment);
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
index b1a60755..6f5b881d 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
@@ -86,10 +86,10 @@ TQString RubyClassifierCodeDocument::getPath ( )
     path.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
-    path.tqreplace(TQRegExp(" "), "_");
+    path.replace(TQRegExp(" "), "_");
 
-    path.tqreplace(TQRegExp("\\."),"/");
-    path.tqreplace(TQRegExp("::"), "/");
+    path.replace(TQRegExp("\\."),"/");
+    path.replace(TQRegExp("::"), "/");
 
     path.lower();
 
diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
index 14d7ce70..a3f4d26f 100644
--- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
@@ -153,9 +153,9 @@ void RubyCodeAccessorMethod::updateMethodDeclaration()
     TQString endLine = p->getNewLineEndingChars();
 
     TQString description = getParentObject()->getDoc();
-    description.tqreplace(TQRegExp("m_[npb](?=[A-Z])"), "");
-    description.tqreplace("m_", "");
-    description.tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine);
+    description.replace(TQRegExp("m_[npb](?=[A-Z])"), "");
+    description.replace("m_", "");
+    description.replace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine);
 
     // set scope of this accessor appropriately..if its an attribute,
     // we need to be more sophisticated
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
index 4d24552a..793db6ed 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
@@ -70,7 +70,7 @@ TQString RubyCodeClassField::getFieldName() {
         UMLRole * role = (UMLRole*) getParentObject();
         TQString roleName = role->getName();
         if(fieldIsSingleValue()) {
-            return roleName.tqreplace(0, 1, roleName.left(1).lower());
+            return roleName.replace(0, 1, roleName.left(1).lower());
         } else {
             return roleName.lower() + "Array";
         }
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
index e0732773..65b2af15 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
@@ -90,25 +90,25 @@ TQString RubyCodeGenerator::getListFieldClassName () {
 
 TQString RubyCodeGenerator::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(TQRegExp("^string$"),"String");
-    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(TQRegExp("^string$"),"String");
+    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 RubyCodeGenerator::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;
 }
diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
index caed59d8..5a360838 100644
--- a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
@@ -85,7 +85,7 @@ void RubyCodeOperation::updateMethodDeclaration()
         methodName = "initialize";
     }
 
-    methodName.tqreplace(TQRegExp("operator\\s*"), "");
+    methodName.replace(TQRegExp("operator\\s*"), "");
     methodName = methodName.mid(0, 1).lower() + methodName.mid(1);
 
     TQString paramStr = TQString("");
@@ -131,7 +131,7 @@ void RubyCodeOperation::updateMethodDeclaration()
             UMLAttributeList parameters = o->getParmList();
             for(UMLAttributeListIt iterator(parameters); iterator.current(); ++iterator) {
                 comment += endLine + "* _" + iterator.current()->getName() + "_ ";
-                comment += (' ' + iterator.current()->getDoc().tqreplace( TQRegExp("[\\n\\r]+[\\t ]*"),
+                comment += (' ' + iterator.current()->getDoc().replace( TQRegExp("[\\n\\r]+[\\t ]*"),
                                                                         endLine + "  " ) );
             }
             // add a returns statement too
@@ -140,15 +140,15 @@ void RubyCodeOperation::updateMethodDeclaration()
             getComment()->setText(comment);
         }
     } else {
-        comment.tqreplace(TQRegExp("[\\n\\r]+ *"), endLine);
-        comment.tqreplace(TQRegExp("[\\n\\r]+\\t*"), endLine);
+        comment.replace(TQRegExp("[\\n\\r]+ *"), endLine);
+        comment.replace(TQRegExp("[\\n\\r]+\\t*"), endLine);
 
-        comment.tqreplace(" m_", " ");
-        comment.tqreplace(TQRegExp("\\s[npb](?=[A-Z])"), " ");
+        comment.replace(" m_", " ");
+        comment.replace(TQRegExp("\\s[npb](?=[A-Z])"), " ");
         TQRegExp re_params("@param (\\w)(\\w*)");
         int pos = re_params.search(comment);
         while (pos != -1) {
-            comment.tqreplace( re_params.cap(0),
+            comment.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));
 
@@ -160,28 +160,28 @@ void RubyCodeOperation::updateMethodDeclaration()
         for (UMLAttributeListIt iterator(parameters); iterator.current(); ++iterator) {
             // Only write an individual @param entry if one hasn't been found already
             // in the main doc comment
-            if (commentedParams.tqcontains(RubyCodeGenerator::cppToRubyName(iterator.current()->getName())) == 0) {
+            if (commentedParams.contains(RubyCodeGenerator::cppToRubyName(iterator.current()->getName())) == 0) {
                 comment += (endLine + "@param _" + RubyCodeGenerator::cppToRubyName(iterator.current()->getName()) + '_');
                 if (iterator.current()->getDoc().isEmpty()) {
                     comment += (' ' + RubyCodeGenerator::cppToRubyType(iterator.current()->getTypeName()));
                 } else {
-                    comment += (' ' + iterator.current()->getDoc().tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine + "  "));
+                    comment += (' ' + iterator.current()->getDoc().replace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine + "  "));
                 }
             }
         }
 
-        comment.tqreplace("@ref ", "");
-        comment.tqreplace("@param", "*");
-        comment.tqreplace("@return", "* _returns_");
+        comment.replace("@ref ", "");
+        comment.replace("@param", "*");
+        comment.replace("@return", "* _returns_");
 
         // All lines after the first one starting with '*' in the doc comment
         // must be indented correctly. If they aren't a list
         // item starting with '*', then indent the text with
         // two spaces, '  ', to line up with the list item.
-        pos = comment.tqfind(endLine + '*');
+        pos = comment.find(endLine + '*');
         if (pos != -1) {
             pos += endLine.length() + 1;
-            pos = comment.tqfind(endLine, pos);
+            pos = comment.find(endLine, pos);
         }
 
         while (pos > 0) {
@@ -191,13 +191,13 @@ void RubyCodeOperation::updateMethodDeclaration()
                 pos += 2;
             }
 
-            pos = comment.tqfind(endLine, pos);
+            pos = comment.find(endLine, pos);
         }
 
         TQString typeStr = RubyCodeGenerator::cppToRubyType(o->getTypeName());
         if ( !typeStr.isEmpty()
                 && !TQRegExp("^void\\s*$").exactMatch(typeStr)
-                && comment.tqcontains("_returns_") == 0 )
+                && comment.contains("_returns_") == 0 )
         {
             comment += endLine + "* _returns_ " + typeStr;
         }
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;
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
index ca118eb2..a3bb17df 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
@@ -77,7 +77,7 @@ TQString SimpleCodeGenerator::getIndent ()
 TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString &ext) {
 
     //if we already know to which file this class was written/should be written, just return it.
-    if (m_fileMap.tqcontains(concept))
+    if (m_fileMap.contains(concept))
         return m_fileMap[concept];
 
     //else, determine the "natural" file name
@@ -89,16 +89,16 @@ TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString &
     package.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
-    package.tqreplace(TQRegExp(" "), "_");
+    package.replace(TQRegExp(" "), "_");
 
     // Convert all "::" to "/" : Platform-specific path separator
-    // package.tqreplace(TQRegExp("::"), "/");
+    // package.replace(TQRegExp("::"), "/");
 
     // if package is given add this as a directory to the file name
     if (!package.isEmpty() && m_createDirHierarchyForPackages) {
         name = package + '.' + concept->getName();
-        name.tqreplace(TQRegExp("\\."),"/");
-        package.tqreplace(TQRegExp("\\."), "/");
+        name.replace(TQRegExp("\\."),"/");
+        package.replace(TQRegExp("\\."), "/");
         package = '/' + package;
     } else {
         name = concept->getFullyQualifiedName("-");
@@ -136,10 +136,10 @@ TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString &
 
 
     name.simplifyWhiteSpace();
-    name.tqreplace(TQRegExp(" "),"_");
+    name.replace(TQRegExp(" "),"_");
 
     TQString extension = ext.simplifyWhiteSpace();
-    extension.tqreplace(' ', '_');
+    extension.replace(' ', '_');
 
     return overwritableName(concept, name, extension);
 }
diff --git a/umbrello/umbrello/codegenerators/sqlwriter.cpp b/umbrello/umbrello/codegenerators/sqlwriter.cpp
index 214af4ad..8582ec93 100644
--- a/umbrello/umbrello/codegenerators/sqlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/sqlwriter.cpp
@@ -65,8 +65,8 @@ void SQLWriter::writeClass(UMLClassifier *c) {
     TQString str;
     str = getHeadingFile(".sql");
     if(!str.isEmpty()) {
-        str.tqreplace(TQRegExp("%filename%"),fileName);
-        str.tqreplace(TQRegExp("%filepath%"),file.name());
+        str.replace(TQRegExp("%filename%"),fileName);
+        str.replace(TQRegExp("%filepath%"),file.name());
         sql<<str<<m_endl;
     }
 
@@ -140,7 +140,7 @@ void SQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) {
     }
 
     // now print the attributes; they are sorted by there scope
-    // in front of the first attribute shouldn't be a , -> so we need to tqfind
+    // in front of the first attribute shouldn't be a , -> so we need to find
     // out, when the first attribute was added
     bool first = true;
 
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 + " {} {");
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
index 00753349..39b530bb 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
@@ -87,8 +87,8 @@ void XMLSchemaWriter::writeClass(UMLClassifier *c)
     // 1. create the header
     TQString headerText = getHeadingFile(".xsd");
     if(!headerText.isEmpty()) {
-        headerText.tqreplace(TQRegExp("%filename%"),fileName);
-        headerText.tqreplace(TQRegExp("%filepath%"),file.name());
+        headerText.replace(TQRegExp("%filename%"),fileName);
+        headerText.replace(TQRegExp("%filepath%"),file.name());
     }
     if(!headerText.isEmpty())
         XMLschema<<headerText<<m_endl;
@@ -445,7 +445,7 @@ void XMLSchemaWriter::writeChildObjsInAssociation (UMLClassifier *c,
 }
 
 bool XMLSchemaWriter::hasBeenWritten(UMLClassifier *c) {
-    if (writtenClassifiers.tqcontains(c))
+    if (writtenClassifiers.contains(c))
         return true;
     else
         return false;
@@ -529,7 +529,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc
     // need to resolve for using with MAC/WinDoze eventually I assume
     TQString indent = getIndent();
     XMLschema<<indent<<"<!-- ";
-    if (comment.tqcontains(TQRegExp("\n"))) {
+    if (comment.contains(TQRegExp("\n"))) {
         XMLschema<<m_endl;
         TQStringList lines = TQStringList::split( "\n", comment);
         for(uint i= 0; i < lines.count(); i++)
@@ -673,10 +673,10 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString
         {
             // populate both with the actual value as long as our value isnt an asterix
             // In that case, use special value (from above)
-            if(values[0].tqcontains(TQRegExp("\\d{1,}")))
+            if(values[0].contains(TQRegExp("\\d{1,}")))
                 minOccurs = values[0]; // use first number in sequence
 
-            if(values[values.count()-1].tqcontains(TQRegExp("\\d{1,}")))
+            if(values[values.count()-1].contains(TQRegExp("\\d{1,}")))
                 maxOccurs = values[values.count()-1]; // use only last number in sequence
         }
     }
@@ -736,8 +736,8 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString
 // Same thing again for "bool" to "boolean"
 TQString XMLSchemaWriter::fixTypeName(const TQString& string)
 {
-    //  string.tqreplace(TQRegExp("^string$"),schemaNamespaceTag+":string");
-    //  string.tqreplace(TQRegExp("^bool$"),schemaNamespaceTag+":boolean");
+    //  string.replace(TQRegExp("^string$"),schemaNamespaceTag+":string");
+    //  string.replace(TQRegExp("^bool$"),schemaNamespaceTag+":boolean");
     return schemaNamespaceTag + ':' + string;
 }