1 files changed, 14 insertions, 14 deletions

diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp
index 7f62a1a9..f73f5586 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.contains( file ) ) {
+    if (s_filesAlreadyParsed.tqcontains( file ) ) {
         return;
     }
     if (TQFile::exists(file)) {
@@ -100,9 +100,9 @@ void JavaImport::spawnImport( TQString file ) {
 
 
 ///returns the UML Object if found, or null otherwise
-UMLObject* findObject( TQString name,   UMLPackage *parentPkg ) {
+UMLObject* findObject( TQString name,   UMLPackage *tqparentPkg ) {
     UMLDoc *umldoc = UMLApp::app()->getDocument();
-    UMLObject * o = umldoc->findUMLObject(name, Uml::ot_UMLObject , parentPkg);
+    UMLObject * o = umldoc->findUMLObject(name, Uml::ot_UMLObject , tqparentPkg);
     return o;
 }
 
@@ -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.contains('[');
+    bool isArray = className.tqcontains('[');
     // remove any [] so that the class itself can be resolved
     //
     TQString baseClassName = className;
@@ -172,15 +172,15 @@ UMLObject* JavaImport::resolveClass (TQString className) {
                 spawnImport( aFile );
                 // we need to set the package for the class that will be resolved
                 // start at the root package
-                UMLPackage *parent = m_scope[0];
+                UMLPackage *tqparent = m_scope[0];
                 UMLPackage *current = NULL;
 
                 for (TQStringList::Iterator it = split.begin(); it != split.end(); ++it) {
                     TQString name = (*it);
                     UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Package,
-                                                                  name, parent);
+                                                                  name, tqparent);
                     current = static_cast<UMLPackage*>(ns);
-                    parent = current;
+                    tqparent = current;
                 } // for
                 if ( isArray ) {
                     // we have imported the type. For arrays we want to return
@@ -271,7 +271,7 @@ bool JavaImport::parseStmt() {
             }
             while (1) {
                 const TQString arg = m_source[++start];
-                if (! arg.contains( TQRegExp("^[A-Za-z_]") )) {
+                if (! arg.tqcontains( TQRegExp("^[A-Za-z_]") )) {
                     kDebug() << "importJava(" << name << "): cannot handle template syntax ("
                         << arg << ")" << endl;
                     break;
@@ -292,11 +292,11 @@ bool JavaImport::parseStmt() {
             const TQString& baseName = advance();
             // try to resolve the class we are extending, or if impossible
             // create a placeholder
-            UMLObject *parent = resolveClass( baseName );
-            if ( parent ) {
-                Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(parent));
+            UMLObject *tqparent = resolveClass( baseName );
+            if ( tqparent ) {
+                Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(tqparent));
             } else {
-                kDebug() << "importJava parentClass " << baseName
+                kDebug() << "importJava tqparentClass " << baseName
                     << " is not resolveable. Creating placeholder" << endl;
                 Import_Utils::createGeneralization(m_klass, baseName);
             }
@@ -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.contains( TQRegExp("^\\w") )) {
+    if (! keyword.tqcontains( TQRegExp("^\\w") )) {
         kError() << "importJava: ignoring " << keyword << endl;
         return false;
     }
@@ -441,7 +441,7 @@ bool JavaImport::parseStmt() {
     } else {
         nextToken = advance();
     }
-    if (name.contains( TQRegExp("\\W") )) {
+    if (name.tqcontains( TQRegExp("\\W") )) {
         kError() << "importJava: expecting name in " << name << endl;
         return false;
     }