1 files changed, 13 insertions, 13 deletions

diff --git a/umbrello/umbrello/codeimport/adaimport.cpp b/umbrello/umbrello/codeimport/adaimport.cpp
index 0cbd8d1c..c9325b36 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.contains(pfx)) {
+    if (m_renaming.tqcontains(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.contains(filename)) {
+        if (! m_parsedFiles.tqcontains(filename)) {
             // Save current m_source and m_srcIndex.
             TQStringList source(m_source);
             uint srcIndex = m_srcIndex;
@@ -198,9 +198,9 @@ bool AdaImport::parseStmt() {
     }
     if (keyword == "package") {
         const TQString& name = advance();
-        TQStringList parentPkgs = TQStringList::split(".", name.lower());
-        parentPkgs.pop_back();  // exclude the current package
-        parseStems(parentPkgs);
+        TQStringList tqparentPkgs = TQStringList::split(".", name.lower());
+        tqparentPkgs.pop_back();  // exclude the current package
+        parseStems(tqparentPkgs);
         UMLObject *ns = NULL;
         if (advance() == "is") {
             ns = Import_Utils::createUMLObject(Uml::ot_Package, name,
@@ -324,15 +324,15 @@ bool AdaImport::parseStmt() {
                     UMLClassifier *klass = static_cast<UMLClassifier*>(ns);
                     TQString base = expand(advance());
                     UMLObject *p = Import_Utils::createUMLObject(Uml::ot_Interface, base, m_scope[m_scopeIndex]);
-                    UMLClassifier *parent = static_cast<UMLClassifier*>(p);
-                    Import_Utils::createGeneralization(klass, parent);
+                    UMLClassifier *tqparent = static_cast<UMLClassifier*>(p);
+                    Import_Utils::createGeneralization(klass, tqparent);
                 }
             } else {
                 ns->setAbstract(m_isAbstract);
             }
             m_isAbstract = false;
             if (isTaggedType) {
-                if (! m_classesDefinedInThisScope.contains(ns))
+                if (! m_classesDefinedInThisScope.tqcontains(ns))
                     m_classesDefinedInThisScope.append(ns);
             } else {
                 ns->setStereotype("record");
@@ -359,13 +359,13 @@ bool AdaImport::parseStmt() {
                 t = (known ? known->getBaseType() : Uml::ot_Datatype);
             }
             UMLObject *ns = Import_Utils::createUMLObject(t, base, NULL);
-            UMLClassifier *parent = static_cast<UMLClassifier*>(ns);
+            UMLClassifier *tqparent = static_cast<UMLClassifier*>(ns);
             ns = Import_Utils::createUMLObject(t, name, m_scope[m_scopeIndex], m_comment);
             if (isExtension) {
                 next = advance();
                 if (next == "null" || next == "record") {
                     UMLClassifier *klass = static_cast<UMLClassifier*>(ns);
-                    Import_Utils::createGeneralization(klass, parent);
+                    Import_Utils::createGeneralization(klass, tqparent);
                     if (next == "record") {
                         // Set the m_klass for attributes.
                         m_klass = klass;
@@ -375,8 +375,8 @@ bool AdaImport::parseStmt() {
                         TQStringList::Iterator end(baseInterfaces.end());
                         for (TQStringList::Iterator bi(baseInterfaces.begin()); bi != end; ++bi) {
                              ns = Import_Utils::createUMLObject(t, *bi, m_scope[m_scopeIndex]);
-                             parent = static_cast<UMLClassifier*>(ns);
-                             Import_Utils::createGeneralization(klass, parent);
+                             tqparent = static_cast<UMLClassifier*>(ns);
+                             Import_Utils::createGeneralization(klass, tqparent);
                         }
                     }
                 }
@@ -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.contains(type)) {
+                    !m_classesDefinedInThisScope.tqcontains(type)) {
                     // Not an instance bound method - we cannot represent it.
                     skipStmt(")");
                     break;