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

19 files changed, 73 insertions, 73 deletions

diff --git a/umbrello/umbrello/codeimport/adaimport.cpp b/umbrello/umbrello/codeimport/adaimport.cpp
index 05dc2f68..c568cf3f 100644
--- a/umbrello/umbrello/codeimport/adaimport.cpp
+++ b/umbrello/umbrello/codeimport/adaimport.cpp
@@ -132,7 +132,7 @@ TQString AdaImport::expand(const TQString& name) {
         return name;
     TQString result = name;
     TQString pfx = pfxRegExp.cap(1);
-    if (m_renaming.tqcontains(pfx)) {
+    if (m_renaming.contains(pfx)) {
         result.remove(pfxRegExp);
         result.prepend(m_renaming[pfx] + '.');
     }
@@ -146,7 +146,7 @@ void AdaImport::parseStems(const TQStringList& stems) {
     uint i = 0;
     while (1) {
         TQString filename = base + ".ads";
-        if (! m_parsedFiles.tqcontains(filename)) {
+        if (! m_parsedFiles.contains(filename)) {
             // Save current m_source and m_srcIndex.
             TQStringList source(m_source);
             uint srcIndex = m_srcIndex;
@@ -332,7 +332,7 @@ bool AdaImport::parseStmt() {
             }
             m_isAbstract = false;
             if (isTaggedType) {
-                if (! m_classesDefinedInThisScope.tqcontains(ns))
+                if (! m_classesDefinedInThisScope.contains(ns))
                     m_classesDefinedInThisScope.append(ns);
             } else {
                 ns->setStereotype("record");
@@ -478,7 +478,7 @@ bool AdaImport::parseStmt() {
                 Uml::Object_Type t = type->getBaseType();
                 if ((t != Uml::ot_Interface &&
                      (t != Uml::ot_Class || type->getStereotype() == "record")) ||
-                    !m_classesDefinedInThisScope.tqcontains(type)) {
+                    !m_classesDefinedInThisScope.contains(type)) {
                     // Not an instance bound method - we cannot represent it.
                     skipStmt(")");
                     break;
diff --git a/umbrello/umbrello/codeimport/classimport.cpp b/umbrello/umbrello/codeimport/classimport.cpp
index 9a7cbae9..469e4030 100644
--- a/umbrello/umbrello/codeimport/classimport.cpp
+++ b/umbrello/umbrello/codeimport/classimport.cpp
@@ -47,7 +47,7 @@ ClassImport *ClassImport::createImporterByFileExt(const TQString &filename) {
         classImporter = new PythonImport();
     else if (filename.endsWith(".java"))
         classImporter = new JavaImport();
-    else if (filename.tqcontains( TQRegExp("\\.ad[sba]$") ))
+    else if (filename.contains( TQRegExp("\\.ad[sba]$") ))
         classImporter = new AdaImport();
     else if (filename.endsWith(".pas"))
         classImporter = new PascalImport();
diff --git a/umbrello/umbrello/codeimport/cppimport.cpp b/umbrello/umbrello/codeimport/cppimport.cpp
index 68d8f731..f97a5359 100644
--- a/umbrello/umbrello/codeimport/cppimport.cpp
+++ b/umbrello/umbrello/codeimport/cppimport.cpp
@@ -50,7 +50,7 @@ CppImport::CppImport() {
 CppImport::~CppImport() {}
 
 void CppImport::feedTheModel(const TQString& fileName) {
-    if (ms_seenFiles.tqfind(fileName) != ms_seenFiles.end())
+    if (ms_seenFiles.find(fileName) != ms_seenFiles.end())
         return;
     ms_seenFiles.append(fileName);
     TQMap<TQString, Dependence> deps = ms_driver->dependences(fileName);
@@ -66,7 +66,7 @@ void CppImport::feedTheModel(const TQString& fileName) {
                 continue;
             }
             kDebug() << fileName << ": " << includeFile << " => " << it.data().first << endl;
-            if (ms_seenFiles.tqfind(includeFile) == ms_seenFiles.end())
+            if (ms_seenFiles.find(includeFile) == ms_seenFiles.end())
                 feedTheModel(includeFile);
         }
     }
@@ -101,7 +101,7 @@ void CppImport::initialize() {
 }
 
 void CppImport::parseFile(const TQString& fileName) {
-    if (ms_seenFiles.tqfind(fileName) != ms_seenFiles.end())
+    if (ms_seenFiles.find(fileName) != ms_seenFiles.end())
         return;
     ms_driver->parseFile( fileName );
     feedTheModel(fileName);
diff --git a/umbrello/umbrello/codeimport/idlimport.cpp b/umbrello/umbrello/codeimport/idlimport.cpp
index 36d8992f..cd2db89d 100644
--- a/umbrello/umbrello/codeimport/idlimport.cpp
+++ b/umbrello/umbrello/codeimport/idlimport.cpp
@@ -84,7 +84,7 @@ void IDLImport::fillSource(const TQString& word) {
 }
 
 void IDLImport::parseFile(const TQString& filename) {
-    if (filename.tqcontains('/')) {
+    if (filename.contains('/')) {
         TQString path = filename;
         path.remove( TQRegExp("/[^/]+$") );
         kDebug() << "IDLImport::parseFile: adding path " << path << endl;
@@ -290,13 +290,13 @@ bool IDLImport::parseStmt() {
     // (of a member of struct or valuetype, or return type
     // of an operation.) Up next is the name of the attribute
     // or operation.
-    if (! keyword.tqcontains( TQRegExp("^\\w") )) {
+    if (! keyword.contains( TQRegExp("^\\w") )) {
         kError() << "importIDL: ignoring " << keyword << endl;
         return false;
     }
     TQString typeName = joinTypename();
     TQString name = advance();
-    if (name.tqcontains( TQRegExp("\\W") )) {
+    if (name.contains( TQRegExp("\\W") )) {
         kError() << "importIDL: expecting name in " << name << endl;
         return false;
     }
diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp
index 44c8f380..5afae684 100644
--- a/umbrello/umbrello/codeimport/import_utils.cpp
+++ b/umbrello/umbrello/codeimport/import_utils.cpp
@@ -97,9 +97,9 @@ TQString formatComment(const TQString &comment) {
             lines.pop_front();  // nothing interesting on this line
     }
     TQString& last = lines.last();
-    int endpos = last.tqfind("*/");
+    int endpos = last.find("*/");
     if (endpos != -1) {
-        if (last.tqcontains(wordex))
+        if (last.contains(wordex))
             last = last.mid(0, endpos - 1);  // remove comment end
         else
             lines.pop_back();  // nothing interesting on this line
@@ -142,12 +142,12 @@ UMLObject *createUMLObject(Uml::Object_Type type,
     bNewUMLObjectWasCreated = false;
     if (o == NULL) {
         // Strip possible adornments and look again.
-        int isConst = name.tqcontains(TQRegExp("^const "));
+        int isConst = name.contains(TQRegExp("^const "));
         name.remove(TQRegExp("^const\\s+"));
         TQString typeName(name);
-        const int isAdorned = typeName.tqcontains( TQRegExp("[^\\w:\\. ]") );
-        const int isPointer = typeName.tqcontains('*');
-        const int isRef = typeName.tqcontains('&');
+        const int isAdorned = typeName.contains( TQRegExp("[^\\w:\\. ]") );
+        const int isPointer = typeName.contains('*');
+        const int isRef = typeName.contains('&');
         typeName.remove(TQRegExp("[^\\w:\\. ].*$"));
         typeName = typeName.simplifyWhiteSpace();
         UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, parentPkg);
@@ -157,9 +157,9 @@ UMLObject *createUMLObject(Uml::Object_Type type,
                 parentPkg = logicalView;
             // Find, or create, the scopes.
             TQStringList components;
-            if (typeName.tqcontains("::")) {
+            if (typeName.contains("::")) {
                 components = TQStringList::split("::", typeName);
-            } else if (typeName.tqcontains(".")) {
+            } else if (typeName.contains(".")) {
                 components = TQStringList::split(".", typeName);
             }
             if (components.count() > 1) {
@@ -449,7 +449,7 @@ TQStringList includePathList() {
 }
 
 void addIncludePath(const TQString& path) {
-    if (! incPathList.tqcontains(path))
+    if (! incPathList.contains(path))
         incPathList.append(path);
 }
 
diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp
index ac37e066..0ff5b689 100644
--- a/umbrello/umbrello/codeimport/javaimport.cpp
+++ b/umbrello/umbrello/codeimport/javaimport.cpp
@@ -86,7 +86,7 @@ void JavaImport::fillSource(const TQString& word) {
 void JavaImport::spawnImport( TQString file ) {
     // if the file is being parsed, don't bother
     //
-    if (s_filesAlreadyParsed.tqcontains( file ) ) {
+    if (s_filesAlreadyParsed.contains( file ) ) {
         return;
     }
     if (TQFile::exists(file)) {
@@ -112,7 +112,7 @@ UMLObject* JavaImport::resolveClass (TQString className) {
     kDebug() << "importJava trying to resolve " << className << endl;
     // keep track if we are dealing with an array
     //
-    bool isArray = className.tqcontains('[');
+    bool isArray = className.contains('[');
     // remove any [] so that the class itself can be resolved
     //
     TQString baseClassName = className;
@@ -271,7 +271,7 @@ bool JavaImport::parseStmt() {
             }
             while (1) {
                 const TQString arg = m_source[++start];
-                if (! arg.tqcontains( TQRegExp("^[A-Za-z_]") )) {
+                if (! arg.contains( TQRegExp("^[A-Za-z_]") )) {
                     kDebug() << "importJava(" << name << "): cannot handle template syntax ("
                         << arg << ")" << endl;
                     break;
@@ -420,7 +420,7 @@ bool JavaImport::parseStmt() {
     // (of a member of class or interface, or return type
     // of an operation.) Up next is the name of the attribute
     // or operation.
-    if (! keyword.tqcontains( TQRegExp("^\\w") )) {
+    if (! keyword.contains( TQRegExp("^\\w") )) {
         kError() << "importJava: ignoring " << keyword << endl;
         return false;
     }
@@ -441,7 +441,7 @@ bool JavaImport::parseStmt() {
     } else {
         nextToken = advance();
     }
-    if (name.tqcontains( TQRegExp("\\W") )) {
+    if (name.contains( TQRegExp("\\W") )) {
         kError() << "importJava: expecting name in " << name << endl;
         return false;
     }
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
index 0de3a2ed..568b480a 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
@@ -830,7 +830,7 @@ public:
     class ParameterDeclarationClauseAST* parameterDeclarationClause() { return m_parameterDeclarationClause.get(); }
     void setParameterDeclarationClause( AUTO_PTR<class ParameterDeclarationClauseAST>& parameterDeclarationClause );
 
-    // ### tqreplace 'constant' with cvQualify
+    // ### replace 'constant' with cvQualify
     AST* constant() { return m_constant.get(); }
     void setConstant( AST::Node& constant );
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index ac33d165..a30db121 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -110,7 +110,7 @@ TQString typeSpecToString( TypeSpecifierAST* typeSpec )  /// @todo remove
     if( !typeSpec )
         return TQString();
 
-    return typeSpec->text().tqreplace( TQRegExp(" :: "), "::" );
+    return typeSpec->text().replace( TQRegExp(" :: "), "::" );
 }
 
 TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, bool skipPtrOp )
@@ -171,6 +171,6 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b
            text += " const";
    }
 
-   return text.tqreplace( TQRegExp(" :: "), "::" ).simplifyWhiteSpace();
+   return text.replace( TQRegExp(" :: "), "::" ).simplifyWhiteSpace();
 }
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp
index f8e6c475..8bb7167a 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp
@@ -150,7 +150,7 @@ void CppTree2Uml::parseTypedef( TypedefAST* ast )
              */
             bool isDatatype = Import_Utils::isDatatype(typeId, m_currentNamespace[m_nsCnt]);
 
-            if (type.tqcontains('*') || isDatatype) {
+            if (type.contains('*') || isDatatype) {
                 UMLObject *inner =
                 Import_Utils::createUMLObject( Uml::ot_Class, typeId,
                                              m_currentNamespace[m_nsCnt] );
@@ -300,7 +300,7 @@ void CppTree2Uml::parseFunctionDefinition( FunctionDefinitionAST* ast )
     UMLOperation *m = Import_Utils::makeOperation(c, id);
     // if a class has no return type, it could be a constructor or
     // a destructor
-    if (d && returnType.isEmpty() && id.tqfind("~") == -1)
+    if (d && returnType.isEmpty() && id.find("~") == -1)
         isConstructor = true;
 
     parseFunctionArguments( d, m );
@@ -530,7 +530,7 @@ void CppTree2Uml::parseFunctionDeclaration(  GroupAST* funSpec, GroupAST* storag
     UMLOperation *m = Import_Utils::makeOperation(c, id);
     // if a class has no return type, it could be a constructor or
     // a destructor
-    if (d && returnType.isEmpty() && id.tqfind("~") == -1)
+    if (d && returnType.isEmpty() && id.find("~") == -1)
         isConstructor = true;
 
     parseFunctionArguments( d, m );
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
index 030f7f2b..8a76b939 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp
@@ -100,7 +100,7 @@ void Driver::remove( const TQString & fileName )
     m_problems.remove( fileName );
     removeAllMacrosInFile( fileName );
 
-    TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.tqfind( fileName );
+    TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.find( fileName );
     if( it != m_parsedUnits.end() ){
 	TranslationUnitAST* unit = *it;
 	m_parsedUnits.remove( it );
@@ -120,7 +120,7 @@ void Driver::removeAllMacrosInFile( const TQString& fileName )
 
 TranslationUnitAST::Node Driver::takeTranslationUnit( const TQString& fileName )
 {
-    TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.tqfind( fileName );
+    TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.find( fileName );
     TranslationUnitAST::Node unit( *it );
     //m_parsedUnits.remove( it );
     m_parsedUnits[ fileName] = 0;
@@ -129,7 +129,7 @@ TranslationUnitAST::Node Driver::takeTranslationUnit( const TQString& fileName )
 
 TranslationUnitAST* Driver::translationUnit( const TQString& fileName ) const
 {
-    TQMap<TQString, TranslationUnitAST*>::ConstIterator it = m_parsedUnits.tqfind( fileName );
+    TQMap<TQString, TranslationUnitAST*>::ConstIterator it = m_parsedUnits.find( fileName );
     return it != m_parsedUnits.end() ? *it : 0;
 }
 
@@ -146,7 +146,7 @@ void Driver::addDependence( const TQString & fileName, const Dependence & dep )
     TQString file = findIncludeFile( dep );
     findOrInsertDependenceList( fileName ).insert( file, dep );
 
-    if ( m_parsedUnits.tqfind(file) != m_parsedUnits.end() )
+    if ( m_parsedUnits.find(file) != m_parsedUnits.end() )
 	return;
 
     if ( !TQFile::exists( file ) ) {
@@ -176,7 +176,7 @@ void Driver::addProblem( const TQString & fileName, const Problem & problem )
 
 TQMap< TQString, Dependence >& Driver::findOrInsertDependenceList( const TQString & fileName )
 {
-    TQMap<TQString, TQMap<TQString, Dependence> >::Iterator it = m_dependences.tqfind( fileName );
+    TQMap<TQString, TQMap<TQString, Dependence> >::Iterator it = m_dependences.find( fileName );
     if( it != m_dependences.end() )
         return it.data();
 
@@ -187,7 +187,7 @@ TQMap< TQString, Dependence >& Driver::findOrInsertDependenceList( const TQStrin
 
 TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileName )
 {
-    TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.tqfind( fileName );
+    TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.find( fileName );
     if( it != m_problems.end() )
         return it.data();
 
@@ -198,7 +198,7 @@ TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileN
 
 TQMap< TQString, Dependence > Driver::dependences( const TQString & fileName ) const
 {
-    TQMap<TQString, TQMap<TQString, Dependence> >::ConstIterator it = m_dependences.tqfind( fileName );
+    TQMap<TQString, TQMap<TQString, Dependence> >::ConstIterator it = m_dependences.find( fileName );
     if( it != m_dependences.end() )
 	return it.data();
     return TQMap<TQString, Dependence>();
@@ -211,7 +211,7 @@ TQMap< TQString, Macro > Driver::macros() const
 
 TQValueList < Problem > Driver::problems( const TQString & fileName ) const
 {
-    TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.tqfind( fileName );
+    TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.find( fileName );
     if( it != m_problems.end() )
 	return it.data();
     return TQValueList<Problem>();
@@ -222,7 +222,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc
     TQFileInfo fileInfo( fileName );
     TQString absFilePath = fileInfo.absFilePath();
 
-    TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.tqfind( absFilePath );
+    TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.find( absFilePath );
 
     if( force && it != m_parsedUnits.end() ){
 	takeTranslationUnit( absFilePath );
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.h b/umbrello/umbrello/codeimport/kdevcppparser/driver.h
index 5a300745..9c365129 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/driver.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.h
@@ -185,7 +185,7 @@ public:
     TQMap<TQString, Macro> macros() const;
     TQValueList<Problem> problems( const TQString& fileName ) const;
 
-    bool hasMacro( const TQString& name ) const { return m_macros.tqcontains( name ); }
+    bool hasMacro( const TQString& name ) const { return m_macros.contains( name ); }
     const Macro& macro( const TQString& name ) const { return m_macros[ name ]; }
     Macro& macro( const TQString& name ) { return m_macros[ name ]; }
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index 270c3d87..f51c9986 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -83,7 +83,7 @@ struct LexerData
             const Scope& scope = *it;
             ++it;
 
-            if( scope.tqcontains(name) )
+            if( scope.contains(name) )
                 return true;
         }
 
@@ -97,7 +97,7 @@ struct LexerData
             const Scope& scope = *it;
             ++it;
 
-            if( scope.tqcontains(name) )
+            if( scope.contains(name) )
                 return scope[ name ];
         }
 
@@ -273,7 +273,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
 	int start = currentPosition();
 	readIdentifier();
 	TQString ide = m_source.mid( start, currentPosition() - start );
-	int k = Lookup::tqfind( &keyword, ide );
+	int k = Lookup::find( &keyword, ide );
 	if( m_preprocessorEnabled && m_driver->hasMacro(ide) &&
 	    (k == -1 || !m_driver->macro(ide).body().isEmpty()) ){
 
@@ -408,7 +408,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
 	    tk.setStartPosition( startLine, startColumn );
 	    tk.setEndPosition( m_currentLine, m_currentColumn );
 	} else if( m_skipWordsEnabled ){
-	    TQMap< TQString, TQPair<SkipType, TQString> >::Iterator pos = m_words.tqfind( ide );
+	    TQMap< TQString, TQPair<SkipType, TQString> >::Iterator pos = m_words.find( ide );
 	    if( pos != m_words.end() ){
 		if( (*pos).first == SkipWordAndArguments ){
 		    readWhiteSpaces();
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
index fad6627a..87b5b546 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
@@ -74,7 +74,7 @@ const HashEntry* Lookup::findEntry( const struct HashTable *table,
     return findEntry( table, s.tqunicode(), s.length() );
 }
 
-int Lookup::tqfind(const struct HashTable *table,
+int Lookup::find(const struct HashTable *table,
 		 const TQChar *c, unsigned int len)
 {
   const HashEntry *entry = findEntry( table, c, len );
@@ -83,9 +83,9 @@ int Lookup::tqfind(const struct HashTable *table,
   return -1;
 }
 
-int Lookup::tqfind(const struct HashTable *table, const TQString &s)
+int Lookup::find(const struct HashTable *table, const TQString &s)
 {
-  return tqfind(table, s.tqunicode(), s.length());
+  return find(table, s.tqunicode(), s.length());
 }
 
 unsigned int Lookup::hash(const TQChar *c, unsigned int len)
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
index c8a07dab..b2bad4de 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h
@@ -95,8 +95,8 @@
     /**
      * Find an entry in the table, and return its value (i.e. the value field of HashEntry)
      */
-    static int tqfind(const struct HashTable *table, const TQString& s);
-    static int tqfind(const struct HashTable *table, const TQChar *c, unsigned int len);
+    static int find(const struct HashTable *table, const TQString& s);
+    static int find(const struct HashTable *table, const TQChar *c, unsigned int len);
 
     /**
      * Find an entry in the table, and return the entry
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
index 5cd28356..806a29a9 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
@@ -40,14 +40,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 TQString URLUtil::filename(const TQString & name) {
-  int slashPos = name.tqfindRev("/");
+  int slashPos = name.findRev("/");
   return slashPos<0 ? name : name.mid(slashPos+1);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 TQString URLUtil::directory(const TQString & name) {
-  int slashPos = name.tqfindRev("/");
+  int slashPos = name.findRev("/");
   return slashPos<0 ? TQString("") : name.left(slashPos);
 }
 
@@ -74,7 +74,7 @@ TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child
 ///////////////////////////////////////////////////////////////////////////////
 
 TQString URLUtil::upDir(const TQString & path, bool slashSuffix) {
-  int slashPos = path.tqfindRev("/");
+  int slashPos = path.findRev("/");
   if (slashPos<1) return TQString();
   return path.mid(0,slashPos+ (slashSuffix ? 1 : 0) );
 }
@@ -103,7 +103,7 @@ KURL URLUtil::mergeURL(const KURL & source, const KURL & dest, const KURL & chil
 ///////////////////////////////////////////////////////////////////////////////
 
 TQString URLUtil::getExtension(const TQString & path) {
-  int dotPos = path.tqfindRev('.');
+  int dotPos = path.findRev('.');
   if (dotPos<0) return TQString("");
   return path.mid(dotPos+1);
 }
@@ -114,7 +114,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur
 {
   TQString absBase = extractPathNameAbsolute( baseDirUrl ),
     absRef = extractPathNameAbsolute( url );
-  int i = absRef.tqfind( absBase, 0, true );
+  int i = absRef.find( absBase, 0, true );
 
   if (i == -1)
     return TQString();
@@ -122,7 +122,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur
   if (absRef == absBase)
     return TQString( "." );
   else
-    return absRef.tqreplace( 0, absBase.length(), TQString() );
+    return absRef.replace( 0, absBase.length(), TQString() );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -289,7 +289,7 @@ TQString URLUtil::envExpand ( const TQString& str )
 
     if (len > 1 && str[0] == '$')
     {
-      int pos = str.tqfind ('/');
+      int pos = str.find ('/');
 
       if (pos < 0)
         pos = len;
diff --git a/umbrello/umbrello/codeimport/nativeimportbase.cpp b/umbrello/umbrello/codeimport/nativeimportbase.cpp
index 925e397a..b2f7dac3 100644
--- a/umbrello/umbrello/codeimport/nativeimportbase.cpp
+++ b/umbrello/umbrello/codeimport/nativeimportbase.cpp
@@ -113,10 +113,10 @@ bool NativeImportBase::preprocess(TQString& line) {
     // Check for end of multi line comment.
     if (m_inComment) {
         int delimiterLen = 0;
-        int pos = line.tqfind(m_multiLineCommentEnd);
+        int pos = line.find(m_multiLineCommentEnd);
         if (pos == -1) {
             if (! m_multiLineAltCommentEnd.isEmpty())
-                pos = line.tqfind(m_multiLineAltCommentEnd);
+                pos = line.find(m_multiLineAltCommentEnd);
             if (pos == -1) {
                 m_comment += line + "\n";
                 return true;  // done
@@ -142,20 +142,20 @@ bool NativeImportBase::preprocess(TQString& line) {
     // Check for start of multi line comment.
     int delimIntroLen = 0;
     int delimEndLen = 0;
-    int pos = line.tqfind(m_multiLineCommentIntro);
+    int pos = line.find(m_multiLineCommentIntro);
     if (pos != -1) {
         delimIntroLen = m_multiLineCommentIntro.length();
     } else if (!m_multiLineAltCommentIntro.isEmpty()) {
-        pos = line.tqfind(m_multiLineAltCommentIntro);
+        pos = line.find(m_multiLineAltCommentIntro);
         if (pos != -1)
             delimIntroLen = m_multiLineAltCommentIntro.length();
     }
     if (pos != -1) {
-        int endpos = line.tqfind(m_multiLineCommentEnd);
+        int endpos = line.find(m_multiLineCommentEnd);
         if (endpos != -1) {
             delimEndLen = m_multiLineCommentEnd.length();
         } else if (!m_multiLineAltCommentEnd.isEmpty()) {
-            endpos = line.tqfind(m_multiLineAltCommentEnd);
+            endpos = line.find(m_multiLineAltCommentEnd);
             if (endpos != -1)
                 delimEndLen = m_multiLineAltCommentEnd.length();
         }
@@ -237,7 +237,7 @@ void NativeImportBase::scan(TQString line) {
     if (preprocess(line))
         return;
     // Check for single line comment.
-    int pos = line.tqfind(m_singleLineCommentIntro);
+    int pos = line.find(m_singleLineCommentIntro);
     if (pos != -1) {
         TQString cmnt = line.mid(pos);
         m_source.append(cmnt);
@@ -245,7 +245,7 @@ void NativeImportBase::scan(TQString line) {
             return;
         line = line.left(pos);
     }
-    if (line.tqcontains(TQRegExp("^\\s*$")))
+    if (line.contains(TQRegExp("^\\s*$")))
         return;
     TQStringList words = split(line);
     for (TQStringList::Iterator it = words.begin(); it != words.end(); ++it) {
@@ -263,12 +263,12 @@ void NativeImportBase::initVars() {
 void NativeImportBase::parseFile(const TQString& filename) {
     TQString nameWithoutPath = filename;
     nameWithoutPath.remove(TQRegExp("^.*/"));
-    if (m_parsedFiles.tqcontains(nameWithoutPath))
+    if (m_parsedFiles.contains(nameWithoutPath))
         return;
     m_parsedFiles.append(nameWithoutPath);
     TQString fname = filename;
     const TQString msgPrefix = "NativeImportBase::parseFile(" + filename + "): ";
-    if (filename.tqcontains('/')) {
+    if (filename.contains('/')) {
         TQString path = filename;
         path.remove( TQRegExp("/[^/]+$") );
         kDebug() << msgPrefix << "adding path " << path << endl;
diff --git a/umbrello/umbrello/codeimport/pascalimport.cpp b/umbrello/umbrello/codeimport/pascalimport.cpp
index f2358735..30d39128 100644
--- a/umbrello/umbrello/codeimport/pascalimport.cpp
+++ b/umbrello/umbrello/codeimport/pascalimport.cpp
@@ -104,7 +104,7 @@ bool PascalImport::parseStmt() {
                 continue;
             }
             TQString filename = unit + ".pas";
-            if (! m_parsedFiles.tqcontains(unit)) {
+            if (! m_parsedFiles.contains(unit)) {
                 // Save current m_source and m_srcIndex.
                 TQStringList source(m_source);
                 uint srcIndex = m_srcIndex;
diff --git a/umbrello/umbrello/codeimport/pythonimport.cpp b/umbrello/umbrello/codeimport/pythonimport.cpp
index cf7c0dae..2436699a 100644
--- a/umbrello/umbrello/codeimport/pythonimport.cpp
+++ b/umbrello/umbrello/codeimport/pythonimport.cpp
@@ -45,7 +45,7 @@ bool PythonImport::preprocess(TQString& line) {
     if (NativeImportBase::preprocess(line))
         return true;
     // Handle single line comment
-    int pos = line.tqfind(m_singleLineCommentIntro);
+    int pos = line.find(m_singleLineCommentIntro);
     if (pos != -1) {
         TQString cmnt = line.mid(pos);
         m_source.append(cmnt);
@@ -56,11 +56,11 @@ bool PythonImport::preprocess(TQString& line) {
         line.remove( TQRegExp("\\s+$") );
     }
     // Transform changes in indentation into braces a la C++/Java/Perl/...
-    pos = line.tqfind( TQRegExp("\\S") );
+    pos = line.find( TQRegExp("\\S") );
     if (pos == -1)
         return true;
     bool isContinuation = false;
-    int leadingWhite = line.left(pos).tqcontains( TQRegExp("\\s") );
+    int leadingWhite = line.left(pos).contains( TQRegExp("\\s") );
     if (leadingWhite > m_srcIndent[m_srcIndentIndex]) {
         if (m_srcIndex == 0) {
             kError() << "PythonImport::preprocess(): internal error 1" << endl;
@@ -80,7 +80,7 @@ bool PythonImport::preprocess(TQString& line) {
         }
     }
     if (line.endsWith(":")) {
-        line.tqreplace( TQRegExp(":$"), "{" );
+        line.replace( TQRegExp(":$"), "{" );
         m_braceWasOpened = true;
     } else {
         m_braceWasOpened = false;
diff --git a/umbrello/umbrello/codeimport/pythonimport.h b/umbrello/umbrello/codeimport/pythonimport.h
index 41de3c01..d5c62a91 100644
--- a/umbrello/umbrello/codeimport/pythonimport.h
+++ b/umbrello/umbrello/codeimport/pythonimport.h
@@ -62,7 +62,7 @@ protected:
     int m_srcIndent[100];
 
     /**
-     * Index for m_srcIndent[]. Index 0 is reserved and tqcontains 0.
+     * Index for m_srcIndent[]. Index 0 is reserved and contains 0.
      */
     int m_srcIndentIndex;