Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 21 insertions, 21 deletions

diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp
index 249ed865..44c8f380 100644
--- a/umbrello/umbrello/codeimport/import_utils.cpp
+++ b/umbrello/umbrello/codeimport/import_utils.cpp
@@ -126,19 +126,19 @@ UMLObject* findUMLObject(TQString name,
 
 UMLObject *createUMLObject(Uml::Object_Type type,
                            const TQString& inName,
-                           UMLPackage *tqparentPkg,
+                           UMLPackage *parentPkg,
                            const TQString& comment,
                            const TQString& stereotype) {
     TQString name = inName;
     UMLDoc *umldoc = UMLApp::app()->getDocument();
     UMLFolder *logicalView = umldoc->getRootFolder(Uml::mt_Logical);
     const Uml::Programming_Language pl = UMLApp::app()->getActiveLanguage();
-    if (tqparentPkg == NULL) {
+    if (parentPkg == NULL) {
         // kDebug() << "Import_Utils::createUMLObject(" << name
-        //     << "): tqparentPkg is NULL, assuming Logical View" << endl;
-        tqparentPkg = logicalView;
+        //     << "): parentPkg is NULL, assuming Logical View" << endl;
+        parentPkg = logicalView;
     }
-    UMLObject * o = umldoc->findUMLObject(name, type, tqparentPkg);
+    UMLObject * o = umldoc->findUMLObject(name, type, parentPkg);
     bNewUMLObjectWasCreated = false;
     if (o == NULL) {
         // Strip possible adornments and look again.
@@ -150,11 +150,11 @@ UMLObject *createUMLObject(Uml::Object_Type type,
         const int isRef = typeName.tqcontains('&');
         typeName.remove(TQRegExp("[^\\w:\\. ].*$"));
         typeName = typeName.simplifyWhiteSpace();
-        UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, tqparentPkg);
+        UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, parentPkg);
         if (origType == NULL) {
             // Still not found. Create the stripped down type.
             if (bPutAtGlobalScope)
-                tqparentPkg = logicalView;
+                parentPkg = logicalView;
             // Find, or create, the scopes.
             TQStringList components;
             if (typeName.tqcontains("::")) {
@@ -168,9 +168,9 @@ UMLObject *createUMLObject(Uml::Object_Type type,
                 while ( components.count() ) {
                     TQString scopeName = components.front();
                     components.pop_front();
-                    o = umldoc->findUMLObject(scopeName, Uml::ot_UMLObject, tqparentPkg);
+                    o = umldoc->findUMLObject(scopeName, Uml::ot_UMLObject, parentPkg);
                     if (o) {
-                        tqparentPkg = static_cast<UMLPackage*>(o);
+                        parentPkg = static_cast<UMLPackage*>(o);
                         continue;
                     }
                     int wantNamespace = KMessageBox::Yes;
@@ -184,8 +184,8 @@ UMLObject *createUMLObject(Uml::Object_Type type,
                         }
                     }
                     Uml::Object_Type ot = (wantNamespace == KMessageBox::Yes ? Uml::ot_Package : Uml::ot_Class);
-                    o = Object_Factory::createUMLObject(ot, scopeName, tqparentPkg);
-                    tqparentPkg = static_cast<UMLPackage*>(o);
+                    o = Object_Factory::createUMLObject(ot, scopeName, parentPkg);
+                    parentPkg = static_cast<UMLPackage*>(o);
                     UMLListView *listView = UMLApp::app()->getListView();
                     UMLListViewItem *lvitem = listView->findUMLObject(o);
                     listView->setCurrentItem(lvitem);
@@ -196,7 +196,7 @@ UMLObject *createUMLObject(Uml::Object_Type type,
             Uml::Object_Type t = type;
             if (type == Uml::ot_UMLObject || isAdorned)
                 t = Uml::ot_Class;
-            origType = Object_Factory::createUMLObject(t, typeName, tqparentPkg, false);
+            origType = Object_Factory::createUMLObject(t, typeName, parentPkg, false);
             bNewUMLObjectWasCreated = true;
             bPutAtGlobalScope = false;
         }
@@ -228,7 +228,7 @@ UMLObject *createUMLObject(Uml::Object_Type type,
         } else {
             o = origType;
         }
-    } else if (tqparentPkg && !bPutAtGlobalScope) {
+    } else if (parentPkg && !bPutAtGlobalScope) {
         UMLPackage *existingPkg = o->getUMLPackage();
         if (existingPkg != umldoc->getDatatypeFolder()) {
             if (existingPkg)
@@ -236,8 +236,8 @@ UMLObject *createUMLObject(Uml::Object_Type type,
             else
                 kError() << "createUMLObject(" << name << "): "
                     << "o->getUMLPackage() was NULL" << endl;
-            o->setUMLPackage(tqparentPkg);
-            tqparentPkg->addObject(o);
+            o->setUMLPackage(parentPkg);
+            parentPkg->addObject(o);
         }
     }
     TQString strippedComment = formatComment(comment);
@@ -260,7 +260,7 @@ UMLObject *createUMLObject(Uml::Object_Type type,
         return o;
     TQStringList::Iterator end(params.end());
     for (TQStringList::Iterator it(params.begin()); it != end; ++it) {
-        UMLObject *p = umldoc->findUMLObject(*it, Uml::ot_UMLObject, tqparentPkg);
+        UMLObject *p = umldoc->findUMLObject(*it, Uml::ot_UMLObject, parentPkg);
         if (p == NULL || p->getBaseType() == Uml::ot_Datatype)
             continue;
         const Uml::Association_Type at = Uml::at_Dependency;
@@ -433,9 +433,9 @@ void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent) {
     umldoc->addAssociation(assoc);
 }
 
-void createGeneralization(UMLClassifier *child, const TQString &tqparentName) {
-    UMLObject *tqparentObj = createUMLObject( Uml::ot_Class, tqparentName );
-    UMLClassifier *tqparent = static_cast<UMLClassifier*>(tqparentObj);
+void createGeneralization(UMLClassifier *child, const TQString &parentName) {
+    UMLObject *parentObj = createUMLObject( Uml::ot_Class, parentName );
+    UMLClassifier *tqparent = static_cast<UMLClassifier*>(parentObj);
     createGeneralization(child, tqparent);
 }
 
@@ -454,9 +454,9 @@ void addIncludePath(const TQString& path) {
 }
 
 
-bool isDatatype(const TQString& name, UMLPackage *tqparentPkg) {
+bool isDatatype(const TQString& name, UMLPackage *parentPkg) {
     UMLDoc *umldoc = UMLApp::app()->getDocument();
-    UMLObject * o = umldoc->findUMLObject(name, Uml::ot_Datatype, tqparentPkg);
+    UMLObject * o = umldoc->findUMLObject(name, Uml::ot_Datatype, parentPkg);
     return (o!=NULL);
 }