rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 22 insertions, 22 deletions

diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index 4f692cba..6abc0f8e 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -733,7 +733,7 @@ bool UMLDoc::addUMLObject(UMLObject* object) {
     if (pkg == NULL) {
         pkg = currentRoot();
         kDebug() << "UMLDoc::addUMLObject(" << object->getName()
-            << "): no tqparent package set, assuming " << pkg->getName() << endl;
+            << "): no parent package set, assuming " << pkg->getName() << endl;
         object->setUMLPackage( pkg );
     }
     return pkg->addObject(object);
@@ -759,7 +759,7 @@ void UMLDoc::slotRemoveUMLObject(UMLObject* object)  {
     UMLPackage *pkg = object->getUMLPackage();
     if (pkg == NULL) {
         kError() << "UMLDoc::slotRemoveUMLObject(" << object->getName()
-            << "): tqparent package is not set !" << endl;
+            << "): parent package is not set !" << endl;
         return;
     }
     pkg->removeObject(object);
@@ -772,7 +772,7 @@ bool UMLDoc::isUnique(const TQString &name)
     UMLListViewItem *parentItem = 0;
 
     // check for current item, if its a package, then we do a check on that
-    // otherwise, if current item exists, find its tqparent and check if thats
+    // otherwise, if current item exists, find its parent and check if thats
     // a package..
     if(currentItem)
     {
@@ -780,7 +780,7 @@ bool UMLDoc::isUnique(const TQString &name)
         // do check now
         if (Model_Utils::typeIsContainer(currentItem->getType()))
             return isUnique (name, (UMLPackage*) currentItem->getUMLObject());
-        parentItem = (UMLListViewItem*)currentItem->tqparent();
+        parentItem = (UMLListViewItem*)currentItem->parent();
     }
 
     // item is in a package so do check only in that
@@ -791,7 +791,7 @@ bool UMLDoc::isUnique(const TQString &name)
 
     kError() << "UMLDoc::isUnique(" << name << "): Not currently in a package"
         << endl;
-    /* Check against all objects that _don't_ have a tqparent package.
+    /* Check against all objects that _don't_ have a parent package.
     for (UMLObjectListIt oit(m_objectList); oit.current(); ++oit) {
         UMLObject *obj = oit.current();
         if (obj->getUMLPackage() == NULL && obj->getName() == name)
@@ -810,7 +810,7 @@ bool UMLDoc::isUnique(const TQString &name, UMLPackage *package)
     // Not currently in a package: ERROR
     kError() << "UMLDoc::isUnique(2)(" << name << "): Not currently in a package"
         << endl;
-    /* Check against all objects that _don't_ have a tqparent package.
+    /* Check against all objects that _don't_ have a parent package.
     for (UMLObjectListIt oit(m_objectList); oit.current(); ++oit) {
         UMLObject *obj = oit.current();
         if (obj->getUMLPackage() == NULL && obj->getName() == name)
@@ -848,7 +848,7 @@ void UMLDoc::removeAssociation (UMLAssociation * assoc, bool doSetModified /*=tr
     UMLPackage *pkg = assoc->getUMLPackage();
     if (pkg == NULL) {
         kError() << "UMLDoc::removeAssociation(" << assoc->getName()
-            << "): tqparent package is not set !" << endl;
+            << "): parent package is not set !" << endl;
         return;
     }
     pkg->removeObject(assoc);
@@ -917,7 +917,7 @@ void UMLDoc::addAssociation(UMLAssociation *Assoc)
     UMLPackage *pkg = Assoc->getUMLPackage();
     if (pkg == NULL) {
         kError() << "UMLDoc::addAssociation(" << Assoc->getName()
-            << "): tqparent package is not set !" << endl;
+            << "): parent package is not set !" << endl;
         return;
     }
     pkg->addObject(Assoc);
@@ -1048,9 +1048,9 @@ void UMLDoc::renameUMLObject(UMLObject *o) {
 
 void UMLDoc::renameChildUMLObject(UMLObject *o) {
     bool ok = false;
-    UMLClassifier* p = dynamic_cast<UMLClassifier *>(o->tqparent());
+    UMLClassifier* p = dynamic_cast<UMLClassifier *>(o->parent());
     if(!p) {
-        kDebug() << "Can't create object, no tqparent found" << endl;
+        kDebug() << "Can't create object, no parent found" << endl;
         return;
     }
 
@@ -1134,25 +1134,25 @@ void UMLDoc::removeUMLObject(UMLObject* umlobject) {
 
     umlobject->setUMLStereotype(NULL);  // triggers possible cleanup of UMLStereotype
     if (dynamic_cast<UMLClassifierListItem*>(umlobject))  {
-        UMLClassifier* tqparent = dynamic_cast<UMLClassifier*>(umlobject->tqparent());
-        if (tqparent == NULL) {
-            kError() << "UMLDoc::removeUMLObject: tqparent of umlobject is NULL"
+        UMLClassifier* parent = dynamic_cast<UMLClassifier*>(umlobject->parent());
+        if (parent == NULL) {
+            kError() << "UMLDoc::removeUMLObject: parent of umlobject is NULL"
                 << endl;
             return;
         }
         if (type == ot_Operation) {
-            tqparent->removeOperation(static_cast<UMLOperation*>(umlobject));
+            parent->removeOperation(static_cast<UMLOperation*>(umlobject));
         } else if (type == ot_EnumLiteral) {
-            UMLEnum *e = static_cast<UMLEnum*>(tqparent);
+            UMLEnum *e = static_cast<UMLEnum*>(parent);
             e->removeEnumLiteral(static_cast<UMLEnumLiteral*>(umlobject));
         } else if (type == ot_EntityAttribute) {
-            UMLEntity *ent = static_cast<UMLEntity*>(tqparent);
+            UMLEntity *ent = static_cast<UMLEntity*>(parent);
             ent->removeEntityAttribute(static_cast<UMLClassifierListItem*>(umlobject));
         } else {
-            UMLClassifier* pClass = dynamic_cast<UMLClassifier*>(tqparent);
+            UMLClassifier* pClass = dynamic_cast<UMLClassifier*>(parent);
             if (pClass == NULL)  {
-                kError() << "UMLDoc::removeUMLObject: tqparent of umlobject has "
-                    << "unexpected type " << tqparent->getBaseType() << endl;
+                kError() << "UMLDoc::removeUMLObject: parent of umlobject has "
+                    << "unexpected type " << parent->getBaseType() << endl;
                 return;
             }
             if (type == ot_Attribute) {
@@ -1174,7 +1174,7 @@ void UMLDoc::removeUMLObject(UMLObject* umlobject) {
                 pkg->removeObject(umlobject);
             } else {
                 kError() << "UMLDoc::removeUMLObject(" << umlobject->getName()
-                    << "): tqparent package is not set !" << endl;
+                    << "): parent package is not set !" << endl;
             }
         }
         emit sigObjectRemoved(umlobject);
@@ -1693,7 +1693,7 @@ bool UMLDoc::loadUMLObjectsFromXMI(TQDomElement& element) {
             continue;
         }
         Uml::Object_Type ot = pObject->getBaseType();
-        // Set the tqparent root folder.
+        // Set the parent root folder.
         UMLPackage *pkg = NULL;
         if (ot == Uml::ot_Datatype) {
             pkg = m_datatypeRoot;
@@ -1839,7 +1839,7 @@ bool UMLDoc::loadDiagramsFromXMI( TQDomNode & node ) {
                 return false;
             }
             // Put diagram in default predefined folder.
-            // @todo pass in the tqparent folder - it might be a user defined one.
+            // @todo pass in the parent folder - it might be a user defined one.
             Uml::Model_Type mt = Model_Utils::convert_DT_MT(pView->getType());
             pView->setFolder(m_root[mt]);
             pView -> hide();