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
author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
committer: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
commit: 22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60 (patch)
tree: babc4a761925023e16fa94633959f35d1c251887 /umbrello/umbrello
parent: 0813b39aed2cf4c84157a22c4c9594336d93d412 (diff)
download: tdesdk-22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60.tar.gz
tdesdk-22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60.zip
243 files changed, 981 insertions, 981 deletions
diff --git a/umbrello/umbrello/activitywidget.h b/umbrello/umbrello/activitywidget.h
index 86e494e1..1b82a4aa 100644
--- a/umbrello/umbrello/activitywidget.h
+++ b/umbrello/umbrello/activitywidget.h
@@ -47,7 +47,7 @@ public:
     /**
      * Creates a Activity widget.
      *
-     * @param view              The tqparent of the widget.
+     * @param view              The parent of the widget.
      * @param activityType      The type of activity.
      * @param id                The ID to assign (-1 will prompt a new ID.)
      */
diff --git a/umbrello/umbrello/actorwidget.h b/umbrello/umbrello/actorwidget.h
index 7555bf77..6b62bc98 100644
--- a/umbrello/umbrello/actorwidget.h
+++ b/umbrello/umbrello/actorwidget.h
@@ -46,7 +46,7 @@ public:
     /**
      * Constructs an ActorWidget.
      *
-     * @param view      The tqparent of this ActorWidget.
+     * @param view      The parent of this ActorWidget.
      * @param o         The Actor class this ActorWidget will display.
      */
     ActorWidget(UMLView * view, UMLActor *o);
@@ -64,7 +64,7 @@ public:
 
     /**
      * Saves the widget to the "actorwidget" XMI element.
-     * Note: For loading from XMI, the inherited tqparent method is used.
+     * Note: For loading from XMI, the inherited parent method is used.
      */
     void saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement );
 
diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h
index 4e515489..7e2170a5 100644
--- a/umbrello/umbrello/aligntoolbar.h
+++ b/umbrello/umbrello/aligntoolbar.h
@@ -36,7 +36,7 @@ public:
     /**
      * Creates a bar with tools for tqalignment.
      *
-     * @param parentWindow      The tqparent of the toolbar.
+     * @param parentWindow      The parent of the toolbar.
      * @param name              The name of the toolbar.
      */
     AlignToolBar(TQMainWindow* parentWindow, const char* name);
diff --git a/umbrello/umbrello/artifactwidget.h b/umbrello/umbrello/artifactwidget.h
index 68ca425a..3fdd26c2 100644
--- a/umbrello/umbrello/artifactwidget.h
+++ b/umbrello/umbrello/artifactwidget.h
@@ -35,7 +35,7 @@ public:
     /**
      * Constructs a ArtifactWidget.
      *
-     * @param view              The tqparent of this ArtifactWidget.
+     * @param view              The parent of this ArtifactWidget.
      * @param a         The Artifact this widget will be representing.
      */
     ArtifactWidget(UMLView *view, UMLArtifact *a);
@@ -52,7 +52,7 @@ public:
 
     /**
      * Saves the widget to the "artifactwidget" XMI element.
-     * Note: For loading from XMI, the inherited tqparent method is used.
+     * Note: For loading from XMI, the inherited parent method is used.
      */
     void saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement);
 
diff --git a/umbrello/umbrello/association.cpp b/umbrello/umbrello/association.cpp
index a4c9d9d5..62f47a43 100644
--- a/umbrello/umbrello/association.cpp
+++ b/umbrello/umbrello/association.cpp
@@ -164,7 +164,7 @@ void UMLAssociation::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement )
         TQDomElement assocElement = UMLObject::save("UML:Generalization", qDoc);
         assocElement.setAttribute( "discriminator", "" );
         assocElement.setAttribute( "child", ID2STR(getObjectId(A)) );
-        assocElement.setAttribute( "tqparent", ID2STR(getObjectId(B)) );
+        assocElement.setAttribute( "parent", ID2STR(getObjectId(B)) );
         qElement.appendChild( assocElement );
         return;
     }
@@ -201,7 +201,7 @@ bool UMLAssociation::load( TQDomElement & element ) {
         m_AssocType == Uml::at_Dependency) {
         for (unsigned r = Uml::A; r <= Uml::B; r++) {
             const TQString fetch = (m_AssocType == Uml::at_Generalization ?
-                                   r == Uml::A ? "child" : "tqparent"
+                                   r == Uml::A ? "child" : "parent"
                        : r == Uml::A ? "client" : "supplier");
             TQString roleIdStr = element.attribute(fetch, "");
             if (roleIdStr.isEmpty()) {
@@ -235,7 +235,7 @@ bool UMLAssociation::load( TQDomElement & element ) {
                     continue;
                 // Permitted tag names:
                 //  roleA: "child" "subtype" "client"
-                //  roleB: "tqparent" "supertype" "supplier"
+                //  roleB: "parent" "supertype" "supplier"
                 TQString idStr = tempElement.attribute( "xmi.id", "" );
                 if (idStr.isEmpty())
                     idStr = tempElement.attribute( "xmi.idref", "" );
@@ -335,7 +335,7 @@ bool UMLAssociation::load( TQDomElement & element ) {
         // In the old days, we could just record this on the association,
         // and be done with it. But thats not how the UML13.dtd does things.
         // As a result, we are checking roleA for information about the
-        // tqparent association (!) which by this point in the parse, should
+        // parent association (!) which by this point in the parse, should
         // be set. However, the information that the roles are allowed to have
         // is not complete, so we need to finish the analysis here.
 
diff --git a/umbrello/umbrello/association.h b/umbrello/umbrello/association.h
index f3cb5a6f..139a2eb6 100644
--- a/umbrello/umbrello/association.h
+++ b/umbrello/umbrello/association.h
@@ -258,7 +258,7 @@ protected:
      */
     bool load(TQDomElement& element);
 
-    // keep track of number of tqparent widgets
+    // keep track of number of parent widgets
     int nrof_parent_widgets;
 
     /**
diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index 3b4468f6..6ded541d 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -775,7 +775,7 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc)
         umla->nrof_parent_widgets--;
 
         // we are the last "owner" of this association, so delete it
-        // from the tqparent UMLDoc, and as a stand-alone
+        // from the parent UMLDoc, and as a stand-alone
         //DISCUSS: Should we really do this?
         //    It implies that an association's existence is ONLY
         //    governed by its existence on at least one diagram.
@@ -785,16 +785,16 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc)
         //    relies on (at least the way it's implemented now)
         // ANSWER: yes, we *should* do this.
         //   This only implies that IF an association once 'belonged'
-        //   to one or more tqparent associationwidgets, then it must 'die' when the
-        //   last widget does. UMLAssociations which never had a tqparent
+        //   to one or more parent associationwidgets, then it must 'die' when the
+        //   last widget does. UMLAssociations which never had a parent
         //   in the first place wont be affected by this code, and can happily
-        //   live on without a tqparent.
+        //   live on without a parent.
         //DISCUSS: Sorry Brian, but this breaks cut/paste.
         //    In particular, cut/paste means that the UMLAssociation _does_
-        //    have the assocwidget tqparent - the only means of doing a cut/paste
+        //    have the assocwidget parent - the only means of doing a cut/paste
         //    on the diagram is via the widgets. I.e. in practice there is no
         //    such thing as an "orphan" UMLAssociation.
-        //    BTW, IMHO the concept of a widget being the tqparent of a UML object
+        //    BTW, IMHO the concept of a widget being the parent of a UML object
         //    is fundamentally flawed. Widgets are pure presentation - they can
         //    come and go at a whim. If at all, the widgets could be considered
         //    tqchildren of the corresponding UML object.
@@ -3121,14 +3121,14 @@ void AssociationWidget::setUMLObject(UMLObject *obj) {
             setOperation(dynamic_cast<UMLOperation *>(obj));
             break;
         case Uml::ot_Attribute:
-            klass = static_cast<UMLClassifier*>(obj->tqparent());
+            klass = static_cast<UMLClassifier*>(obj->parent());
             connect(klass, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)),
                     this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*)));
             attr = static_cast<UMLAttribute*>(obj);
             connect(attr, TQT_SIGNAL(attributeChanged()), this, TQT_SLOT(slotAttributeChanged()));
             break;
         case Uml::ot_EntityAttribute:
-            ent = static_cast<UMLEntity*>(obj->tqparent());
+            ent = static_cast<UMLEntity*>(obj->parent());
             connect(ent, TQT_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)),
                     this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*)));
             break;
diff --git a/umbrello/umbrello/associationwidget.h b/umbrello/umbrello/associationwidget.h
index b6a9de63..fbbdf214 100644
--- a/umbrello/umbrello/associationwidget.h
+++ b/umbrello/umbrello/associationwidget.h
@@ -69,14 +69,14 @@ public:
     /**
      * Constructor.
      *
-     * @param view              The tqparent view of this widget.
+     * @param view              The parent view of this widget.
      */
     AssociationWidget(UMLView *view);
 
     /**
      * Constructor.
      *
-     * @param view      The tqparent view of this widget.
+     * @param view      The parent view of this widget.
      * @param WidgetA   Pointer to the role A widget for the association.
      * @param Type      The Association_Type for this association.
      * @param WidgetB   Pointer to the role B widget for the association.
diff --git a/umbrello/umbrello/attribute.cpp b/umbrello/umbrello/attribute.cpp
index d18f4d5e..9266c1f4 100644
--- a/umbrello/umbrello/attribute.cpp
+++ b/umbrello/umbrello/attribute.cpp
@@ -23,11 +23,11 @@
 #include "dialogs/umlattributedialog.h"
 #include "object_factory.h"
 
-UMLAttribute::UMLAttribute( const UMLObject *tqparent,
+UMLAttribute::UMLAttribute( const UMLObject *parent,
                             const TQString& name, Uml::IDType id,
                             Uml::Visibility s,
                             UMLObject *type, const TQString& iv )
-        : UMLClassifierListItem(tqparent, name, id) {
+        : UMLClassifierListItem(parent, name, id) {
     m_InitialValue = iv;
     m_BaseType = Uml::ot_Attribute;
     m_Vis = s;
@@ -40,7 +40,7 @@ UMLAttribute::UMLAttribute( const UMLObject *tqparent,
     m_pSecondary = type;
 }
 
-UMLAttribute::UMLAttribute(const UMLObject *tqparent) : UMLClassifierListItem(tqparent) {
+UMLAttribute::UMLAttribute(const UMLObject *parent) : UMLClassifierListItem(parent) {
     m_BaseType = Uml::ot_Attribute;
     m_Vis = Uml::Visibility::Private;
     m_ParmKind = Uml::pd_In;
@@ -88,15 +88,15 @@ TQString UMLAttribute::toString(Uml::Signature_Type sig) {
 
     if(sig == Uml::st_ShowSig || sig == Uml::st_SigNoVis) {
         // Determine whether the type name needs to be scoped.
-        UMLObject *owningObject = static_cast<UMLObject*>(tqparent());
+        UMLObject *owningObject = static_cast<UMLObject*>(parent());
         if (owningObject->getBaseType() == Uml::ot_Operation) {
-            // The immediate tqparent() is the UMLOperation but we want
+            // The immediate parent() is the UMLOperation but we want
             // the UMLClassifier:
-            owningObject = static_cast<UMLObject*>(owningObject->tqparent());
+            owningObject = static_cast<UMLObject*>(owningObject->parent());
         }
         UMLClassifier *ownParent = dynamic_cast<UMLClassifier*>(owningObject);
         if (ownParent == NULL) {
-            kError() << "UMLAttribute::toString: tqparent "
+            kError() << "UMLAttribute::toString: parent "
             << owningObject->getName()
             << " is not a UMLClassifier" << endl;
             return "";
@@ -129,15 +129,15 @@ TQString UMLAttribute::toString(Uml::Signature_Type sig) {
 TQString UMLAttribute::getFullyQualifiedName( const TQString& separator,
                                             bool includeRoot /* = false */) const {
     UMLOperation *op = NULL;
-    UMLObject *owningObject = static_cast<UMLObject*>(tqparent());
+    UMLObject *owningObject = static_cast<UMLObject*>(parent());
     if (owningObject->getBaseType() == Uml::ot_Operation) {
         op = static_cast<UMLOperation*>(owningObject);
-        owningObject = static_cast<UMLObject*>(owningObject->tqparent());
+        owningObject = static_cast<UMLObject*>(owningObject->parent());
     }
     UMLClassifier *ownParent = dynamic_cast<UMLClassifier*>(owningObject);
     if (ownParent == NULL) {
         kError() << "UMLAttribute::getFullyQualifiedName(" << m_Name
-        << "): tqparent " << owningObject->getName()
+        << "): parent " << owningObject->getName()
         << " is not a UMLClassifier" << endl;
         return "";
     }
@@ -168,7 +168,7 @@ bool UMLAttribute::operator==( UMLAttribute &rhs) {
 
 void UMLAttribute::copyInto(UMLAttribute *rhs) const
 {
-    // call the tqparent first.
+    // call the parent first.
     UMLClassifierListItem::copyInto(rhs);
 
     // Copy all datamembers
@@ -180,8 +180,8 @@ void UMLAttribute::copyInto(UMLAttribute *rhs) const
 
 UMLObject* UMLAttribute::clone() const
 {
-    //FIXME: The new attribute should be slaved to the NEW tqparent not the old.
-    UMLAttribute *clone = new UMLAttribute( static_cast<UMLObject*>(tqparent()) );
+    //FIXME: The new attribute should be slaved to the NEW parent not the old.
+    UMLAttribute *clone = new UMLAttribute( static_cast<UMLObject*>(parent()) );
     copyInto(clone);
 
     return clone;
@@ -249,8 +249,8 @@ bool UMLAttribute::load( TQDomElement & element ) {
     return true;
 }
 
-bool UMLAttribute::showPropertiesDialog(TQWidget* tqparent) {
-    UMLAttributeDialog dialog(tqparent, this);
+bool UMLAttribute::showPropertiesDialog(TQWidget* parent) {
+    UMLAttributeDialog dialog(parent, this);
     return dialog.exec();
 }
 
diff --git a/umbrello/umbrello/attribute.h b/umbrello/umbrello/attribute.h
index ab904874..4f900389 100644
--- a/umbrello/umbrello/attribute.h
+++ b/umbrello/umbrello/attribute.h
@@ -32,14 +32,14 @@ public:
     /**
      * Sets up an attribute.
      *
-     * @param tqparent    The tqparent of this UMLAttribute.
+     * @param parent    The parent of this UMLAttribute.
      * @param name      The name of this UMLAttribute.
      * @param id        The unique id given to this UMLAttribute.
      * @param s         The visibility of the UMLAttribute.
      * @param type      The type of this UMLAttribute.
      * @param iv        The initial value of the attribute.
      */
-    UMLAttribute(const UMLObject *tqparent, const TQString& name,
+    UMLAttribute(const UMLObject *parent, const TQString& name,
                  Uml::IDType id = Uml::id_None,
                  Uml::Visibility s = Uml::Visibility::Private,
                  UMLObject *type = 0, const TQString& iv = 0);
@@ -47,9 +47,9 @@ public:
     /**
      * Sets up an attribute.
      *
-     * @param tqparent    The tqparent of this UMLAttribute.
+     * @param parent    The parent of this UMLAttribute.
      */
-    UMLAttribute(const UMLObject *tqparent);
+    UMLAttribute(const UMLObject *parent);
 
     /**
      * Overloaded '==' operator
@@ -121,7 +121,7 @@ public:
     /**
      * Display the properties configuration dialog for the attribute.
      */
-    virtual bool showPropertiesDialog(TQWidget* tqparent);
+    virtual bool showPropertiesDialog(TQWidget* parent);
 
     void setParmKind (Uml::Parameter_Direction pk);
     Uml::Parameter_Direction getParmKind () const;
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index 7df110fb..e47911e6 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -20,8 +20,8 @@
 #include <kdebug.h>
 
 
-AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const char *name)
-        :MyDialog1(tqparent, name)
+AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *parent, const char *name)
+        :MyDialog1(parent, name)
 {
     view=v;
     readConfig(c);
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index ece6fc5f..f2614d03 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -23,7 +23,7 @@ class AutolayoutDlg : public MyDialog1
     Q_OBJECT
   TQ_OBJECT
   public:
-    AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *tqparent = 0, const char *name = 0);
+    AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *parent = 0, const char *name = 0);
   public slots:
     virtual void slotSetAssociationWeight(int i);
     virtual void slotSetDependenciesWeight(int i);
diff --git a/umbrello/umbrello/boxwidget.h b/umbrello/umbrello/boxwidget.h
index 02e56eb8..13f7e480 100644
--- a/umbrello/umbrello/boxwidget.h
+++ b/umbrello/umbrello/boxwidget.h
@@ -35,7 +35,7 @@ public:
     /**
      * Constructs a BoxWidget.
      *
-     * @param view              The tqparent to this widget.
+     * @param view              The parent to this widget.
      * @param id                The ID to assign (-1 will prompt a new ID.)
      */
     explicit BoxWidget(UMLView * view, Uml::IDType id = Uml::id_None);
@@ -52,7 +52,7 @@ public:
 
     /**
      * Saves the widget to the "boxwidget" XMI element.
-     * Note: For loading from XMI, the inherited tqparent method is used.
+     * Note: For loading from XMI, the inherited parent method is used.
      */
     void saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement);
 };
diff --git a/umbrello/umbrello/classifier.cpp b/umbrello/umbrello/classifier.cpp
index 167bf674..4b8e0bc0 100644
--- a/umbrello/umbrello/classifier.cpp
+++ b/umbrello/umbrello/classifier.cpp
@@ -571,7 +571,7 @@ UMLAttribute* UMLClassifier::addAttribute(const TQString &name, UMLObject *type,
 bool UMLClassifier::addAttribute(UMLAttribute* att, IDChangeLog* Log /* = 0 */,
                                  int position /* = -1 */) {
     if (findChildObject(att->getName()) == NULL) {
-        att->tqparent()->removeChild( att );
+        att->parent()->removeChild( att );
         this->insertChild( att );
         if (position >= 0 && position < (int)m_List.count())
             m_List.insert(position, att);
@@ -636,10 +636,10 @@ UMLOperationList UMLClassifier::getOpList(bool includeInherited) {
         for (UMLClassifierListIt pit(parents); (c = pit.current()) != NULL; ++pit) {
             if (c == this) {
                 kError() << "UMLClassifier::getOpList: class " << c->getName()
-                    << " is tqparent of itself ?!?" << endl;
+                    << " is parent of itself ?!?" << endl;
                 continue;
             }
-            // get operations for each tqparent by recursive call
+            // get operations for each parent by recursive call
             UMLOperationList pops = c->getOpList(true);
             // add these operations to operation list, but only if unique.
             for (UMLOperation *po = pops.first(); po; po = pops.next()) {
@@ -684,7 +684,7 @@ UMLTemplate* UMLClassifier::addTemplate(const TQString &name, Uml::IDType id) {
 bool UMLClassifier::addTemplate(UMLTemplate* newTemplate, IDChangeLog* log /* = 0*/) {
     TQString name = newTemplate->getName();
     if (findChildObject(name) == NULL) {
-        newTemplate->tqparent()->removeChild(newTemplate);
+        newTemplate->parent()->removeChild(newTemplate);
         this->insertChild(newTemplate);
         m_List.append(newTemplate);
         emit templateAdded(newTemplate);
@@ -702,7 +702,7 @@ bool UMLClassifier::addTemplate(UMLTemplate* Template, int position)
 {
     TQString name = Template->getName();
     if (findChildObject(name) == NULL) {
-        Template->tqparent()->removeChild(Template);
+        Template->parent()->removeChild(Template);
         this->insertChild(Template);
         if( position >= 0 && position <= (int)m_List.count() )
             m_List.insert(position,Template);
diff --git a/umbrello/umbrello/classifier.h b/umbrello/umbrello/classifier.h
index 56dde52c..495f4812 100644
--- a/umbrello/umbrello/classifier.h
+++ b/umbrello/umbrello/classifier.h
@@ -152,7 +152,7 @@ public:
      * no new method is created and the existing operation is returned.
      * If no name is provided, or if the params are NULL, an Operation
      * Dialog is shown to ask the user for a name and parameters.
-     * The operation's signature is checked for validity within the tqparent
+     * The operation's signature is checked for validity within the parent
      * classifier.
      *
      * @param name              The operation name (will be chosen internally if
@@ -325,7 +325,7 @@ public:
 
     /**
      * Needs to be called after all UML objects are loaded from file.
-     * Calls the tqparent resolveRef(), and calls resolveRef() on all
+     * Calls the parent resolveRef(), and calls resolveRef() on all
      * UMLClassifierListItems.
      * Overrides the method from UMLObject.
      *
diff --git a/umbrello/umbrello/classifiercodedocument.cpp b/umbrello/umbrello/classifiercodedocument.cpp
index d5335a34..29e4bd88 100644
--- a/umbrello/umbrello/classifiercodedocument.cpp
+++ b/umbrello/umbrello/classifiercodedocument.cpp
@@ -38,9 +38,9 @@
 // Constructors/Destructors
 //
 
-ClassifierCodeDocument::ClassifierCodeDocument ( UMLClassifier * tqparent )
+ClassifierCodeDocument::ClassifierCodeDocument ( UMLClassifier * parent )
 {
-    init (tqparent);
+    init (parent);
 }
 
 ClassifierCodeDocument::~ClassifierCodeDocument ( )
@@ -344,7 +344,7 @@ void ClassifierCodeDocument::addCodeClassFieldMethods(CodeClassFieldList &list )
 
 // add declaration blocks for the passed classfields
 void ClassifierCodeDocument::declareClassFields (CodeClassFieldList & list ,
-        CodeGenObjectWithTextBlocks * tqparent )
+        CodeGenObjectWithTextBlocks * parent )
 {
 
     for (CodeClassFieldListIt ccflit(list); ccflit.current(); ++ccflit)
@@ -356,18 +356,18 @@ void ClassifierCodeDocument::declareClassFields (CodeClassFieldList & list ,
                         // if it has a tag, check
                         if(!declBlock->getTag().isEmpty())
                         {
-                                // In C++, because we may shift the declaration to a different tqparent
+                                // In C++, because we may shift the declaration to a different parent
                                 // block for a change in scope, we need to track down any pre-existing
-                                // location, and remove FIRST before adding to new tqparent
+                                // location, and remove FIRST before adding to new parent
                                 CodeGenObjectWithTextBlocks * oldParent = findParentObjectForTaggedTextBlock (declBlock->getTag());
                                 if(oldParent) {
-                                        if(oldParent != tqparent)
+                                        if(oldParent != parent)
                                                 oldParent->removeTextBlock(declBlock);
                                 }
                         }
         */
 
-        tqparent->addTextBlock(declBlock); // wont add it IF its already present. Will give it a tag if missing
+        parent->addTextBlock(declBlock); // wont add it IF its already present. Will give it a tag if missing
 
     }
 }
@@ -573,8 +573,8 @@ void ClassifierCodeDocument::addAssociationClassField (UMLAssociation * a, bool
 void ClassifierCodeDocument::setAttributesFromNode ( TQDomElement & elem )
 {
 
-    // NOTE: we DON'T set the tqparent here as we ONLY get to this point
-    // IF the tqparent codegenerator could find a matching tqparent classifier
+    // NOTE: we DON'T set the parent here as we ONLY get to this point
+    // IF the parent codegenerator could find a matching parent classifier
     // that already has a code document.
 
     // We FIRST set code class field stuff..check re-linnking with
@@ -599,7 +599,7 @@ void ClassifierCodeDocument::setAttributesFromNode ( TQDomElement & elem )
 }
 
 // look at all classfields currently in document.. match up
-// by tqparent object ID and Role ID (needed for self-association CF's)
+// by parent object ID and Role ID (needed for self-association CF's)
 CodeClassField *
 ClassifierCodeDocument::findCodeClassFieldFromParentID (Uml::IDType id,
         int role_id)
@@ -619,7 +619,7 @@ ClassifierCodeDocument::findCodeClassFieldFromParentID (Uml::IDType id,
     }
 
     // shouldn't happen..
-    kError() << "Failed to find codeclassfield for tqparent uml id:"
+    kError() << "Failed to find codeclassfield for parent uml id:"
     << ID2STR(id) << " (role id:" << role_id
     << ") Do you have a corrupt classifier code document?"
     << endl;
@@ -640,7 +640,7 @@ void ClassifierCodeDocument::loadClassFieldsFromXMI( TQDomElement & elem) {
             CodeClassField * cf = findCodeClassFieldFromParentID(STR2ID(id), role_id);
             if(cf)
             {
-                // Because we just may change the tqparent object here,
+                // Because we just may change the parent object here,
                 // we need to yank it from the map of umlobjects
                 m_classFieldMap.remove(cf->getParentObject());
 
diff --git a/umbrello/umbrello/classifiercodedocument.h b/umbrello/umbrello/classifiercodedocument.h
index 33aed6ad..dfdb4438 100644
--- a/umbrello/umbrello/classifiercodedocument.h
+++ b/umbrello/umbrello/classifiercodedocument.h
@@ -52,7 +52,7 @@ public:
     /**
      * Empty Constructor
      */
-    ClassifierCodeDocument ( UMLClassifier * tqparent );
+    ClassifierCodeDocument ( UMLClassifier * parent );
 
     /**
      * Empty Destructor
@@ -79,12 +79,12 @@ public:
     // some Utility methods
 
     /**
-     * Return if the tqparent classifier is an interface
+     * Return if the parent classifier is an interface
      */
     bool parentIsInterface();
 
     /**
-     * Return if the tqparent classifier is a class
+     * Return if the parent classifier is a class
      */
     bool parentIsClass();
 
@@ -133,11 +133,11 @@ public:
      */
     CodeClassFieldList getSpecificClassFields (CodeClassField::ClassFieldType cfType, bool isStatic, Uml::Visibility visibility);
 
-    /** Using the tqparent object's UML ID, find the corresponding
+    /** Using the parent object's UML ID, find the corresponding
      * codeclassfield object in this classifiercodedocument. Returns
      * NULL if no such codeclassfield object exists in this document.
      *
-     * @param id       ID of the tqparent object
+     * @param id       ID of the parent object
      * @param role_id  0 for role A of the asssociation
      *                 1 for role B of the asssociation
      *                -1 if this is an attribute.
@@ -198,11 +198,11 @@ protected:
     TextBlock * findCodeClassFieldTextBlockByTag (const TQString &tag);
 
     // add the declaration text blocks for various classfields
-    void declareClassFields (CodeClassFieldList & list , CodeGenObjectWithTextBlocks * tqparent);
+    void declareClassFields (CodeClassFieldList & list , CodeGenObjectWithTextBlocks * parent);
 
     virtual void updateContent( ) = 0;
 
-    // force syncronization of child classfields to their tqparent objects
+    // force syncronization of child classfields to their parent objects
     void syncClassFields( );
 
     // IF the classifier object is modified, this will get called.
@@ -219,7 +219,7 @@ private:
     // based on UMLRoles (e.g. derived from associations with other classifiers).
     void updateAssociationClassFields ( UMLAssociationList &assocList );
 
-    // update code operations in this document using the tqparent classifier
+    // update code operations in this document using the parent classifier
     void updateOperations( );
 
     /**
@@ -237,7 +237,7 @@ private:
 public slots:
 
     /**
-     * Synchronize this document to the attributes/associations of the tqparent classifier.
+     * Synchronize this document to the attributes/associations of the parent classifier.
      */
     void addAttributeClassField(UMLClassifierListItem *at, bool syncToParentIfAdded = true);
     void addAssociationClassField (UMLAssociation * assoc, bool syncToParentIfAdded = true);
diff --git a/umbrello/umbrello/classifierlistitem.cpp b/umbrello/umbrello/classifierlistitem.cpp
index 0e3fc206..60e5b7bf 100644
--- a/umbrello/umbrello/classifierlistitem.cpp
+++ b/umbrello/umbrello/classifierlistitem.cpp
@@ -23,18 +23,18 @@
 #include "model_utils.h"
 #include "object_factory.h"
 
-UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent,
+UMLClassifierListItem::UMLClassifierListItem(const UMLObject *parent,
                                              const TQString& name, Uml::IDType id)
-        : UMLObject(tqparent, name, id) {
-    UMLObject *parentObj = const_cast<UMLObject*>(tqparent);
+        : UMLObject(parent, name, id) {
+    UMLObject *parentObj = const_cast<UMLObject*>(parent);
     UMLClassifier *pc = dynamic_cast<UMLClassifier*>(parentObj);
     if (pc)
         UMLObject::setUMLPackage(pc);
 }
 
-UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent)
-        : UMLObject(tqparent) {
-    UMLObject *parentObj = const_cast<UMLObject*>(tqparent);
+UMLClassifierListItem::UMLClassifierListItem(const UMLObject *parent)
+        : UMLObject(parent) {
+    UMLObject *parentObj = const_cast<UMLObject*>(parent);
     UMLClassifier *pc = dynamic_cast<UMLClassifier*>(parentObj);
     if (pc)
         UMLObject::setUMLPackage(pc);
@@ -45,7 +45,7 @@ UMLClassifierListItem::~UMLClassifierListItem() {
 
 void UMLClassifierListItem::copyInto(UMLClassifierListItem *rhs) const
 {
-    // Call the tqparent.
+    // Call the parent.
     UMLObject::copyInto(rhs);
 }
 
diff --git a/umbrello/umbrello/classifierlistitem.h b/umbrello/umbrello/classifierlistitem.h
index aba5dd86..c7333150 100644
--- a/umbrello/umbrello/classifierlistitem.h
+++ b/umbrello/umbrello/classifierlistitem.h
@@ -35,30 +35,30 @@ public:
     /**
      * Constructor.  Empty.
      *
-     * @param tqparent    The tqparent to this operation.
+     * @param parent    The parent to this operation.
      *          At first sight it would appear that the type of the
-     *          tqparent should be UMLClassifier. However, the class
+     *          parent should be UMLClassifier. However, the class
      *          UMLAttribute is also used for the parameters of
      *          operations, and in this case the UMLOperation is the
-     *          tqparent.
+     *          parent.
      * @param name              The name of the operation.
      * @param id                The id of the operation.
      */
-    UMLClassifierListItem(const UMLObject *tqparent,
+    UMLClassifierListItem(const UMLObject *parent,
                           const TQString& name,
                           Uml::IDType id = Uml::id_None);
 
     /**
      * Constructor.  Empty.
      *
-     * @param tqparent    The tqparent to this operation.
+     * @param parent    The parent to this operation.
      *          At first sight it would appear that the type of the
-     *          tqparent should be UMLClassifier. However, the class
+     *          parent should be UMLClassifier. However, the class
      *          UMLAttribute is also used for the parameters of
      *          operations, and in this case the UMLOperation is the
-     *          tqparent.
+     *          parent.
      */
-    UMLClassifierListItem(const UMLObject *tqparent);
+    UMLClassifierListItem(const UMLObject *parent);
 
     /**
      * Destructor.  Empty.
@@ -105,10 +105,10 @@ public:
     /**
      * Display the properties configuration dialog for the list item.
      *
-     * @param tqparent    The tqparent widget.
+     * @param parent    The parent widget.
      * @return  True for success of this operation.
      */
-    virtual bool showPropertiesDialog(TQWidget* tqparent) = 0;
+    virtual bool showPropertiesDialog(TQWidget* parent) = 0;
 
     /**
      * Copy the internal presentation of this object into the new
diff --git a/umbrello/umbrello/classifierwidget.h b/umbrello/umbrello/classifierwidget.h
index 4fa1041d..b92b774f 100644
--- a/umbrello/umbrello/classifierwidget.h
+++ b/umbrello/umbrello/classifierwidget.h
@@ -30,7 +30,7 @@ public:
     /**
      * Constructs a ClassifierWidget.
      *
-     * @param view      The tqparent of this ClassifierWidget.
+     * @param view      The parent of this ClassifierWidget.
      * @param o The UMLObject to represent.
      */
     ClassifierWidget(UMLView * view, UMLClassifier * o);
diff --git a/umbrello/umbrello/clipboard/umlclipboard.cpp b/umbrello/umbrello/clipboard/umlclipboard.cpp
index ec5b6c84..d654e083 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.cpp
+++ b/umbrello/umbrello/clipboard/umlclipboard.cpp
@@ -290,14 +290,14 @@ bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemLis
     return true;
 }
 
-bool UMLClipboard::pasteChildren(UMLListViewItem *tqparent, IDChangeLog *chgLog) {
-    if (!tqparent) {
-        kWarning() << "Paste Children Error, tqparent missing" << endl;
+bool UMLClipboard::pasteChildren(UMLListViewItem *parent, IDChangeLog *chgLog) {
+    if (!parent) {
+        kWarning() << "Paste Children Error, parent missing" << endl;
         return false;
     }
     UMLDoc *doc = UMLApp::app()->getDocument();
     UMLListView *listView = UMLApp::app()->getListView();
-    UMLListViewItem *childItem = static_cast<UMLListViewItem*>(tqparent->firstChild());
+    UMLListViewItem *childItem = static_cast<UMLListViewItem*>(parent->firstChild());
     while (childItem) {
         Uml::IDType oldID = childItem->getID();
         Uml::IDType newID = chgLog->findNewID(oldID);
@@ -571,9 +571,9 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
             (lvitem->getType() != Uml::lvt_Class && lvitem->getType() != Uml::lvt_Interface)) {
         return false;
     }
-    UMLClassifier *tqparent = dynamic_cast<UMLClassifier *>(lvitem->getUMLObject());
-    if (tqparent == NULL) {
-        kError() << "UMLClipboard::pasteClip5: tqparent is not a UMLClassifier"
+    UMLClassifier *parent = dynamic_cast<UMLClassifier *>(lvitem->getUMLObject());
+    if (parent == NULL) {
+        kError() << "UMLClipboard::pasteClip5: parent is not a UMLClassifier"
         << endl;
         return false;
     }
@@ -581,7 +581,7 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
     UMLObjectList objects;
     objects.setAutoDelete(false);
     IDChangeLog* idchanges = 0;
-    bool result = UMLDrag::decodeClip5(data, objects, tqparent);
+    bool result = UMLDrag::decodeClip5(data, objects, parent);
 
     if(!result) {
         return false;
@@ -599,16 +599,16 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
         switch(obj->getBaseType()) {
         case Uml::ot_Attribute :
             {
-                UMLObject *exist = tqparent->findChildObject(obj->getName(), Uml::ot_Attribute);
+                UMLObject *exist = parent->findChildObject(obj->getName(), Uml::ot_Attribute);
                 if (exist) {
-                    TQString newName = tqparent->uniqChildName(Uml::ot_Attribute, obj->getName());
+                    TQString newName = parent->uniqChildName(Uml::ot_Attribute, obj->getName());
                     obj->setName(newName);
                 }
                 UMLAttribute *att = static_cast<UMLAttribute*>(obj);
-                if (tqparent->addAttribute(att, idchanges)) {
+                if (parent->addAttribute(att, idchanges)) {
                     result = true;
                 } else {
-                    kError() << "UMLClipboard::pasteClip5: " << tqparent->getName()
+                    kError() << "UMLClipboard::pasteClip5: " << parent->getName()
                         << "->addAttribute(" << att->getName() << ") failed" << endl;
                 }
                 break;
@@ -616,15 +616,15 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
         case Uml::ot_Operation :
             {
                 UMLOperation *op = static_cast<UMLOperation*>(obj);
-                UMLOperation *exist = tqparent->checkOperationSignature(op->getName(), op->getParmList());
+                UMLOperation *exist = parent->checkOperationSignature(op->getName(), op->getParmList());
                 if (exist) {
-                    TQString newName = tqparent->uniqChildName(Uml::ot_Operation, obj->getName());
+                    TQString newName = parent->uniqChildName(Uml::ot_Operation, obj->getName());
                     op->setName(newName);
                 }
-                if (tqparent->addOperation(op, idchanges)) {
+                if (parent->addOperation(op, idchanges)) {
                     result = true;
                 } else {
-                    kError() << "UMLClipboard::pasteClip5: " << tqparent->getName()
+                    kError() << "UMLClipboard::pasteClip5: " << parent->getName()
                         << "->addOperation(" << op->getName() << ") failed" << endl;
                 }
                 break;
diff --git a/umbrello/umbrello/clipboard/umlclipboard.h b/umbrello/umbrello/clipboard/umlclipboard.h
index b7a42e2e..b0607ef2 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.h
+++ b/umbrello/umbrello/clipboard/umlclipboard.h
@@ -183,7 +183,7 @@ private:
     /**
      * Pastes the tqchildren of a UMLListViewItem (The Parent)
      */
-    bool pasteChildren(UMLListViewItem* tqparent, IDChangeLog *chgLog);
+    bool pasteChildren(UMLListViewItem* parent, IDChangeLog *chgLog);
 
     /**
      * Gives a `sorry' message box if you're pasting an item which
diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp
index 6fb0be93..543a4b39 100644
--- a/umbrello/umbrello/clipboard/umldrag.cpp
+++ b/umbrello/umbrello/clipboard/umldrag.cpp
@@ -439,12 +439,12 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects
     while ( !diagramElement.isNull() ) {
         TQString type = diagramElement.attribute("type", "0");
         Uml::Diagram_Type dt = (Uml::Diagram_Type)type.toInt();
-        UMLListViewItem *tqparent = listView->findFolderForDiagram(dt);
-        if (tqparent == NULL)
+        UMLListViewItem *parent = listView->findFolderForDiagram(dt);
+        if (parent == NULL)
             return false;
-        UMLObject *po = tqparent->getUMLObject();
+        UMLObject *po = parent->getUMLObject();
         if (po == NULL || po->getBaseType() != Uml::ot_Folder) {
-            kError() << "UMLDrag::decodeClip2: bad tqparent for view" << endl;
+            kError() << "UMLDrag::decodeClip2: bad parent for view" << endl;
             return false;
         }
         UMLFolder *f = static_cast<UMLFolder*>(po);
@@ -584,8 +584,8 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u
             continue;
         }
         Uml::ListView_Type t = (Uml::ListView_Type)(type.toInt());
-        UMLListViewItem* tqparent = parentListView->determineParentItem(t);
-        UMLListViewItem* itemData = new UMLListViewItem(tqparent);
+        UMLListViewItem* parent = parentListView->determineParentItem(t);
+        UMLListViewItem* itemData = new UMLListViewItem(parent);
         if ( itemData->loadFromXMI(listItemElement) )
             umlListViewItems.append(itemData);
         else
diff --git a/umbrello/umbrello/codeaccessormethod.cpp b/umbrello/umbrello/codeaccessormethod.cpp
index 938aa88f..e7890865 100644
--- a/umbrello/umbrello/codeaccessormethod.cpp
+++ b/umbrello/umbrello/codeaccessormethod.cpp
@@ -59,8 +59,8 @@ bool CodeAccessorMethod::parentIsAttribute( ) {
 }
 
 /**
- * Utility method to get the value of the tqparent object of the tqparent classifield.
- * @return the value of the tqparent of the tqparent classfield
+ * Utility method to get the value of the parent object of the parent classifield.
+ * @return the value of the parent of the parent classfield
  */
 /*
 UMLObject * CodeAccessorMethod::getParentObject ( ) {
@@ -92,7 +92,7 @@ void CodeAccessorMethod::release () {
     // do nothing
 }
 
-// ok, a method so the tqparent can force it to release
+// ok, a method so the parent can force it to release
 void CodeAccessorMethod::forceRelease () {
     if(m_parentclassfield)
         m_parentclassfield->disconnect(this);
@@ -142,8 +142,8 @@ void CodeAccessorMethod::setAttributesFromNode ( TQDomElement & root) {
 
     /*
         // I don't believe this is needed for a load from XMI. We never delete
-        // accessor methods from the tqparent classfield.. they are essentially
-        // in composition with the tqparent class and are arent meant to be out
+        // accessor methods from the parent classfield.. they are essentially
+        // in composition with the parent class and are arent meant to be out
         // on their own. Well, this is fine for now, but IF we start allowing
         // clipping and pasting of these methods between classes/ classfields
         // then we may have problems (ugh.. I cant imagine allowing this, but
@@ -158,7 +158,7 @@ void CodeAccessorMethod::setAttributesFromNode ( TQDomElement & root) {
         if(newCF)
                 initFields(newCF);
         else
-                kError()<<"ERROR: code accessor method cant load tqparent codeclassfield, corrupt file?"<<endl;
+                kError()<<"ERROR: code accessor method cant load parent codeclassfield, corrupt file?"<<endl;
 
     */
     // now load/set other local attributes
diff --git a/umbrello/umbrello/codeaccessormethod.h b/umbrello/umbrello/codeaccessormethod.h
index 14289e74..2e8457a2 100644
--- a/umbrello/umbrello/codeaccessormethod.h
+++ b/umbrello/umbrello/codeaccessormethod.h
@@ -66,7 +66,7 @@ public:
      */
     void setType ( AccessorType type);
 
-    /** Utility method to get the value of the tqparent object of the tqparent classifield.
+    /** Utility method to get the value of the parent object of the parent classifield.
     */
     // virtual UMLObject * getParentObject();
 
@@ -104,7 +104,7 @@ protected:
 
     virtual void updateContent() = 0;
 
-    // a method so the tqparent code classfield can force code block to release
+    // a method so the parent code classfield can force code block to release
     void forceRelease ();
 
 private:
diff --git a/umbrello/umbrello/codeblock.h b/umbrello/umbrello/codeblock.h
index 49ad0fe1..b6ec86dd 100644
--- a/umbrello/umbrello/codeblock.h
+++ b/umbrello/umbrello/codeblock.h
@@ -44,8 +44,8 @@ public:
     /** constructor with TQString so we can create & populate it in
      * one step.
      */
-    explicit CodeBlock ( CodeDocument * tqparent, const TQString & body = "");
-    explicit CodeBlock ( HierarchicalCodeBlock * tqparent, const TQString & body = "" );
+    explicit CodeBlock ( CodeDocument * parent, const TQString & body = "");
+    explicit CodeBlock ( HierarchicalCodeBlock * parent, const TQString & body = "" );
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/codeblockwithcomments.cpp b/umbrello/umbrello/codeblockwithcomments.cpp
index b4a92825..07709cf8 100644
--- a/umbrello/umbrello/codeblockwithcomments.cpp
+++ b/umbrello/umbrello/codeblockwithcomments.cpp
@@ -34,10 +34,10 @@ CodeBlockWithComments::CodeBlockWithComments ( HierarchicalCodeBlock * hb, const
     initFields(hb->getParentDocument(), comment);
 }
 
-CodeBlockWithComments::CodeBlockWithComments ( CodeDocument * tqparent , const TQString & body, const TQString & comment)
-        : CodeBlock (tqparent, body)
+CodeBlockWithComments::CodeBlockWithComments ( CodeDocument * parent , const TQString & body, const TQString & comment)
+        : CodeBlock (parent, body)
 {
-    initFields(tqparent, comment);
+    initFields(parent, comment);
 }
 
 CodeBlockWithComments::~CodeBlockWithComments ( ) { }
@@ -171,9 +171,9 @@ void CodeBlockWithComments::setOverallIndentationLevel ( int level )
     m_comment->setIndentationLevel(level);
 }
 
-void CodeBlockWithComments::initFields(CodeDocument *tqparent, const TQString& comment)
+void CodeBlockWithComments::initFields(CodeDocument *parent, const TQString& comment)
 {
-    CodeComment * codecomment = CodeGenFactory::newCodeComment(tqparent);
+    CodeComment * codecomment = CodeGenFactory::newCodeComment(parent);
     codecomment->setText(comment);
     m_comment = codecomment;
 }
diff --git a/umbrello/umbrello/codeblockwithcomments.h b/umbrello/umbrello/codeblockwithcomments.h
index ee7b88eb..3b5d3f66 100644
--- a/umbrello/umbrello/codeblockwithcomments.h
+++ b/umbrello/umbrello/codeblockwithcomments.h
@@ -101,7 +101,7 @@ private:
 
     CodeComment * m_comment;
 
-    void initFields(CodeDocument *tqparent, const TQString& comment);
+    void initFields(CodeDocument *parent, const TQString& comment);
 
 };
 
diff --git a/umbrello/umbrello/codeclassfield.cpp b/umbrello/umbrello/codeclassfield.cpp
index 0ed3a1f4..60e97c77 100644
--- a/umbrello/umbrello/codeclassfield.cpp
+++ b/umbrello/umbrello/codeclassfield.cpp
@@ -52,7 +52,7 @@ CodeClassField::CodeClassField ( ClassifierCodeDocument * doc , UMLAttribute * a
 
 CodeClassField::~CodeClassField ( ) {
 
-    // remove methods from tqparent document
+    // remove methods from parent document
     CodeAccessorMethodList list = m_methodVector;
     for(CodeAccessorMethod * m = list.first(); m ; m=list.next())
     {
@@ -61,7 +61,7 @@ CodeClassField::~CodeClassField ( ) {
     }
     list.clear();
 
-    // clear the decl block from tqparent text block list too
+    // clear the decl block from parent text block list too
     if(m_declCodeBlock)
     {
         getParentDocument()->removeTextBlock(m_declCodeBlock);
@@ -270,10 +270,10 @@ void CodeClassField::setAttributesFromNode ( TQDomElement & root) {
     // always disconnect
     getParentObject()->disconnect(this);
 
-    // superclass call.. may reset the tqparent object
+    // superclass call.. may reset the parent object
     CodeParameter::setAttributesFromNode(root);
 
-    // make AFTER super-class call. This will reconnect to the tqparent
+    // make AFTER super-class call. This will reconnect to the parent
     // and re-check we have all needed child accessor methods and decl blocks
     initFields( );
 
@@ -301,7 +301,7 @@ void CodeClassField::setAttributesFromNode ( TQDomElement & root) {
 
             } else
                 if( tag == "header" ) {
-                    // this is treated in tqparent.. skip over here
+                    // this is treated in parent.. skip over here
                 } else
                     kWarning()<<"ERROR: bad savefile? code classfield loadFromXMI got child element with unknown tag:"<<tag<<" ignoring node."<<endl;
 
@@ -482,7 +482,7 @@ void CodeClassField::updateContent()
 {
 
     // Set properties for writing out the various methods derived from UMLRoles.
-    // I suppose this could be supported under individual accessor method synctotqparent
+    // I suppose this could be supported under individual accessor method synctoparent
     // calls, but its going to happen again and again for many languages. Why not a catch
     // all here? -b.t.
     if (parentIsAttribute())
@@ -569,7 +569,7 @@ void CodeClassField::updateContent()
     }
 }
 
-// determine whether the tqparent object in this classfield indicates that it is
+// determine whether the parent object in this classfield indicates that it is
 // a single variable or a List (Vector). One day this will be done correctly with special
 // multiplicity object that we don't have to figure out what it means via regex.
 bool CodeClassField::fieldIsSingleValue ( )
diff --git a/umbrello/umbrello/codeclassfield.h b/umbrello/umbrello/codeclassfield.h
index a1674318..bbc3c8d6 100644
--- a/umbrello/umbrello/codeclassfield.h
+++ b/umbrello/umbrello/codeclassfield.h
@@ -103,7 +103,7 @@ public:
      */
     CodeAccessorMethod * findMethodByType(CodeAccessorMethod::AccessorType type, int role_id = -1);
 
-    /** Determine whether the tqparent object in this classfield indicates that it is
+    /** Determine whether the parent object in this classfield indicates that it is
      *  a single variable or a List (Vector). One day this will be done correctly with special
      *  multiplicity object.
      */
@@ -114,7 +114,7 @@ public:
      */
     ClassFieldType getClassFieldType();
 
-    // quick utility call to figure out if tqparent is an attribute or not
+    // quick utility call to figure out if parent is an attribute or not
     bool parentIsAttribute ( );
 
     // get the type of object that will be added/removed from lists
@@ -164,7 +164,7 @@ public:
 
 protected:
 
-    /** Set the tqparent UMLobject appropriately.
+    /** Set the parent UMLobject appropriately.
      */
     void setParentUMLObject (UMLObject * obj);
 
diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.cpp b/umbrello/umbrello/codeclassfielddeclarationblock.cpp
index 7c4f5af6..ba7c6878 100644
--- a/umbrello/umbrello/codeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codeclassfielddeclarationblock.cpp
@@ -51,7 +51,7 @@ CodeClassField * CodeClassFieldDeclarationBlock::getParentClassField ( ) {
     return m_parentclassfield;
 }
 
-/** Get the tqparent object of the parentCodeClassfield
+/** Get the parent object of the parentCodeClassfield
  */
 UMLObject * CodeClassFieldDeclarationBlock::getParentObject ( ) {
     return m_parentclassfield->getParentObject();
@@ -143,10 +143,10 @@ void CodeClassFieldDeclarationBlock::syncToParent () {
     // the name of the role is not defined.
     if(!(getParentClassField()->parentIsAttribute()))
     {
-        UMLRole * tqparent = dynamic_cast<UMLRole*>(getParentObject());
-        if (tqparent == NULL)
+        UMLRole * parent = dynamic_cast<UMLRole*>(getParentObject());
+        if (parent == NULL)
             return;
-        if(tqparent->getName().isEmpty())
+        if(parent->getName().isEmpty())
         {
             getComment()->setWriteOutText(false);
             setWriteOutText(false);
diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.h b/umbrello/umbrello/codeclassfielddeclarationblock.h
index add38fa8..3233c8f7 100644
--- a/umbrello/umbrello/codeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codeclassfielddeclarationblock.h
@@ -28,7 +28,7 @@ class CodeClassField;
   * class CodeClassFieldDeclarationBlock
   * Used to declare classifier fields (e.g. either class attributes or classifier
   * associations) in the code document for any given code classfield. This is a
-  * special CodeBlockWithComments which is "sync'd" to the tqparent CodeClassField.
+  * special CodeBlockWithComments which is "sync'd" to the parent CodeClassField.
   */
 
 class CodeClassFieldDeclarationBlock : public CodeBlockWithComments, public OwnedCodeBlock
@@ -44,7 +44,7 @@ public:
     /**
      * Constructor
      */
-    CodeClassFieldDeclarationBlock (CodeClassField * tqparent);
+    CodeClassFieldDeclarationBlock (CodeClassField * parent);
 
     /**
      * Empty Destructor
@@ -57,11 +57,11 @@ public:
      */
     CodeClassField * getParentClassField ( );
 
-    /** A Utility method to get the tqparent object of the parentCodeClassfield
+    /** A Utility method to get the parent object of the parentCodeClassfield
      */
     UMLObject * getParentObject ( );
 
-    // get the tqparent document
+    // get the parent document
     CodeDocument * getParentDocument ( );
 
     /**
@@ -96,13 +96,13 @@ protected:
      */
     virtual void updateContent() = 0;
 
-    // so tqparent can actually release this block
+    // so parent can actually release this block
     void forceRelease ();
 
 private:
 
     CodeClassField * m_parentclassfield;
-    void init(CodeClassField * tqparent);
+    void init(CodeClassField * parent);
 
 public slots:
 
diff --git a/umbrello/umbrello/codecomment.cpp b/umbrello/umbrello/codecomment.cpp
index b172c3c2..78873e3d 100644
--- a/umbrello/umbrello/codecomment.cpp
+++ b/umbrello/umbrello/codecomment.cpp
@@ -47,7 +47,7 @@ void CodeComment::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
     kDebug() << "CodeComment::saveToXMI is called!" << endl;
     TQDomElement blockElement = doc.createElement( "codecomment" );
     setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
-    // just use tqparent TextBlock method
+    // just use parent TextBlock method
     root.appendChild( blockElement );
 }
 
diff --git a/umbrello/umbrello/codedocument.cpp b/umbrello/umbrello/codedocument.cpp
index 6fea4367..cb571b6b 100644
--- a/umbrello/umbrello/codedocument.cpp
+++ b/umbrello/umbrello/codedocument.cpp
@@ -364,7 +364,7 @@ void CodeDocument::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & doc
     docElement.appendChild( commElement);
 
     // doc codePolicy?
-    // FIX: store ONLY if different from the tqparent generator
+    // FIX: store ONLY if different from the parent generator
     // policy.. something which is not possible right now. -b.t.
 
 }
diff --git a/umbrello/umbrello/codegenerationpolicy.h b/umbrello/umbrello/codegenerationpolicy.h
index 1876fced..50dfd998 100644
--- a/umbrello/umbrello/codegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerationpolicy.h
@@ -290,7 +290,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    virtual CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
+    virtual CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
 
     /**
       *  Gets the heading file (as a string) to be inserted at the
diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp
index 87c518a2..44a65c62 100644
--- a/umbrello/umbrello/codegenerator.cpp
+++ b/umbrello/umbrello/codegenerator.cpp
@@ -166,10 +166,10 @@ CodeDocumentList * CodeGenerator::getCodeDocumentList ( ) {
 }
 
 // the vanilla version
-CodeViewerDialog * CodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
+CodeViewerDialog * CodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc,
         Settings::CodeViewerState state)
 {
-    return new CodeViewerDialog(tqparent, doc, state);
+    return new CodeViewerDialog(parent, doc, state);
 }
 
 // Other methods
@@ -227,7 +227,7 @@ void CodeGenerator::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
 }
 
 /**
- * Initialize this code generator from its tqparent UMLDoc. When this is called, it will
+ * Initialize this code generator from its parent UMLDoc. When this is called, it will
  * (re-)generate the list of code documents for this project (generator) by checking
  * for new objects/attributes which have been added or changed in the documnet. One or more
  * CodeDocuments will be created/overwritten/amended as is appropriate for the given language.
@@ -261,7 +261,7 @@ void CodeGenerator::initFromParentDocument( ) {
 }
 
 /**
- * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument.
+ * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument.
  * "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced
  * or removed as is apppropriate.
  */
diff --git a/umbrello/umbrello/codegenerator.h b/umbrello/umbrello/codegenerator.h
index eedec15d..e7e2c24d 100644
--- a/umbrello/umbrello/codegenerator.h
+++ b/umbrello/umbrello/codegenerator.h
@@ -281,7 +281,7 @@ public:
 
     /** Get the editing dialog for this code document
      */
-    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
+    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
             Settings::CodeViewerState state);
 
     /**
@@ -304,7 +304,7 @@ public:
     virtual void createDefaultStereotypes ();
 
     /**
-    * Initialize this code generator from its tqparent UMLDoc. When this is called,
+    * Initialize this code generator from its parent UMLDoc. When this is called,
     * it will (re-)generate the list of code documents for this project (generator)
     * by checking for new objects/attributes which have been added or changed in the
     * document. One or more CodeDocuments will be created/overwritten/amended as is
@@ -394,7 +394,7 @@ public slots:
     virtual void checkRemoveUMLObject (UMLObject * obj);
 
     /**
-     * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument.
+     * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument.
      * "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced
      * or removed as is apppropriate.
      */
diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp
index 6dc6e4e7..ec2bf59a 100644
--- a/umbrello/umbrello/codegenerators/adawriter.cpp
+++ b/umbrello/umbrello/codegenerators/adawriter.cpp
@@ -298,8 +298,8 @@ void AdaWriter::writeClass(UMLClassifier *c) {
         ada << "tagged ";
     } else {
         // FIXME: Multiple inheritance is not yet supported
-        UMLClassifier* tqparent = superclasses.first();
-        ada << "new " << className(tqparent, false) << " with ";
+        UMLClassifier* parent = superclasses.first();
+        ada << "new " << className(parent, false) << " with ";
     }
     ada << "private;" << m_endl << m_endl;
     ada << getIndent() << "type " << name << "_Ptr is access all " << name << "'Class;" << m_endl << m_endl;
@@ -363,8 +363,8 @@ void AdaWriter::writeClass(UMLClassifier *c) {
         ada << "tagged ";
     } else {
         // FIXME: Multiple inheritance is not yet supported
-        UMLClassifier* tqparent = superclasses.first();
-        ada << "new " << className(tqparent, false) << " with ";
+        UMLClassifier* parent = superclasses.first();
+        ada << "new " << className(parent, false) << " with ";
     }
     ada << "record" << m_endl;
     m_indentLevel++;
diff --git a/umbrello/umbrello/codegenerators/codegenfactory.h b/umbrello/umbrello/codegenerators/codegenfactory.h
index 0930f43d..27a0f293 100644
--- a/umbrello/umbrello/codegenerators/codegenfactory.h
+++ b/umbrello/umbrello/codegenerators/codegenfactory.h
@@ -46,7 +46,7 @@ namespace CodeGenFactory {
      * Create a CodeOperation belonging to the given ClassifierCodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd    the tqparent ClassifierCodeDocument.
+     * @param cd    the parent ClassifierCodeDocument.
      * @param op    the related UMLOperation
      * @return  CodeOperation which is specific to the current language
      */
@@ -57,8 +57,8 @@ namespace CodeGenFactory {
      * ClassifierCodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd         the tqparent ClassifierCodeDocument
-     * @param at         attribute which is tqparent of this class field
+     * @param cd         the parent ClassifierCodeDocument
+     * @param at         attribute which is parent of this class field
      * @return  CodeClassField which is specific to the current language
      */
     CodeClassField * newCodeClassField (ClassifierCodeDocument *cd, UMLAttribute * at);
@@ -68,8 +68,8 @@ namespace CodeGenFactory {
      * ClassifierCodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd         the tqparent ClassifierCodeDocument
-     * @param role       association role which is tqparent of this class field
+     * @param cd         the parent ClassifierCodeDocument
+     * @param role       association role which is parent of this class field
      * @return  CodeClassField which is specific to the current language
      */
     CodeClassField * newCodeClassField(ClassifierCodeDocument *cd, UMLRole *role);
@@ -78,8 +78,8 @@ namespace CodeGenFactory {
      * Create a CodeAccessorMethod object belonging to the given ClassifierCodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd         the tqparent ClassifierCodeDocument
-     * @param cf         CodeClassField which is tqparent of this object
+     * @param cd         the parent ClassifierCodeDocument
+     * @param cf         CodeClassField which is parent of this object
      * @param type       CodeAccessorMethod::AccessorType to create
      *
      * @return  CodeAccessorMethod which is specific to the current language
@@ -93,8 +93,8 @@ namespace CodeGenFactory {
      * ClassifierCodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd         the tqparent ClassifierCodeDocument
-     * @param cf         CodeClassField which is tqparent of this object
+     * @param cd         the parent ClassifierCodeDocument
+     * @param cf         CodeClassField which is parent of this object
      *
      * @return  CodeClassFieldDeclarationBlock which is specific to the current language
      */
@@ -105,7 +105,7 @@ namespace CodeGenFactory {
      * Create a new CodeComment object belonging to the given CodeDocument.
      * Only applies to the advanced generators.
      *
-     * @param cd         the tqparent CodeDocument
+     * @param cd         the parent CodeDocument
      * @return      CodeBlockWithComments
      */
     CodeComment * newCodeComment (CodeDocument *cd);
diff --git a/umbrello/umbrello/codegenerators/codegenpolicyext.h b/umbrello/umbrello/codegenerators/codegenpolicyext.h
index ea792388..29e358a1 100644
--- a/umbrello/umbrello/codegenerators/codegenpolicyext.h
+++ b/umbrello/umbrello/codegenerators/codegenpolicyext.h
@@ -36,7 +36,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    virtual CodeGenerationPolicyPage * createPage(TQWidget *tqparent = 0, const char *name = 0) = 0;
+    virtual CodeGenerationPolicyPage * createPage(TQWidget *parent = 0, const char *name = 0) = 0;
 
     /**
      * set the defaults from a config file for this code generator from the passed KConfig pointer.
diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
index bdba3604..4742cd6d 100644
--- a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
@@ -86,7 +86,7 @@ TQString CPPCodeClassField::getInitialValue() {
         if (at) {
             return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
         } else {
-            kError() << "CPPCodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
+            kError() << "CPPCodeClassField::getInitialValue: parent object is not a UMLAttribute"
             << endl;
             return "";
         }
diff --git a/umbrello/umbrello/codegenerators/cppcodecomment.cpp b/umbrello/umbrello/codegenerators/cppcodecomment.cpp
index dada5357..ecb100bd 100644
--- a/umbrello/umbrello/codegenerators/cppcodecomment.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodecomment.cpp
@@ -53,7 +53,7 @@ CPPCodeComment::~CPPCodeComment ( ) { }
 void CPPCodeComment::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
     TQDomElement blockElement = doc.createElement( "cppcodecomment" );
     setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
-    // just use tqparent TextBlock method
+    // just use parent TextBlock method
     root.appendChild( blockElement );
 }
 
diff --git a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
index c8e68f4c..ba303284 100644
--- a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
@@ -53,7 +53,7 @@ CPPCodeDocumentation::~CPPCodeDocumentation ( ) { }
 void CPPCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
     TQDomElement blockElement = doc.createElement( "cppcodedocumentation" );
     setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
-    // just use tqparent TextBlock method
+    // just use parent TextBlock method
     root.appendChild( blockElement );
 }
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
index 563a86ee..1051b6c6 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
@@ -28,8 +28,8 @@
 #include <kmessagebox.h>
 
 
-CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *tqparent, const char *name )
-        : CPPCodeGenerationFormBase (tqparent,name)
+CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *parent, const char *name )
+        : CPPCodeGenerationFormBase (parent,name)
 {
     init();
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.h b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
index 7a98ef91..aebaa5d5 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
@@ -31,7 +31,7 @@ public:
     /**
      * std ctor
      */
-    explicit CPPCodeGenerationForm (TQWidget *tqparent=0, const char *name=0);
+    explicit CPPCodeGenerationForm (TQWidget *parent=0, const char *name=0);
 
     /**
      * std dtor
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
index d14d92b9..8aec0351 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
@@ -359,8 +359,8 @@ void CPPCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSign
  * Create a new dialog interface for this object.
  * @return dialog object
  */
-CodeGenerationPolicyPage * CPPCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
-    return new CPPCodeGenerationPolicyPage ( tqparent, name, this );
+CodeGenerationPolicyPage * CPPCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) {
+    return new CPPCodeGenerationPolicyPage ( parent, name, this );
 }
 
 void CPPCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
index 949b451c..5788a2fe 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
@@ -193,7 +193,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
+    CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
 
 protected:
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
index a008daab..60d37bac 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
@@ -26,8 +26,8 @@
 #include "cppcodegenerationformbase.h"
 #include "../uml.h"
 
-CPPCodeGenerationPolicyPage::CPPCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CPPCodeGenerationPolicy * policy )
-  : CodeGenerationPolicyPage(tqparent, name, policy)
+CPPCodeGenerationPolicyPage::CPPCodeGenerationPolicyPage( TQWidget *parent, const char *name, CPPCodeGenerationPolicy * policy )
+  : CodeGenerationPolicyPage(parent, name, policy)
 {
     CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
     form = new CPPCodeGenerationForm(this);
@@ -59,31 +59,31 @@ void CPPCodeGenerationPolicyPage::apply()
     CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
 
     // now do our cpp-specific configs
-    CPPCodeGenerationPolicy * tqparent = (CPPCodeGenerationPolicy*) m_parentPolicy;
+    CPPCodeGenerationPolicy * parent = (CPPCodeGenerationPolicy*) m_parentPolicy;
 
     // block signals so that we don't generate too many sync signals for child code
     // documents
-    tqparent->blockSignals(true);
+    parent->blockSignals(true);
 
     common->setCommentStyle((CodeGenerationPolicy::CommentStyle ) form->m_SelectCommentStyle->currentItem());
     common->setAutoGenerateConstructors(form->getGenerateEmptyConstructors());
-    tqparent->setAutoGenerateAccessors(form->getGenerateAccessorMethods());
+    parent->setAutoGenerateAccessors(form->getGenerateAccessorMethods());
 
-    tqparent->setDestructorsAreVirtual(form->getVirtualDestructors());
-    tqparent->setPackageIsNamespace(form->getPackageIsANamespace());
-    tqparent->setAccessorsAreInline(form->getAccessorsAreInline());
-    tqparent->setOperationsAreInline(form->getOperationsAreInline());
-    tqparent->setAccessorsArePublic(form->getAccessorsArePublic());
+    parent->setDestructorsAreVirtual(form->getVirtualDestructors());
+    parent->setPackageIsNamespace(form->getPackageIsANamespace());
+    parent->setAccessorsAreInline(form->getAccessorsAreInline());
+    parent->setOperationsAreInline(form->getOperationsAreInline());
+    parent->setAccessorsArePublic(form->getAccessorsArePublic());
 
-    tqparent->setStringClassName(form->m_stringClassHCombo->currentText());
-    tqparent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText());
-    tqparent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked());
+    parent->setStringClassName(form->m_stringClassHCombo->currentText());
+    parent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText());
+    parent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked());
 
-    tqparent->setVectorClassName(form->m_listClassHCombo->currentText());
-    tqparent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText());
-    tqparent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked());
+    parent->setVectorClassName(form->m_listClassHCombo->currentText());
+    parent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText());
+    parent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked());
 
-    tqparent->blockSignals(false);
+    parent->blockSignals(false);
 
     // now send out modified code content signal
     common->emitModifiedCodeContentSig();
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
index 6e32c62d..a918acfb 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
@@ -31,7 +31,7 @@ class CPPCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
   TQ_OBJECT
 public:
 
-    explicit CPPCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0);
+    explicit CPPCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0);
 
     virtual ~CPPCodeGenerationPolicyPage();
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
index b5571d02..b5c12dd6 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
@@ -120,14 +120,14 @@ bool CPPCodeGenerator::removeHeaderCodeDocument ( CPPHeaderCodeDocument * remove
 
 // In the C++ version, we need to make both source and header files as well
 // as the makefile available.
-CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
+CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc,
         Settings::CodeViewerState state)
 {
 
     ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(doc);
     if(!cdoc)
         // bah..not a classcode document?? then just use vanilla version
-        return CodeGenerator::getCodeViewerDialog(tqparent,doc,state);
+        return CodeGenerator::getCodeViewerDialog(parent,doc,state);
     else {
         // build with passed (source) code document
         CodeViewerDialog *dialog;
@@ -138,11 +138,11 @@ CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, C
         if(hdoc)
         {
             // if we have a header document..build with that
-            dialog = new CodeViewerDialog(tqparent, hdoc, state);
+            dialog = new CodeViewerDialog(parent, hdoc, state);
             dialog->addCodeDocument(doc);
         } else
             // shouldn't happen, but lets try to gracefully deliver something.
-            dialog = new CodeViewerDialog(tqparent, doc, state);
+            dialog = new CodeViewerDialog(parent, doc, state);
 
         // add in makefile if available and desired
         if(getCreateProjectMakefile())
@@ -178,8 +178,8 @@ void CPPCodeGenerator::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
 }
 
 /**
- * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument.
- * Need to override tqparent method because we have header documents to consider too.
+ * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument.
+ * Need to override parent method because we have header documents to consider too.
  */
 void CPPCodeGenerator::syncCodeToDocument ( ) {
 
@@ -347,7 +347,7 @@ void CPPCodeGenerator::initAttributes ( )
 
     UMLApp::app()->setPolicyExt ( new CPPCodeGenerationPolicy(UMLApp::app()->getConfig()) );
 
-    // load Classifier documents from tqparent document
+    // load Classifier documents from parent document
     //initFromParentDocument();
 }
 
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.h b/umbrello/umbrello/codegenerators/cppcodegenerator.h
index 90b0c3f2..5d73f881 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.h
@@ -89,7 +89,7 @@ public:
 
     /** Get the editing dialog for this code document
      */
-    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
+    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
             Settings::CodeViewerState state);
 
     /**
@@ -158,7 +158,7 @@ public slots:
     virtual void checkRemoveUMLObject (UMLObject * obj);
 
     /**
-     * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument.
+     * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument.
      * "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced
      * or removed as is apppropriate.
      */
diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
index 84fc128a..7277ea87 100644
--- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
@@ -61,7 +61,7 @@ protected:
 
 private:
 
-    void init (CPPHeaderCodeDocument * tqparent, const TQString &comment);
+    void init (CPPHeaderCodeDocument * parent, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
index 55edd167..3f15d05b 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
@@ -21,8 +21,8 @@
 // Constructors/Destructors
 //
 
-CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
-        : CodeClassFieldDeclarationBlock ( tqparent )
+CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+        : CodeClassFieldDeclarationBlock ( parent )
 {
     setOverallIndentationLevel(1);
     updateContent();
@@ -41,8 +41,8 @@ CPPHeaderCodeClassFieldDeclarationBlock::~CPPHeaderCodeClassFieldDeclarationBloc
  */
 void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
 {
-    UMLObject *umltqparent = CodeClassFieldDeclarationBlock::getParentObject();
-    if (umltqparent == NULL) {
+    UMLObject *umlparent = CodeClassFieldDeclarationBlock::getParentObject();
+    if (umlparent == NULL) {
         return;
     }
 
@@ -50,7 +50,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
     CPPCodeClassField * hcppcf = dynamic_cast<CPPCodeClassField*>(cf);
 
     // Set the comment
-    TQString notes = umltqparent->getDoc();
+    TQString notes = umlparent->getDoc();
     getComment()->setText(notes);
     if(notes.isEmpty())
         getComment()->setWriteOutText(false);
@@ -59,7 +59,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
 
 
     // Set the body
-    TQString staticValue = umltqparent->getStatic() ? "static " : "";
+    TQString staticValue = umlparent->getStatic() ? "static " : "";
     TQString typeName = hcppcf->getTypeName();
     TQString fieldName = hcppcf->getFieldName();
 
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
index dc3a4c29..d4e28bb9 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
@@ -32,7 +32,7 @@ public:
     /**
      * Constructor
      */
-    CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+    CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent );
 
     /**
      * Empty Destructor
@@ -41,7 +41,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the tqparent object is "modified"
+    // this will be called by syncToParent whenever the parent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
index c725439f..9da4c6aa 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
@@ -206,7 +206,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root)
                                             {
                                                 CPPHeaderClassDeclarationBlock * block = getClassDecl();
                                                 block->loadFromXMI(element);
-                                                // normally this would be populated by the following syncTotqparent
+                                                // normally this would be populated by the following syncToparent
                                                 // call, but we cant wait for it, so lets just do it now.
                                                 namespaceBlock = getHierarchicalCodeBlock("namespace", "Namespace", 0);
 
@@ -326,7 +326,7 @@ void CPPHeaderCodeDocument::saveToXMI ( TQDomDocument & doc, TQDomElement & root
 */
 
 // This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
 // such, we will want to insert everything we resonablely will want
@@ -334,7 +334,7 @@ void CPPHeaderCodeDocument::saveToXMI ( TQDomDocument & doc, TQDomElement & root
 // comments) to appear or not, as needed.
 void CPPHeaderCodeDocument::updateContent( )
 {
-    // Gather info on the various fields and tqparent objects of this class...
+    // Gather info on the various fields and parent objects of this class...
     UMLClassifier * c = getParentClassifier();
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
@@ -800,7 +800,7 @@ void CPPHeaderCodeDocument::updateContent( )
 
     // Operations
     //
-    // nothing to do here.. "updateOperations" in tqparent class puts things
+    // nothing to do here.. "updateOperations" in parent class puts things
     // in the right place using the "addCodeOperation" method we defined in this class
 
     // FINISH up with hash def block close
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
index 37951553..471c7734 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
@@ -26,8 +26,8 @@
 //
 
 CPPHeaderCodeOperation::CPPHeaderCodeOperation
- ( CPPHeaderCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, tqparent, body, comment)
+ ( CPPHeaderCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, parent, body, comment)
 {
     // lets not go with the default comment and instead use
     // full-blown cpp documentation object instead
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
index 2e55e92a..016249e5 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
@@ -20,8 +20,8 @@
 // Constructors/Destructors
 //
 
-CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
-        : CodeClassFieldDeclarationBlock ( tqparent )
+CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+        : CodeClassFieldDeclarationBlock ( parent )
 {
     setOverallIndentationLevel(1);
     updateContent();
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
index 00b6135f..46183b70 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
@@ -32,7 +32,7 @@ public:
     /**
      * Constructor
      */
-    CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+    CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent );
 
     /**
      * Empty Destructor
@@ -41,7 +41,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the tqparent object is "modified"
+    // this will be called by syncToParent whenever the parent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
index 53ee06f7..57bf4637 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
@@ -106,7 +106,7 @@ void CPPSourceCodeDocument::resetTextBlocks()
 }
 
 // This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
 // such, we will want to insert everything we reasonably will want
@@ -115,7 +115,7 @@ void CPPSourceCodeDocument::resetTextBlocks()
 void CPPSourceCodeDocument::updateContent( )
 {
 
-    // Gather info on the various fields and tqparent objects of this class...
+    // Gather info on the various fields and parent objects of this class...
     //UMLClassifier * c = getParentClassifier();
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
index 9409b207..61b1950e 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
@@ -25,8 +25,8 @@
 // Constructors/Destructors
 //
 
-CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, tqparent, body, comment)
+CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, parent, body, comment)
 {
     // lets not go with the default comment and instead use
     // full-blown cpp documentation object instead
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp
index 884661b5..180ba176 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp
@@ -405,7 +405,7 @@ void CSharpWriter::writeOverridesRecursive(UMLClassifierList *superclasses, TQTe
 
             opabstract.clear();
         }
-        // Recurse to tqparent superclasses
+        // Recurse to parent superclasses
         UMLClassifierList superRecursive = obj->getSuperClasses();
         UMLClassifierList *superRecursivePtr =& superRecursive;
         if (superRecursivePtr->count() > 0) {
@@ -433,7 +433,7 @@ void CSharpWriter::writeRealizationsRecursive(UMLClassifier *currentClass, UMLAs
         writeOperations(opreal,cs,false,false,true);
         cs << m_container_indent << m_indentation << "#endregion" << m_endl << m_endl;
 
-        // Recurse to tqparent realizations
+        // Recurse to parent realizations
         UMLAssociationList parentReal = real->getRealizations();
         if (!parentReal.isEmpty()) {
             writeRealizationsRecursive(real, &parentReal, cs);
@@ -493,7 +493,7 @@ void CSharpWriter::writeOperations(UMLOperationList opList,
                 if (op->getStatic()) cs << "static ";
             }
             else {
-                // method overriding an abstract tqparent
+                // method overriding an abstract parent
                 cs << op->getVisibility().toString() << " override ";
                 if (op->getStatic()) cs << "static ";
             }
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.h b/umbrello/umbrello/codegenerators/csharpwriter.h
index 6cf4d3f6..322ce06c 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.h
+++ b/umbrello/umbrello/codegenerators/csharpwriter.h
@@ -80,7 +80,7 @@ private:
     int m_unnamedRoles;
 
     /**
-      * write realizations of a class and recurse to tqparent classes
+      * write realizations of a class and recurse to parent classes
 
       * @param currentClass class to start with
       * @param realizations realizations of this class
diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp
index 1d517fbb..efb49dc9 100644
--- a/umbrello/umbrello/codegenerators/idlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/idlwriter.cpp
@@ -275,13 +275,13 @@ void IDLWriter::writeClass(UMLClassifier *c) {
     UMLClassifierList superclasses = c->getSuperClasses();
     if (! superclasses.isEmpty()) {
         idl << " : ";
-        UMLClassifier *tqparent = superclasses.first();
+        UMLClassifier *parent = superclasses.first();
         int n_parents = superclasses.count();
         while (n_parents--) {
-            idl << tqparent->getFullyQualifiedName("::");
+            idl << parent->getFullyQualifiedName("::");
             if (n_parents)
                 idl << ", ";
-            tqparent = superclasses.next();
+            parent = superclasses.next();
         }
     }
     idl << " {" << m_endl << m_endl;
diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
index 0c1709ba..19a743d5 100644
--- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
@@ -60,7 +60,7 @@ protected:
 
 private:
 
-    void init (JavaClassifierCodeDocument * tqparent, const TQString &comment);
+    void init (JavaClassifierCodeDocument * parent, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
index 877111e1..1587c265 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
@@ -326,7 +326,7 @@ void JavaClassifierCodeDocument::resetTextBlocks()
 }
 
 // This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
 // such, we will want to insert everything we resonablely will want
@@ -334,7 +334,7 @@ void JavaClassifierCodeDocument::resetTextBlocks()
 // comments) to appear or not, as needed.
 void JavaClassifierCodeDocument::updateContent( )
 {
-    // Gather info on the various fields and tqparent objects of this class...
+    // Gather info on the various fields and parent objects of this class...
     UMLClassifier * c = getParentClassifier();
     CodeGenerationPolicy * commonPolicy = UMLApp::app()->getCommonPolicy();
     CodeGenPolicyExt * pe = UMLApp::app()->getPolicyExt();
diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
index c0b08396..6c883952 100644
--- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
@@ -159,7 +159,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration()
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing..already have taken tqparent value
+            // do nothing..already have taken parent value
             break;
         }
 
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
index c3ebb9e2..0777cf1d 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
@@ -84,7 +84,7 @@ TQString JavaCodeClassField::getInitialValue() {
         if (at) {
             return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
         } else {
-            kError() << "JavaodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
+            kError() << "JavaodeClassField::getInitialValue: parent object is not a UMLAttribute"
             << endl;
             return "";
         }
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
index 520f5611..5507c314 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
@@ -27,8 +27,8 @@
 // Constructors/Destructors
 //
 
-JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
-        : CodeClassFieldDeclarationBlock ( tqparent )
+JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+        : CodeClassFieldDeclarationBlock ( parent )
 {
     setOverallIndentationLevel(1);
     updateContent();
@@ -77,7 +77,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing here... will leave as from tqparent object
+            // do nothing here... will leave as from parent object
             break;
         }
     }
@@ -101,7 +101,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
         } else {
 
             // FIX?: IF a constructor method exists in the classifiercodedoc
-            // of the tqparent Object, then we can use that instead (if its empty).
+            // of the parent Object, then we can use that instead (if its empty).
             if(cf->fieldIsSingleValue())
             {
                 if(!typeName.isEmpty())
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
index d7f3c2f5..869954cf 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
@@ -32,7 +32,7 @@ public:
     /**
      * Constructor
      */
-    JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+    JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent );
 
     /**
      * Empty Destructor
@@ -41,7 +41,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the tqparent object is "modified"
+    // this will be called by syncToParent whenever the parent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
index a04a3cd1..2eeff46a 100644
--- a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
@@ -54,7 +54,7 @@ JavaCodeDocumentation::~JavaCodeDocumentation ( ) { }
 void JavaCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
     TQDomElement blockElement = doc.createElement( "javacodedocumentation" );
     setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
-    // just use tqparent TextBlock method
+    // just use parent TextBlock method
     root.appendChild( blockElement );
 }
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
index aeee86e0..6225485f 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
@@ -174,8 +174,8 @@ void JavaCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSig
  * Create a new dialog interface for this object.
  * @return dialog object
  */
-CodeGenerationPolicyPage * JavaCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
-    return new JavaCodeGenerationPolicyPage ( tqparent, name, this );
+CodeGenerationPolicyPage * JavaCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) {
+    return new JavaCodeGenerationPolicyPage ( parent, name, this );
 }
 
 void JavaCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
index cb9171f4..8f95c1c8 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
@@ -97,7 +97,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
+    CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
 
 protected:
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
index c802024a..c7bfbf0b 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
@@ -26,8 +26,8 @@
 #include "javacodegenerationformbase.h"
 #include "../uml.h"
 
-JavaCodeGenerationPolicyPage::JavaCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, JavaCodeGenerationPolicy * policy )
-  : CodeGenerationPolicyPage(tqparent, name, policy)
+JavaCodeGenerationPolicyPage::JavaCodeGenerationPolicyPage( TQWidget *parent, const char *name, JavaCodeGenerationPolicy * policy )
+  : CodeGenerationPolicyPage(parent, name, policy)
 {
     CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy();
     form = new JavaCodeGenerationFormBase(this);
@@ -54,7 +54,7 @@ JavaCodeGenerationPolicyPage::~JavaCodeGenerationPolicyPage()
 void JavaCodeGenerationPolicyPage::apply()
 {
     CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy();
-    JavaCodeGenerationPolicy * tqparent = (JavaCodeGenerationPolicy*) m_parentPolicy;
+    JavaCodeGenerationPolicy * parent = (JavaCodeGenerationPolicy*) m_parentPolicy;
 
     // block signals so we don't cause too many update content calls to code documents
     commonPolicy->blockSignals(true);
@@ -63,8 +63,8 @@ void JavaCodeGenerationPolicyPage::apply()
     commonPolicy->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200));
     commonPolicy->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200));
     commonPolicy->setAutoGenerateConstructors(form->m_generateConstructors->isChecked());
-    tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
-    tqparent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
+    parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
+    parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
 
     /**
      * @todo unclean - CreateANTBuildFile attribute should be in java policy
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
index 2ace585e..8236e1a2 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
@@ -31,7 +31,7 @@ class JavaCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
   TQ_OBJECT
 public:
 
-    explicit JavaCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0);
+    explicit JavaCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0);
 
     virtual ~JavaCodeGenerationPolicyPage();
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.cpp b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
index d51a7b3c..0f78a0fb 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
@@ -79,10 +79,10 @@ bool JavaCodeGenerator::getCreateANTBuildFile ( ) {
 }
 
 // In the Java version, we make the ANT build file also available.
-CodeViewerDialog * JavaCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
+CodeViewerDialog * JavaCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc,
         Settings::CodeViewerState state)
 {
-    CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state);
+    CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state);
     if(getCreateANTBuildFile())
         dialog->addCodeDocument(findCodeDocumentByID("ANTDOC"));
     return dialog;
@@ -143,7 +143,7 @@ CodeDocument * JavaCodeGenerator::newClassifierCodeDocument ( UMLClassifier * c)
 }
 
 void JavaCodeGenerator::init() {
-    // load Classifier documents from tqparent document
+    // load Classifier documents from parent document
     //initFromParentDocument();
 
     // add in an ANT document
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.h b/umbrello/umbrello/codegenerators/javacodegenerator.h
index c9fc49e7..24ab718a 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.h
@@ -92,7 +92,7 @@ public:
 
     /** Get the editing dialog for this code document
      */
-    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
+    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
             Settings::CodeViewerState state);
 
     // Other methods
diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.cpp b/umbrello/umbrello/codegenerators/javacodeoperation.cpp
index 54b34f46..c7e7d162 100644
--- a/umbrello/umbrello/codegenerators/javacodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeoperation.cpp
@@ -25,8 +25,8 @@
 //
 
 JavaCodeOperation::JavaCodeOperation
- ( JavaClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, tqparent, body, comment)
+ ( JavaClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, parent, body, comment)
 {
     // lets not go with the default comment and instead use
     // full-blown java documentation object instead
@@ -81,7 +81,7 @@ void JavaCodeOperation::updateMethodDeclaration()
         maybeStatic = "static ";
     TQString startText = strVis + ' ' + maybeStatic + returnType + methodName + " (" + paramStr + ')';
 
-    // IF the tqparent is an interface, our operations look different
+    // IF the parent is an interface, our operations look different
     // e.g. they have no body
     if(isInterface) {
         startText += ';';
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp
index 8d11b893..0f3c32ef 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp
@@ -244,8 +244,8 @@ void PascalWriter::writeClass(UMLClassifier *c) {
     pas << getIndent() << classname << " = object";
     if (!superclasses.isEmpty()) {
         // FIXME: Multiple inheritance is not yet supported
-        UMLClassifier* tqparent = superclasses.first();
-        pas << "(" << qualifiedName(tqparent) << ")";
+        UMLClassifier* parent = superclasses.first();
+        pas << "(" << qualifiedName(parent) << ")";
     }
     pas << m_endl;
 
diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp
index e0fe4828..10146b6c 100644
--- a/umbrello/umbrello/codegenerators/php5writer.cpp
+++ b/umbrello/umbrello/codegenerators/php5writer.cpp
@@ -1776,7 +1776,7 @@ static const char *php5words[] =
         "ncurses_killchar",
         "ncurses_longname",
         "ncurses_mouseinterval",
-        "ncurses_mousetqmask",
+        "ncurses_mousemask",
         "ncurses_move",
         "ncurses_mvaddch",
         "ncurses_mvaddchnstr",
diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp
index b3c8a43e..4116020d 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/phpwriter.cpp
@@ -1772,7 +1772,7 @@ static const char *words[] =
         "ncurses_killchar",
         "ncurses_longname",
         "ncurses_mouseinterval",
-        "ncurses_mousetqmask",
+        "ncurses_mousemask",
         "ncurses_move",
         "ncurses_mvaddch",
         "ncurses_mvaddchnstr",
diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
index 327516a3..d181fc65 100644
--- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
@@ -68,7 +68,7 @@ protected:
 
 private:
 
-    void init (RubyClassifierCodeDocument * tqparent, const TQString &comment);
+    void init (RubyClassifierCodeDocument * parent, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
index 6f5b881d..22fa56fc 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
@@ -355,7 +355,7 @@ void RubyClassifierCodeDocument::resetTextBlocks()
 }
 
 // This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
 // For any situation in which this is called, we are either building the code
 // document up, or replacing/regenerating the existing auto-generated parts. As
 // such, we will want to insert everything we resonablely will want
@@ -363,7 +363,7 @@ void RubyClassifierCodeDocument::resetTextBlocks()
 // comments) to appear or not, as needed.
 void RubyClassifierCodeDocument::updateContent( )
 {
-    // Gather info on the various fields and tqparent objects of this class...
+    // Gather info on the various fields and parent objects of this class...
     UMLClassifier * c = getParentClassifier();
     RubyCodeGenerator * gen = dynamic_cast<RubyCodeGenerator*>(UMLApp::app()->getGenerator());
 
diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
index a3f4d26f..43986061 100644
--- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
@@ -168,7 +168,7 @@ void RubyCodeAccessorMethod::updateMethodDeclaration()
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing..already have taken tqparent value
+            // do nothing..already have taken parent value
             break;
         }
 
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
index 793db6ed..b3b723b9 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
@@ -86,7 +86,7 @@ TQString RubyCodeClassField::getInitialValue() {
         if (at) {
             return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
         } else {
-            kError() << "RubyodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
+            kError() << "RubyodeClassField::getInitialValue: parent object is not a UMLAttribute"
             << endl;
             return "";
         }
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
index da8eb00e..e99ca774 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
@@ -22,8 +22,8 @@
 // Constructors/Destructors
 //
 
-RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
-        : CodeClassFieldDeclarationBlock ( tqparent )
+RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+        : CodeClassFieldDeclarationBlock ( parent )
 {
     setOverallIndentationLevel(1);
     updateContent();
@@ -71,7 +71,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
             break;
         default:
         case CodeGenerationPolicy::FromParent:
-            // do nothing here... will leave as from tqparent object
+            // do nothing here... will leave as from parent object
             break;
         }
     }
@@ -95,7 +95,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
         } else {
 
             // FIX?: IF a constructor method exists in the classifiercodedoc
-            // of the tqparent Object, then we can use that instead (if its empty).
+            // of the parent Object, then we can use that instead (if its empty).
             if(cf->fieldIsSingleValue())
             {
                 if(!typeName.isEmpty())
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
index 1dd6b342..493f768c 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
@@ -36,7 +36,7 @@ public:
     /**
      * Constructor
      */
-    RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+    RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent );
 
     /**
      * Empty Destructor
@@ -45,7 +45,7 @@ public:
 
 protected:
 
-    // this will be called by syncToParent whenever the tqparent object is "modified"
+    // this will be called by syncToParent whenever the parent object is "modified"
     void updateContent ( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
index 9afee3f1..776e0c1e 100644
--- a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
@@ -57,7 +57,7 @@ RubyCodeDocumentation::~RubyCodeDocumentation ( ) { }
 void RubyCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
     TQDomElement blockElement = doc.createElement( "rubycodedocumentation" );
     setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
-    // just use tqparent TextBlock method
+    // just use parent TextBlock method
     root.appendChild( blockElement );
 }
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
index 62df797d..8e58fdf0 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
@@ -156,8 +156,8 @@ void RubyCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSig
  * Create a new dialog interface for this object.
  * @return dialog object
  */
-CodeGenerationPolicyPage * RubyCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
-    return new RubyCodeGenerationPolicyPage ( tqparent, name, this );
+CodeGenerationPolicyPage * RubyCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) {
+    return new RubyCodeGenerationPolicyPage ( parent, name, this );
 }
 
 void RubyCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
index 459e80d0..542f3166 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
@@ -99,7 +99,7 @@ public:
      * Create a new dialog interface for this object.
      * @return dialog object
      */
-    CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
+    CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
 
 protected:
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
index c6153448..5c890b4f 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
@@ -30,8 +30,8 @@
 #include "../codegenerationpolicy.h"
 #include "../uml.h"
 
-RubyCodeGenerationPolicyPage::RubyCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, RubyCodeGenerationPolicy * policy )
-  : CodeGenerationPolicyPage(tqparent, name, policy)
+RubyCodeGenerationPolicyPage::RubyCodeGenerationPolicyPage( TQWidget *parent, const char *name, RubyCodeGenerationPolicy * policy )
+  : CodeGenerationPolicyPage(parent, name, policy)
 {
     CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
     form = new RubyCodeGenerationFormBase(this);
@@ -52,19 +52,19 @@ void RubyCodeGenerationPolicyPage::apply()
     CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
 
     // now do our ruby-specific configs
-    RubyCodeGenerationPolicy * tqparent = (RubyCodeGenerationPolicy*) m_parentPolicy;
+    RubyCodeGenerationPolicy * parent = (RubyCodeGenerationPolicy*) m_parentPolicy;
 
     // block signals so we don't cause too many update content calls to code documents
-    tqparent->blockSignals(true);
+    parent->blockSignals(true);
 
     common->setCommentStyle((CodeGenerationPolicy::CommentStyle) form->m_SelectCommentStyle->currentItem());
     common->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200));
     common->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200));
     common->setAutoGenerateConstructors(form->m_generateConstructors->isChecked());
-    tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
-    tqparent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
+    parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
+    parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
 
-    tqparent->blockSignals(false);
+    parent->blockSignals(false);
 
     // now send out modified code content signal
     common->emitModifiedCodeContentSig();
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
index c994dff8..fc29fc3f 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
@@ -34,7 +34,7 @@ class RubyCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
   TQ_OBJECT
 public:
 
-    explicit RubyCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0);
+    explicit RubyCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0);
 
     virtual ~RubyCodeGenerationPolicyPage();
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
index 65b2af15..0cd9176f 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
@@ -59,10 +59,10 @@ Uml::Programming_Language RubyCodeGenerator::getLanguage() {
 }
 
 // In the Java version, we make the ANT build file also available.
-CodeViewerDialog * RubyCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
+CodeViewerDialog * RubyCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc,
         Settings::CodeViewerState state)
 {
-    CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state);
+    CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state);
     return dialog;
 }
 
@@ -127,7 +127,7 @@ CodeDocument * RubyCodeGenerator::newClassifierCodeDocument ( UMLClassifier * c)
 /* These initializations are done in CodeGenFactory::createObject()
 void RubyCodeGenerator::initFields() {
     UMLApp::app()->setPolicyExt ( new RubyCodeGenerationPolicy(UMLApp::app()->getConfig()) );
-    // load Classifier documents from tqparent document
+    // load Classifier documents from parent document
     initFromParentDocument();
 }
  */
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.h b/umbrello/umbrello/codegenerators/rubycodegenerator.h
index 4be5e7e8..035daa86 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.h
@@ -77,7 +77,7 @@ public:
 
     /** Get the editing dialog for this code document
      */
-    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
+    virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
             Settings::CodeViewerState state);
 
     // Other methods
diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
index 5a360838..7354281b 100644
--- a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
@@ -32,8 +32,8 @@
 // Constructors/Destructors
 //
 
-RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
-        : CodeOperation (doc, tqparent, body, comment)
+RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+        : CodeOperation (doc, parent, body, comment)
 {
     // lets not go with the default comment and instead use
     // full-blown ruby documentation object instead
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
index a3bb17df..6b7ac992 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
@@ -258,7 +258,7 @@ void SimpleCodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) {
 
 void SimpleCodeGenerator::initFields ( UMLDoc * parentDoc ) {
 
-    // load Classifier documents from tqparent document
+    // load Classifier documents from parent document
     // initFromParentDocument();
 
     m_fileMap.clear();
@@ -282,7 +282,7 @@ void SimpleCodeGenerator::syncCodeToDocument() {
 }
 
 
-// override tqparent method
+// override parent method
 void SimpleCodeGenerator::initFromParentDocument( )
 {
     // Do nothing
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.h b/umbrello/umbrello/codegenerators/simplecodegenerator.h
index 301dc780..c27e02ff 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.h
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.h
@@ -89,7 +89,7 @@ protected:
      */
     TQMap<UMLPackage*,TQString> m_fileMap;
 
-    // the tqparent document
+    // the parent document
     UMLDoc *m_doc;
 
     /**
@@ -105,7 +105,7 @@ protected:
     int m_indentLevel;
     TQString m_endl;
 
-    // override tqparent method..we need special handling
+    // override parent method..we need special handling
     void initFromParentDocument( );
 
 private:
diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
index adbe39b7..46342658 100644
--- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
+++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
@@ -82,7 +82,7 @@ private:
 
     UMLAttributeList m_attList;
     TQString m_nodeName;
-    void init (CodeDocument * tqparent, const TQString &nodeName, const TQString &comment);
+    void init (CodeDocument * parent, const TQString &nodeName, const TQString &comment);
 
 };
 
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
index 39b530bb..f2bf7a66 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
@@ -690,13 +690,13 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString
     // class (err. node) is inherit from it with a "concrete" element. Therefore,
     // in this manner, we need a group node for abstract classes to lay out the child
     // element choices so that the child, concrete class may be plugged into whatever spot
-    // it tqparent could go. The tradeoff is that "group" nodes may not be extended, so the
+    // it parent could go. The tradeoff is that "group" nodes may not be extended, so the
     // choices that you lay out here are it (e.g. no more nodes may inherit" from this group)
     //
     // The flipside for concrete classes is that we want to use them as elements in our document.
     // Unfortunately, about all you can do with complexTypes in terms of inheritance, is to
     // use these as the basis for a new node type. This is NOT full inheritence because the new
-    // class (err. element node) wont be able to go into the document where it tqparent went without
+    // class (err. element node) wont be able to go into the document where it parent went without
     // you heavily editing the schema.
     //
     // Therefore, IF a group is abstract, but has no inheriting sub-classes, there are no choices, and its nigh
diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.cpp b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
index 839e82b4..0c689e1e 100644
--- a/umbrello/umbrello/codegenobjectwithtextblocks.cpp
+++ b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
@@ -32,8 +32,8 @@
 // Constructors/Destructors
 //
 
-CodeGenObjectWithTextBlocks::CodeGenObjectWithTextBlocks ( CodeDocument *tqparent )
-  : m_pCodeDoc(tqparent)
+CodeGenObjectWithTextBlocks::CodeGenObjectWithTextBlocks ( CodeDocument *parent )
+  : m_pCodeDoc(parent)
 {
     initFields();
 }
@@ -85,8 +85,8 @@ bool CodeGenObjectWithTextBlocks::addTextBlock(TextBlock* add_object ) {
     else
     {
 
-        // if it has a tag, check to see that its not in some other tqparent object
-        // IF it is then we will need to remove it FIRST before adding to new tqparent
+        // if it has a tag, check to see that its not in some other parent object
+        // IF it is then we will need to remove it FIRST before adding to new parent
         CodeDocument * parentDoc = add_object->getParentDocument();
         if(parentDoc) {
 
@@ -142,9 +142,9 @@ TextBlock * CodeGenObjectWithTextBlocks::findTextBlockByTag( const TQString &tag
     return (TextBlock*) NULL;
 }
 
-// IMPORTANT: this will only search for a tqparent from the viewpoint of this object
+// IMPORTANT: this will only search for a parent from the viewpoint of this object
 // and down into its Hierarchical codeblocks. This means you should start any
-// search from the tqparent document of the text block. This method NOT meant for
+// search from the parent document of the text block. This method NOT meant for
 // casual usage.
 CodeGenObjectWithTextBlocks * CodeGenObjectWithTextBlocks::findParentObjectForTaggedTextBlock (const TQString & tag) {
 
diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.h b/umbrello/umbrello/codegenobjectwithtextblocks.h
index 0e522e83..b8f50454 100644
--- a/umbrello/umbrello/codegenobjectwithtextblocks.h
+++ b/umbrello/umbrello/codegenobjectwithtextblocks.h
@@ -45,7 +45,7 @@ public:
     /**
      * Constructor
      */
-    CodeGenObjectWithTextBlocks ( CodeDocument *tqparent );
+    CodeGenObjectWithTextBlocks ( CodeDocument *parent );
 
     /**
      * Empty Destructor
@@ -140,9 +140,9 @@ public:
     virtual CodeBlockWithComments * newCodeBlockWithComments() = 0;
     virtual HierarchicalCodeBlock * newHierarchicalCodeBlock() = 0;
 
-    /** Find the direct tqparent for a given textblock. This
+    /** Find the direct parent for a given textblock. This
      * may be any object which holds text blocks, e.g. a CodeGenObjectWithTextBlocks.
-     * @return tqparent object. Could return null if the textblock is missing from the
+     * @return parent object. Could return null if the textblock is missing from the
      * branch of the document tree being examined.
      */
     CodeGenObjectWithTextBlocks * findParentObjectForTaggedTextBlock (const TQString & tag);
diff --git a/umbrello/umbrello/codeimport/adaimport.cpp b/umbrello/umbrello/codeimport/adaimport.cpp
index c568cf3f..0cbd8d1c 100644
--- a/umbrello/umbrello/codeimport/adaimport.cpp
+++ b/umbrello/umbrello/codeimport/adaimport.cpp
@@ -324,8 +324,8 @@ 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 *tqparent = static_cast<UMLClassifier*>(p);
-                    Import_Utils::createGeneralization(klass, tqparent);
+                    UMLClassifier *parent = static_cast<UMLClassifier*>(p);
+                    Import_Utils::createGeneralization(klass, parent);
                 }
             } else {
                 ns->setAbstract(m_isAbstract);
@@ -359,13 +359,13 @@ bool AdaImport::parseStmt() {
                 t = (known ? known->getBaseType() : Uml::ot_Datatype);
             }
             UMLObject *ns = Import_Utils::createUMLObject(t, base, NULL);
-            UMLClassifier *tqparent = static_cast<UMLClassifier*>(ns);
+            UMLClassifier *parent = 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, tqparent);
+                    Import_Utils::createGeneralization(klass, parent);
                     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]);
-                             tqparent = static_cast<UMLClassifier*>(ns);
-                             Import_Utils::createGeneralization(klass, tqparent);
+                             parent = static_cast<UMLClassifier*>(ns);
+                             Import_Utils::createGeneralization(klass, parent);
                         }
                     }
                 }
diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp
index 5afae684..4e38a1aa 100644
--- a/umbrello/umbrello/codeimport/import_utils.cpp
+++ b/umbrello/umbrello/codeimport/import_utils.cpp
@@ -274,8 +274,8 @@ UMLObject *createUMLObject(Uml::Object_Type type,
     return o;
 }
 
-UMLOperation* makeOperation(UMLClassifier *tqparent, const TQString &name) {
-    UMLOperation *op = Object_Factory::createOperation(tqparent, name);
+UMLOperation* makeOperation(UMLClassifier *parent, const TQString &name) {
+    UMLOperation *op = Object_Factory::createOperation(parent, name);
     return op;
 }
 
@@ -396,7 +396,7 @@ void insertMethod(UMLClassifier *klass, UMLOperation* &op,
 UMLAttribute* addMethodParameter(UMLOperation *method,
                                  const TQString& type,
                                  const TQString& name) {
-    UMLClassifier *owner = static_cast<UMLClassifier*>(method->tqparent());
+    UMLClassifier *owner = static_cast<UMLClassifier*>(method->parent());
     UMLObject *typeObj = owner->findTemplate(type);
     if (typeObj == NULL) {
         bPutAtGlobalScope = true;
@@ -415,19 +415,19 @@ void addEnumLiteral(UMLEnum *enumType, const TQString &literal, const TQString &
     el->setDoc(comment);
 }
 
-void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent) {
-    // if the child is an interface, so is the tqparent.
+void createGeneralization(UMLClassifier *child, UMLClassifier *parent) {
+    // if the child is an interface, so is the parent.
     if (child->isInterface())
-        tqparent->setBaseType(Uml::ot_Interface);
+        parent->setBaseType(Uml::ot_Interface);
     Uml::Association_Type association = Uml::at_Generalization;
 
-    if (tqparent->isInterface() && !child->isInterface()) {
-        // if the tqparent is an interface, but the child is not, then
+    if (parent->isInterface() && !child->isInterface()) {
+        // if the parent is an interface, but the child is not, then
         // this is really realization.
         //
         association = Uml::at_Realization;
     }
-    UMLAssociation *assoc = new UMLAssociation(association, child, tqparent);
+    UMLAssociation *assoc = new UMLAssociation(association, child, parent);
     UMLDoc *umldoc = UMLApp::app()->getDocument();
     assoc->setUMLPackage(umldoc->getRootFolder(Uml::mt_Logical));
     umldoc->addAssociation(assoc);
@@ -435,8 +435,8 @@ void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent) {
 
 void createGeneralization(UMLClassifier *child, const TQString &parentName) {
     UMLObject *parentObj = createUMLObject( Uml::ot_Class, parentName );
-    UMLClassifier *tqparent = static_cast<UMLClassifier*>(parentObj);
-    createGeneralization(child, tqparent);
+    UMLClassifier *parent = static_cast<UMLClassifier*>(parentObj);
+    createGeneralization(child, parent);
 }
 
 TQStringList includePathList() {
diff --git a/umbrello/umbrello/codeimport/import_utils.h b/umbrello/umbrello/codeimport/import_utils.h
index bec9e0ff..4a04190f 100644
--- a/umbrello/umbrello/codeimport/import_utils.h
+++ b/umbrello/umbrello/codeimport/import_utils.h
@@ -88,7 +88,7 @@ namespace Import_Utils {
      * a conflict with a pre-existing parameterless method of the same
      * name.)
      */
-    UMLOperation* makeOperation(UMLClassifier *tqparent, const TQString &name);
+    UMLOperation* makeOperation(UMLClassifier *parent, const TQString &name);
 
     /**
      * Insert the UMLOperation into the given classifier.
@@ -131,13 +131,13 @@ namespace Import_Utils {
 
     /**
      * Create a generalization from the given child classifier to the given
-     * tqparent classifier.
+     * parent classifier.
      */
-    void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent);
+    void createGeneralization(UMLClassifier *child, UMLClassifier *parent);
 
     /**
      * Create a generalization from the existing child UMLObject to the given
-     * tqparent class name.
+     * parent class name.
      */
     void createGeneralization(UMLClassifier *child, const TQString &parentName);
 
diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp
index 0ff5b689..7f62a1a9 100644
--- a/umbrello/umbrello/codeimport/javaimport.cpp
+++ b/umbrello/umbrello/codeimport/javaimport.cpp
@@ -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 *tqparent = m_scope[0];
+                UMLPackage *parent = 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, tqparent);
+                                                                  name, parent);
                     current = static_cast<UMLPackage*>(ns);
-                    tqparent = current;
+                    parent = current;
                 } // for
                 if ( isArray ) {
                     // we have imported the type. For arrays we want to return
@@ -292,9 +292,9 @@ bool JavaImport::parseStmt() {
             const TQString& baseName = advance();
             // try to resolve the class we are extending, or if impossible
             // create a placeholder
-            UMLObject *tqparent = resolveClass( baseName );
-            if ( tqparent ) {
-                Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(tqparent));
+            UMLObject *parent = resolveClass( baseName );
+            if ( parent ) {
+                Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(parent));
             } else {
                 kDebug() << "importJava parentClass " << baseName
                     << " is not resolveable. Creating placeholder" << endl;
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
index 8e107ccf..e273aeb7 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
@@ -170,14 +170,14 @@ void AST::getEndPosition( int* line, int* col ) const
         * col = m_endColumn;
 }
 
-void AST::setParent( AST* tqparent )
+void AST::setParent( AST* parent )
 {
 #ifndef CPPPARSER_NO_CHILDREN
     if( m_parent )
 	m_parent->removeChild( this );
 #endif
 
-    m_parent = tqparent;
+    m_parent = parent;
 
 #ifndef CPPPARSER_NO_CHILDREN
     if( m_parent )
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
index 568b480a..0d6a4759 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
@@ -222,8 +222,8 @@ public:
     int nodeType() const { return m_nodeType; }
     void setNodeType( int nodeType ) { m_nodeType = nodeType; }
 
-    AST* tqparent() { return m_parent; }
-    void setParent( AST* tqparent );
+    AST* parent() { return m_parent; }
+    void setParent( AST* parent );
 
     void setStartPosition( int line, int col );
     void getStartPosition( int* line, int* col ) const;
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index a30db121..9d070334 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -57,8 +57,8 @@ void scopeOfNode( AST* ast, TQStringList& scope )
     if( !ast )
 	return;
 
-    if( ast->tqparent() )
-	scopeOfNode( ast->tqparent(), scope );
+    if( ast->parent() )
+	scopeOfNode( ast->parent(), scope );
 
     TQString s;
     switch( ast->nodeType() )
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h
index b97c7ced..7248c782 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h
@@ -33,21 +33,21 @@ public:
     virtual void parseTranslationUnit( TranslationUnitAST* );
 
     // declarations
-    //virtual void parseDeclaration( DeclarationAST* );  // use tqparent method
-    //virtual void parseLinkageSpecification( LinkageSpecificationAST* );  // use tqparent method
+    //virtual void parseDeclaration( DeclarationAST* );  // use parent method
+    //virtual void parseLinkageSpecification( LinkageSpecificationAST* );  // use parent method
     virtual void parseNamespace( NamespaceAST* );
-    //virtual void parseNamespaceAlias( NamespaceAliasAST* );  // use tqparent method
-    //virtual void parseUsing( UsingAST* );  // use tqparent method
-    //virtual void parseUsingDirective( UsingDirectiveAST* );  // use tqparent method
+    //virtual void parseNamespaceAlias( NamespaceAliasAST* );  // use parent method
+    //virtual void parseUsing( UsingAST* );  // use parent method
+    //virtual void parseUsingDirective( UsingDirectiveAST* );  // use parent method
     virtual void parseTypedef( TypedefAST* );
     virtual void parseTemplateDeclaration( TemplateDeclarationAST* );
     virtual void parseSimpleDeclaration( SimpleDeclarationAST* );
     virtual void parseFunctionDefinition( FunctionDefinitionAST* );
-    //virtual void parseLinkageBody( LinkageBodyAST* );  // use tqparent method
+    //virtual void parseLinkageBody( LinkageBodyAST* );  // use parent method
     virtual void parseAccessDeclaration( AccessDeclarationAST* );
 
     // type-specifier
-    //virtual void parseTypeSpecifier( TypeSpecifierAST* );  // use tqparent method
+    //virtual void parseTypeSpecifier( TypeSpecifierAST* );  // use parent method
     virtual void parseClassSpecifier( ClassSpecifierAST* );
     virtual void parseEnumSpecifier( EnumSpecifierAST* );
     virtual void parseElaboratedTypeSpecifier( ElaboratedTypeSpecifierAST* );
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
index 806a29a9..b6c55a61 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
@@ -53,22 +53,22 @@ TQString URLUtil::directory(const TQString & name) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-TQString URLUtil::relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy) {
+TQString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slashPolicy) {
   bool slashPrefix = slashPolicy & SLASH_PREFIX;
   bool slashSuffix = slashPolicy & SLASH_SUFFIX;
-  if (tqparent == child)
+  if (parent == child)
     return slashPrefix ? TQString("/") : TQString("");
 
-  if (!tqparent.isParentOf(child)) return TQString();
+  if (!parent.isParentOf(child)) return TQString();
   int a=slashPrefix ? -1 : 1;
   int b=slashSuffix ? 1 : -1;
-  return child.path(b).mid(tqparent.path(a).length());
+  return child.path(b).mid(parent.path(a).length());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy) {
-  return relativePath(KURL(tqparent), KURL(child), slashPolicy);
+TQString URLUtil::relativePath(const TQString & parent, const TQString & child, uint slashPolicy) {
+  return relativePath(KURL(parent), KURL(child), slashPolicy);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h
index d243ddbd..2d05b162 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h
@@ -38,13 +38,13 @@ namespace URLUtil
    */
   TQString directory(const TQString & pathName);
   /**
-   * Returns the relative path between a tqparent and child URL, or blank if the specified child is not a child of tqparent
+   * Returns the relative path between a parent and child URL, or blank if the specified child is not a child of parent
    */
-  TQString relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy = SLASH_PREFIX);
+  TQString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX);
   /**
-   * Returns the relative path between a tqparent and child URL, or blank if the specified child is not a child of tqparent
+   * Returns the relative path between a parent and child URL, or blank if the specified child is not a child of parent
    */
-  TQString relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy = SLASH_PREFIX);
+  TQString relativePath(const TQString & parent, const TQString & child, uint slashPolicy = SLASH_PREFIX);
   /**
    * Returns the relative path between a directory and file. Should never return empty path.
    *  Example:
diff --git a/umbrello/umbrello/codeimport/pascalimport.cpp b/umbrello/umbrello/codeimport/pascalimport.cpp
index 30d39128..a769571d 100644
--- a/umbrello/umbrello/codeimport/pascalimport.cpp
+++ b/umbrello/umbrello/codeimport/pascalimport.cpp
@@ -332,9 +332,9 @@ bool PascalImport::parseStmt() {
                 do {
                     TQString base = advance();
                     UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Class, base, NULL);
-                    UMLClassifier *tqparent = static_cast<UMLClassifier*>(ns);
+                    UMLClassifier *parent = static_cast<UMLClassifier*>(ns);
                     m_comment = TQString();
-                    Import_Utils::createGeneralization(klass, tqparent);
+                    Import_Utils::createGeneralization(klass, parent);
                 } while (advance() == ",");
                 if (m_source[m_srcIndex] != ")") {
                     kError() << "PascalImport: expecting \")\" at "
diff --git a/umbrello/umbrello/codemethodblock.h b/umbrello/umbrello/codemethodblock.h
index 1e7f7ea0..62651750 100644
--- a/umbrello/umbrello/codemethodblock.h
+++ b/umbrello/umbrello/codemethodblock.h
@@ -71,7 +71,7 @@ public:
      */
     TQString getEndMethodText () const;
 
-    // get the tqparent code document
+    // get the parent code document
     CodeDocument * getParentDocument();
 
 protected:
@@ -93,13 +93,13 @@ protected:
      */
     void setEndMethodText (const TQString &value);
 
-    /** this is the method called from within syncTotqparent().
+    /** this is the method called from within syncToparent().
       * to update the start and end Method text. It is called
                   * whether or not the method is Auto or User generated.
       */
     virtual void updateMethodDeclaration ( ) = 0;
 
-    /** this is the method called from within syncTotqparent().
+    /** this is the method called from within syncToparent().
       * to update the *body* of the method
                   * It is only called if the method is Auto-generated.
       */
diff --git a/umbrello/umbrello/codeoperation.cpp b/umbrello/umbrello/codeoperation.cpp
index 3fa716dc..13f5121b 100644
--- a/umbrello/umbrello/codeoperation.cpp
+++ b/umbrello/umbrello/codeoperation.cpp
@@ -77,7 +77,7 @@ TQPtrList<CodeParameter> CodeOperation::getParameterList ( ) {
 */
 
 /**
- * Get the tqparent UMLOperation of this codeoperation.
+ * Get the parent UMLOperation of this codeoperation.
  */
 UMLOperation * CodeOperation::getParentOperation( ) {
     return dynamic_cast<UMLOperation*>(getParentObject());
@@ -129,9 +129,9 @@ void CodeOperation::setAttributesFromNode ( TQDomElement & element)
 
     // now set local attributes
 
-    // oops..this is done in the tqparent class "ownedcodeblock".
-    // we simply need to record the tqparent operation here
-    // m_parentOperation->disconnect(this); // always disconnect from current tqparent
+    // oops..this is done in the parent class "ownedcodeblock".
+    // we simply need to record the parent operation here
+    // m_parentOperation->disconnect(this); // always disconnect from current parent
 
     TQString idStr = element.attribute("parent_id","-1");
     Uml::IDType id = STR2ID(idStr);
@@ -162,7 +162,7 @@ void CodeOperation::init (UMLOperation * parentOp)
     m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead.
     setTag(CodeOperation::findTag(parentOp));
 
-    // not needed.. done by tqparent "ownedcodeblock" class
+    // not needed.. done by parent "ownedcodeblock" class
     //  connect(parentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent()));
 
 }
diff --git a/umbrello/umbrello/codeoperation.h b/umbrello/umbrello/codeoperation.h
index 5709f31a..8bdc34fd 100644
--- a/umbrello/umbrello/codeoperation.h
+++ b/umbrello/umbrello/codeoperation.h
@@ -36,7 +36,7 @@ public:
     /**
      * Constructors
      */
-    CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * tqparent,
+    CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * parent,
                     const TQString & body = "", const TQString & comment = "");
 
     /**
@@ -45,7 +45,7 @@ public:
     virtual ~CodeOperation ( );
 
     /**
-     * Get the tqparent UMLOperation of this codeoperation.
+     * Get the parent UMLOperation of this codeoperation.
      */
     UMLOperation * getParentOperation( );
 
diff --git a/umbrello/umbrello/codeparameter.cpp b/umbrello/umbrello/codeparameter.cpp
index 60f5d098..cd10e438 100644
--- a/umbrello/umbrello/codeparameter.cpp
+++ b/umbrello/umbrello/codeparameter.cpp
@@ -50,15 +50,15 @@ CodeParameter::~CodeParameter ( ) { }
 //
 
 /**
- * Utility method to get the value of tqparent object abstract value
- * @return the value of tqparent object abstrtact
+ * Utility method to get the value of parent object abstract value
+ * @return the value of parent object abstrtact
  */
 bool CodeParameter::getAbstract ( ) {
     return m_parentObject->getAbstract();
 }
 
 /**
- * Utility method to get the value of tqparent object static
+ * Utility method to get the value of parent object static
  * Whether or not this is static.
  * @return the value of static
  */
@@ -67,7 +67,7 @@ bool CodeParameter::getStatic ( ) {
 }
 
 /**
- * Utility method to get the value of tqparent object name
+ * Utility method to get the value of parent object name
  * The name of this code parameter.
  * @return the value
  */
@@ -76,7 +76,7 @@ TQString CodeParameter::getName ( ) const {
 }
 
 /**
- * Utility method to get the value of tqparent object type.
+ * Utility method to get the value of parent object type.
  * the typeName of this parameters (e.g. boolean, int, etc or perhaps Class name of
  * an object)
  * @return the value of type
@@ -87,9 +87,9 @@ TQString CodeParameter::getTypeName ( ) {
 }
 
 /**
- * Utility method to get the value of tqparent object scope.
+ * Utility method to get the value of parent object scope.
  * The visibility of this code parameter.
- * @return the value of tqparent object scope
+ * @return the value of parent object scope
  */
 Uml::Visibility CodeParameter::getVisibility ( ) const {
     return m_parentObject->getVisibility();
@@ -139,7 +139,7 @@ UMLObject * CodeParameter::getParentObject ( ) {
     return m_parentObject;
 }
 
-// need to get the ID of the tqparent object
+// need to get the ID of the parent object
 // this is kind of broken for UMLRoles.
 TQString CodeParameter::getID () {
     UMLRole * role = dynamic_cast<UMLRole*>(m_parentObject);
@@ -187,7 +187,7 @@ void CodeParameter::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & bl
  */
 void CodeParameter::setAttributesFromNode ( TQDomElement & root) {
 
-    // set local attributes, tqparent object first
+    // set local attributes, parent object first
     TQString idStr = root.attribute("parent_id","-1");
     Uml::IDType id = STR2ID(idStr);
 
@@ -202,7 +202,7 @@ void CodeParameter::setAttributesFromNode ( TQDomElement & root) {
         // FIX..one day.
         // Ugh. This is UGLY, but we have to do it this way because UMLRoles
         // don't go into the document list of UMLobjects, and have the same
-        // ID as their tqparent UMLAssociations. So..the drill is then special
+        // ID as their parent UMLAssociations. So..the drill is then special
         // for Associations..in that case we need to find out which role will
         // serve as the parameter here. The REAL fix, of course, would be to
         // treat UMLRoles on a more even footing, but im not sure how that change
diff --git a/umbrello/umbrello/codeparameter.h b/umbrello/umbrello/codeparameter.h
index dd86d05c..dd4cd7d9 100644
--- a/umbrello/umbrello/codeparameter.h
+++ b/umbrello/umbrello/codeparameter.h
@@ -57,23 +57,23 @@ public:
     //
 
     /**
-     * Get the tqparent Code Document
+     * Get the parent Code Document
      */
     ClassifierCodeDocument * getParentDocument ( );
 
     /**
-     * Get the tqparent UMLObject
+     * Get the parent UMLObject
      */
     UMLObject * getParentObject ( );
 
     /**
-      * Utility method. Get the value of tqparent abstract value.
+      * Utility method. Get the value of parent abstract value.
       * @return the value
       */
     bool getAbstract ( );
 
     /**
-     * Utility method. Get the value of tqparent Static
+     * Utility method. Get the value of parent Static
      * Whether or not this is static.
      * @return the value
      */
@@ -124,7 +124,7 @@ public:
      */
     CodeComment * getComment ( );
 
-    // the id of this parameter is the same as the tqparent UMLObject id.
+    // the id of this parameter is the same as the parent UMLObject id.
     TQString getID ();
 
 protected:
diff --git a/umbrello/umbrello/componentwidget.h b/umbrello/umbrello/componentwidget.h
index 4f0a3a05..d07b0536 100644
--- a/umbrello/umbrello/componentwidget.h
+++ b/umbrello/umbrello/componentwidget.h
@@ -33,7 +33,7 @@ public:
     /**
      * Constructs a ComponentWidget.
      *
-     * @param view      The tqparent of this ComponentWidget.
+     * @param view      The parent of this ComponentWidget.
      * @param c The UMLComponent this will be representing.
      */
     ComponentWidget(UMLView * view, UMLComponent *c);
diff --git a/umbrello/umbrello/datatypewidget.h b/umbrello/umbrello/datatypewidget.h
index 81dbe0f9..81a53ca6 100644
--- a/umbrello/umbrello/datatypewidget.h
+++ b/umbrello/umbrello/datatypewidget.h
@@ -33,7 +33,7 @@ public:
     /**
      * Constructs an DatatypeWidget.
      *
-     * @param view              The tqparent of this DatatypeWidget.
+     * @param view              The parent of this DatatypeWidget.
      * @param d         The UMLClassifier this will be representing.
      */
     DatatypeWidget(UMLView* view, UMLClassifier *d);
diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp
index 07c9e3af..b093cae0 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.cpp
+++ b/umbrello/umbrello/dialogs/assocgenpage.cpp
@@ -25,8 +25,8 @@
 #include "../association.h"
 #include "../dialog_utils.h"
 
-AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc)
-        : TQWidget(tqparent)
+AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc)
+        : TQWidget(parent)
 {
 
     m_pAssociationWidget = assoc;
diff --git a/umbrello/umbrello/dialogs/assocgenpage.h b/umbrello/umbrello/dialogs/assocgenpage.h
index 06c32c05..6d6ffcdf 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.h
+++ b/umbrello/umbrello/dialogs/assocgenpage.h
@@ -49,10 +49,10 @@ public:
      *  Sets up the AssocGenPage.
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  tqparent  The tqparent to the AssocGenPage.
+     *  @param  parent  The parent to the AssocGenPage.
      *  @param  a       The AssociationWidget to display the properties of.
      */
-    AssocGenPage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a);
+    AssocGenPage(UMLDoc *d, TQWidget *parent, AssociationWidget *a);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp
index 425f01fe..ec95f619 100644
--- a/umbrello/umbrello/dialogs/assocpage.cpp
+++ b/umbrello/umbrello/dialogs/assocpage.cpp
@@ -14,7 +14,7 @@
 #include <klocale.h>
 #include "assocpropdlg.h"
 
-AssocPage::AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o) : TQWidget(tqparent) {
+AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(parent) {
     m_pObject = o;
     m_pView = v;
     int margin = fontMetrics().height();
diff --git a/umbrello/umbrello/dialogs/assocpage.h b/umbrello/umbrello/dialogs/assocpage.h
index 469dd35d..dbb0eec8 100644
--- a/umbrello/umbrello/dialogs/assocpage.h
+++ b/umbrello/umbrello/dialogs/assocpage.h
@@ -45,11 +45,11 @@ public:
     /**
      *  Constructs an instance of AssocPage.
      *
-     *  @param  tqparent  The tqparent of the page
+     *  @param  parent  The parent of the page
      *  @param  v       The view the UMLObject being represented.
      *  @param  o       The UMLObject being represented
      */
-    AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o);
+    AssocPage(TQWidget *parent, UMLView * v, UMLObject * o);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp
index cf4f5b21..1d5b9c77 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp
@@ -35,14 +35,14 @@
 #include "../umlview.h"
 
 
-AssocPropDlg::AssocPropDlg (TQWidget *tqparent, AssociationWidget * assocWidget, int pageNum)
+AssocPropDlg::AssocPropDlg (TQWidget *parent, AssociationWidget * assocWidget, int pageNum)
         : KDialogBase(IconList, i18n("Association Properties"), Ok | Apply | Cancel | Help,
-                      Ok, tqparent, "_ASSOCPROPDLG_", true, true)
+                      Ok, parent, "_ASSOCPROPDLG_", true, true)
 {
     init();
     m_pAssoc = assocWidget;
 
-    m_pDoc = ((UMLApp *)tqparent) -> getDocument(); // needed?
+    m_pDoc = ((UMLApp *)parent) -> getDocument(); // needed?
 
     setupPages(assocWidget);
     showPage(pageNum);
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h
index 359add61..10fe344b 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.h
+++ b/umbrello/umbrello/dialogs/assocpropdlg.h
@@ -36,12 +36,12 @@ public:
 
     /**
      *  Sets up a Association Properties Dialog.
-     *  @param  tqparent  The tqparent of the AssocPropDlg
+     *  @param  parent  The parent of the AssocPropDlg
      *  @param  a       The Association Widget to display properties of.
      *  @param  pageNum The page to show first.
      */
 
-    AssocPropDlg(TQWidget *tqparent, AssociationWidget *a, int pageNum = 0);
+    AssocPropDlg(TQWidget *parent, AssociationWidget *a, int pageNum = 0);
 
     /**
      *  Standard deconstructor
diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp
index f603abee..a44a5f05 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.cpp
+++ b/umbrello/umbrello/dialogs/assocrolepage.cpp
@@ -23,8 +23,8 @@
 // local includes
 #include "../dialog_utils.h"
 
-AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc)
-        : TQWidget(tqparent)
+AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc)
+        : TQWidget(parent)
 {
 
     m_pAssociationWidget = assoc;
diff --git a/umbrello/umbrello/dialogs/assocrolepage.h b/umbrello/umbrello/dialogs/assocrolepage.h
index ada69b4f..beede96e 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.h
+++ b/umbrello/umbrello/dialogs/assocrolepage.h
@@ -45,10 +45,10 @@ public:
      *  Sets up the AssocRolePage.
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  tqparent  The tqparent to the AssocRolePage.
+     *  @param  parent  The parent to the AssocRolePage.
      *  @param  a       The AssociationWidget to display the properties of.
      */
-    AssocRolePage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a);
+    AssocRolePage(UMLDoc *d, TQWidget *parent, AssociationWidget *a);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp
index 7757b2d8..d633b6ae 100644
--- a/umbrello/umbrello/dialogs/classgenpage.cpp
+++ b/umbrello/umbrello/dialogs/classgenpage.cpp
@@ -38,7 +38,7 @@
 #include "../umlview.h"
 #include "../stereotype.h"
 
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLObject* o) : TQWidget(tqparent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget(parent) {
     m_pWidget = 0;
     m_pObject = 0;
     m_pInstanceWidget = 0;
@@ -236,7 +236,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLObject* o) : TQWidg
     //////////
 }
 
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, ObjectWidget* o) : TQWidget(tqparent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWidget(parent) {
     m_pObject = 0;
     m_pInstanceWidget = 0;
     m_pWidget = o;
@@ -301,7 +301,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, ObjectWidget* o) : TQW
         connect( m_pDrawActorCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotActorToggled( bool ) ) );
 }
 
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget) : TQWidget(tqparent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget) : TQWidget(parent) {
     m_pWidget = 0;
     m_pObject = 0;
     m_pInstanceWidget = widget;
diff --git a/umbrello/umbrello/dialogs/classgenpage.h b/umbrello/umbrello/dialogs/classgenpage.h
index d6d06a50..fed32a2d 100644
--- a/umbrello/umbrello/dialogs/classgenpage.h
+++ b/umbrello/umbrello/dialogs/classgenpage.h
@@ -45,29 +45,29 @@ public:
      *  Sets up the ClassGenPage.
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  tqparent  The tqparent to the ClassGenPage.
+     *  @param  parent  The parent to the ClassGenPage.
      *  @param  o       The UMLObject to display the properties of.
      */
-    ClassGenPage(UMLDoc *d, TQWidget *tqparent, UMLObject * o);
+    ClassGenPage(UMLDoc *d, TQWidget *parent, UMLObject * o);
 
     /**
      *  Sets up the ClassGenPage for an ObjectWidget
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  tqparent  The tqparent to the ClassGenPage.
+     *  @param  parent  The parent to the ClassGenPage.
      *  @param  o       The ObjectWidget to display the properties of.
      */
-    ClassGenPage(UMLDoc *d, TQWidget *tqparent, ObjectWidget * o);
+    ClassGenPage(UMLDoc *d, TQWidget *parent, ObjectWidget * o);
 
     /**
      *  Sets up the ClassGenPage for a UMLWidget instance (used
      *  for component instances on deployment diagrams)
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  tqparent  The tqparent to the ClassGenPage.
+     *  @param  parent  The parent to the ClassGenPage.
      *  @param  widget  The UMLWidget to display the properties of.
      */
-    ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget);
+    ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index df0efb41..a96cb645 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -29,8 +29,8 @@
 
 using namespace Uml;
 
-ClassifierListPage::ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier,
-                                       UMLDoc* doc, Uml::Object_Type type) : TQWidget(tqparent) {
+ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifier,
+                                       UMLDoc* doc, Uml::Object_Type type) : TQWidget(parent) {
     m_itemType = type;
     TQString typeName("");
     TQString newItemType("");
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h
index 7f0e298f..2675fd35 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.h
+++ b/umbrello/umbrello/dialogs/classifierlistpage.h
@@ -43,12 +43,12 @@ public:
     /**
      *  Sets up the ClassifierListPage
      *
-     *  @param tqparent   The tqparent to the ClassAttPage.
+     *  @param parent   The parent to the ClassAttPage.
      *  @param classifier       The Concept to display the properties of.
      *      @param doc The UMLDoc document
      *      @param type The type of listItem this handles
      */
-    ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type);
+    ClassifierListPage(TQWidget* parent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp
index 1b744ca0..169de20e 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/classpropdlg.cpp
@@ -33,9 +33,9 @@
 #include "../uml.h"
 #include "../umlview.h"
 
-ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLObject * c, int pageNum, bool assoc)
+ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLObject * c, int pageNum, bool assoc)
         : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
-              Ok, tqparent, "_CLASSDLG_", true, true) {
+              Ok, parent, "_CLASSDLG_", true, true) {
     m_pWidget = 0;
     m_pGenPage = 0;
     m_pAttPage = 0;
@@ -52,9 +52,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLObject * c, int pageNum, bool
     showPage(pageNum);
 }
 
-ClassPropDlg::ClassPropDlg(TQWidget *tqparent, ObjectWidget * o)
+ClassPropDlg::ClassPropDlg(TQWidget *parent, ObjectWidget * o)
         : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
-              Ok, tqparent, "_CLASSDLG_", true, true) {
+              Ok, parent, "_CLASSDLG_", true, true) {
     m_pWidget = o;
     m_pGenPage = 0;
     m_pAttPage = 0;
@@ -82,9 +82,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *tqparent, ObjectWidget * o)
     setMinimumSize(340,420);
 }
 
-ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLWidget * w)
+ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLWidget * w)
         : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
-              Ok, tqparent, "_CLASSDLG_", true, true) {
+              Ok, parent, "_CLASSDLG_", true, true) {
     m_pWidget = w;
     m_pGenPage = 0;
     m_pAttPage = 0;
@@ -95,7 +95,7 @@ ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLWidget * w)
     m_pOptionsPage = 0;
     m_Type = pt_Widget;
     m_pObject = w -> getUMLObject();
-    m_pDoc = ((UMLApp *)tqparent) -> getDocument();
+    m_pDoc = ((UMLApp *)parent) -> getDocument();
 
     if (w->getBaseType() == Uml::wt_Class
             || w->getBaseType() == Uml::wt_Interface
diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h
index afb89f46..8078f372 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.h
+++ b/umbrello/umbrello/dialogs/classpropdlg.h
@@ -45,28 +45,28 @@ public:
     /**
      *  Sets up a ClassPropDlg.
      *
-     *  @param  tqparent  The tqparent of the ClassPropDlg
+     *  @param  parent  The parent of the ClassPropDlg
      *  @param  c       The UMLObject to display properties of.
      *  @param  pageNum The page to show first.
      *  @param assoc    Determines whether to display associations
      */
-    ClassPropDlg(TQWidget *tqparent, UMLObject *c, int pageNum = 0, bool assoc = false);
+    ClassPropDlg(TQWidget *parent, UMLObject *c, int pageNum = 0, bool assoc = false);
 
     /**
      *  Sets up a ClassPropDlg.
      *
-     *  @param  tqparent  The tqparent of the ClassPropDlg
+     *  @param  parent  The parent of the ClassPropDlg
      *  @param  o       The ObjectWidget to display properties of.
      */
-    ClassPropDlg(TQWidget *tqparent, ObjectWidget * o);
+    ClassPropDlg(TQWidget *parent, ObjectWidget * o);
 
     /**
      *  Sets up a ClassPropDlg.
      *
-     *  @param  tqparent  The tqparent of the ClassPropDlg
+     *  @param  parent  The parent of the ClassPropDlg
      *  @param  o       The UMLWidget to display properties of.
      */
-    ClassPropDlg(TQWidget *tqparent, UMLWidget * o);
+    ClassPropDlg(TQWidget *parent, UMLWidget * o);
 
 
     /**
diff --git a/umbrello/umbrello/dialogs/classwizard.cpp b/umbrello/umbrello/dialogs/classwizard.cpp
index 1cabe1b2..c49e418f 100644
--- a/umbrello/umbrello/dialogs/classwizard.cpp
+++ b/umbrello/umbrello/dialogs/classwizard.cpp
@@ -26,7 +26,7 @@
 #include "../umlclassifierlistitemlist.h"
 #include "../classifierlistitem.h"
 
-ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> tqparent(), "_CLASSWIZARD_", true) {
+ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> parent(), "_CLASSWIZARD_", true) {
     m_pDoc = pDoc;
     //create a unique class to start with
     UMLObject * pTemp = 0;
diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp
index 4f9f03a8..33fb743b 100644
--- a/umbrello/umbrello/dialogs/codeeditor.cpp
+++ b/umbrello/umbrello/dialogs/codeeditor.cpp
@@ -55,16 +55,16 @@
 #include "umlroledialog.h"
 #include "umloperationdialog.h"
 
-CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * tqparent, const char * name , CodeDocument * doc)
-        : TQTextEdit ( text, context, tqparent, name)
+CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * parent, const char * name , CodeDocument * doc)
+        : TQTextEdit ( text, context, parent, name)
 {
-    init(tqparent, doc);
+    init(parent, doc);
 }
 
-CodeEditor::CodeEditor ( CodeViewerDialog * tqparent, const char* name, CodeDocument * doc )
-        : TQTextEdit ( tqparent, name )
+CodeEditor::CodeEditor ( CodeViewerDialog * parent, const char* name, CodeDocument * doc )
+        : TQTextEdit ( parent, name )
 {
-    init(tqparent, doc);
+    init(parent, doc);
 }
 
 /*
@@ -129,7 +129,7 @@ void CodeEditor::doubleClicked(int para, int pos)
 
 }
 
-// allow us to edit, as appropriate, the tqparent UMLObject of the
+// allow us to edit, as appropriate, the parent UMLObject of the
 // given text block.
 void CodeEditor::editTextBlock(TextBlock * tBlock, int para) {
 
@@ -168,7 +168,7 @@ void CodeEditor::editTextBlock(TextBlock * tBlock, int para) {
                 }
                 else
                 {
-                    kError()<<" CodeViewerDlg ERROR: UNKNOWN tqparent for textBlock"<<endl;
+                    kError()<<" CodeViewerDlg ERROR: UNKNOWN parent for textBlock"<<endl;
                 }
 
             }
@@ -223,7 +223,7 @@ void CodeEditor::loadFromDocument ()
 
 }
 
-void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine)
+void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine)
 {
 
     // set some params
@@ -253,18 +253,18 @@ void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool edita
             setParagraphBackgroundColor(para,bgcolor);
 
     // record paragraph information
-    // Did we already start recording info for this tqparent object?
+    // Did we already start recording info for this parent object?
     TextBlockInfo * tbinfo;
-    if(m_tbInfoMap->contains(tqparent))
-        tbinfo = (*m_tbInfoMap)[tqparent];
+    if(m_tbInfoMap->contains(parent))
+        tbinfo = (*m_tbInfoMap)[parent];
     else {
         tbinfo = new TextBlockInfo();
         tbinfo->displayName = displayName;
-        tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(tqparent) ? true : false;
-        m_tbInfoMap->insert(tqparent,tbinfo);
+        tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(parent) ? true : false;
+        m_tbInfoMap->insert(parent,tbinfo);
     }
 
-    // set a tqparent, if its not already set
+    // set a parent, if its not already set
     if(umlobj && !tbinfo->getParent())
     {
         tbinfo->displayName = displayName;
@@ -272,13 +272,13 @@ void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool edita
         tbinfo->isClickable = textBlockIsClickable(umlobj);
     }
 
-    // now mark all lines that we just inserted as belonging to the tqparent
+    // now mark all lines that we just inserted as belonging to the parent
     for(int para=startLine;para<=endLine;para++)
-        m_textBlockList.insert(para,tqparent);
+        m_textBlockList.insert(para,parent);
 
     // lastly, update the para info
-    // start position is relative to the FIRST tqparent position
-    int start = startLine - m_textBlockList.findRef(tqparent);
+    // start position is relative to the FIRST parent position
+    int start = startLine - m_textBlockList.findRef(parent);
     int size = endLine-startLine;
 
     // create the object that records this particular "paragraph"
@@ -293,7 +293,7 @@ void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool edita
     {
         // now we have to fix the 'start' value for all the para
         // info blocks that coorspond to textblocks that we inserted
-        // inside of. This means tqparent tblock paragraph locations
+        // inside of. This means parent tblock paragraph locations
         // that are greater than zero in that type of textblock
 
         int increase = size + 1;
@@ -353,7 +353,7 @@ void CodeEditor::appendText(TextBlockList * items)
             appendText(cb);
         /*
                         // no! shouldn't be any 'naked' comments floating about. Always
-                        // are assocated with a tqparent code block
+                        // are assocated with a parent code block
                         else if ( (cm = dynamic_cast<CodeComment*>(tb)) )
                                 appendText(cm);
         */
@@ -363,7 +363,7 @@ void CodeEditor::appendText(TextBlockList * items)
 
 }
 
-void CodeEditor::appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj , const TQString & componentName)
+void CodeEditor::appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj , const TQString & componentName)
 {
 
     if(!comment->getWriteOutText() && !m_showHiddenBlocks)
@@ -376,7 +376,7 @@ void CodeEditor::appendText (CodeComment * comment, TextBlock * tqparent, UMLObj
     TQString indent = comment->getIndentationString();
     TQString text = comment->toString(); // use comment formatting, NOT formatMultiLineText(comment->toString(), indent, "\n");
     if(!StringIsBlank(text))
-        insert(text,tqparent,true,getState().fontColor, bgcolor, umlObj, componentName);
+        insert(text,parent,true,getState().fontColor, bgcolor, umlObj, componentName);
 
 }
 
@@ -462,7 +462,7 @@ void CodeEditor::appendText (CodeMethodBlock * mb) {
 
     TQString componentName = TQString("<b>parentless method\?</b>");
 
-    // ugly, but we need to know if there is a tqparent object here.
+    // ugly, but we need to know if there is a parent object here.
     CodeOperation * op = dynamic_cast<CodeOperation*>(mb);
     CodeAccessorMethod * accessor = dynamic_cast<CodeAccessorMethod*>(mb);
     UMLObject * parentObj = 0;
@@ -798,7 +798,7 @@ void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc )
 
     setFont( getState().font );
 
-    // set name of tqparent doc
+    // set name of parent doc
     ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(m_parentDoc);
     if(cdoc)
         parentDocName = cdoc->getParentClassifier()->getName();
@@ -860,7 +860,7 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) {
         //cerr<<"UPDATE GOT CONTENT:["<<content.latin1()<<"] to block:"<<block<<endl;
         block->setText(content);
 
-        // if a tqparent for the block, try to set its documentation
+        // if a parent for the block, try to set its documentation
         // as long as its NOT an accessor codeblock.
         if(parentObj && !info->isCodeAccessorMethod)
             parentObj->setDoc(content);
diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h
index 5f72fc7a..d5c42d1f 100644
--- a/umbrello/umbrello/dialogs/codeeditor.h
+++ b/umbrello/umbrello/dialogs/codeeditor.h
@@ -46,8 +46,8 @@ class CodeEditor : public TQTextEdit
   TQ_OBJECT
 public:
 
-    explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * tqparent = 0, const char * name = 0 , CodeDocument * doc = 0);
-    explicit CodeEditor ( CodeViewerDialog * tqparent, const char* name = 0, CodeDocument * doc = 0);
+    explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * parent = 0, const char * name = 0 , CodeDocument * doc = 0);
+    explicit CodeEditor ( CodeViewerDialog * parent, const char* name = 0, CodeDocument * doc = 0);
     ~CodeEditor ();
 
     // return code viewer state
@@ -63,7 +63,7 @@ protected:
     void appendText (CodeClassFieldDeclarationBlock * db );
     void appendText (TextBlockList * items);
     void appendText (CodeMethodBlock * mb);
-    void appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj = 0, const TQString & compName="");
+    void appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj = 0, const TQString & compName="");
     void appendText (CodeBlockWithComments * cb );
 
     // Rebuild our view of the document. Happens whenever we change
@@ -83,7 +83,7 @@ protected:
     // and 'return' events.
     void keyPressEvent ( TQKeyEvent * e );
 
-    // (re) load the tqparent code document into the editor
+    // (re) load the parent code document into the editor
     void loadFromDocument();
 
     // specialized popup menu for our tool
@@ -111,7 +111,7 @@ private:
     TextBlockList m_textBlockList;
 
     // main insert routine. Will append if startline is not supplied.
-    void insert (const TQString & text, TextBlock * tqparent, bool isEditable = false,
+    void insert (const TQString & text, TextBlock * parent, bool isEditable = false,
                  const TQColor & fgcolor = TQColor("black"), const TQColor & bgcolor = TQColor("white"),
                  UMLObject * umlobj = 0, const TQString & displayName = "", int startLine = -1);
 
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
index ab54eb3d..a5ce2f57 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
@@ -37,8 +37,8 @@
 #include <tqlistview.h>
 #include <tqbuttongroup.h>
 
-CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *tqparent)
-  : CodeGenerationOptionsBase(tqparent)
+CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *parent)
+  : CodeGenerationOptionsBase(parent)
 {
     init();
 }
@@ -154,7 +154,7 @@ void CodeGenerationOptionsPage::apply() {
         m_parentPolicy->setIndentationAmount(m_SelectIndentationNumber->value());
 
         // emit in THIS order.. the first signal triggers any sub-class to do its apply
-        // slot, THEN, once we are all updated, we may sync the tqparent generator's code
+        // slot, THEN, once we are all updated, we may sync the parent generator's code
         // documents
         emit applyClicked();
         emit syncCodeDocumentsToParent();
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.h b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
index f444254e..15ac05b4 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.h
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
@@ -41,7 +41,7 @@ class CodeGenerationOptionsPage : public CodeGenerationOptionsBase  {
     Q_OBJECT
   TQ_OBJECT
 public:
-    CodeGenerationOptionsPage(TQWidget *tqparent=0);
+    CodeGenerationOptionsPage(TQWidget *parent=0);
     ~CodeGenerationOptionsPage();
     void setDefaults();
     TQString getCodeGenerationLanguage();
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
index 0cdd5e08..0e488e75 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
@@ -29,8 +29,8 @@
 /** This is the page which comes up IF there is no special options for the
  * code generator.
  */
-CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy )
-        :CodeGenerationPolicyBase(tqparent,name)
+CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *parent, const char *name, CodeGenPolicyExt * policy )
+        :CodeGenerationPolicyBase(parent,name)
 {
     m_parentPolicy = policy;
 }
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.h b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
index 54723dd3..6325a91e 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicypage.h
+++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
@@ -33,7 +33,7 @@ class CodeGenerationPolicyPage : public CodeGenerationPolicyBase  {
     Q_OBJECT
   TQ_OBJECT
 public:
-    explicit CodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, CodeGenPolicyExt * policy = 0);
+    explicit CodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CodeGenPolicyExt * policy = 0);
 
     virtual ~CodeGenerationPolicyPage();
 
diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
index 3859d519..30ab5817 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
@@ -165,7 +165,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
                 TQDir dir;
                 if(!dir.mkdir(info.filePath()))
                 {
-                    KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its tqparent folder or select another, valid, folder."),
+                    KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its parent folder or select another, valid, folder."),
                                        i18n("Error Creating Folder"));
                     return;
                 }
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
index ef0091fe..3f11adb3 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
@@ -30,10 +30,10 @@
 #include "../classifiercodedocument.h"
 #include "codeeditor.h"
 
-CodeViewerDialog::CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc,
+CodeViewerDialog::CodeViewerDialog ( TQWidget* parent, CodeDocument * doc,
                                      Settings::CodeViewerState state,
                                      const char* name, bool modal, WFlags fl )
-        : CodeViewerDialogBase ( tqparent, name, modal, fl )
+        : CodeViewerDialogBase ( parent, name, modal, fl )
 
 {
     m_state = state;
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h
index 2228dfae..eef90445 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.h
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -45,7 +45,7 @@ class CodeViewerDialog : public CodeViewerDialogBase
   TQ_OBJECT
 public:
 
-    CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state,
+    CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, Settings::CodeViewerState state,
                        const char* name = 0, bool modal = false, WFlags fl = 0 );
     ~CodeViewerDialog ();
 
diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
index 3950d682..f4715b0d 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
@@ -26,8 +26,8 @@
 #include <kcolorbutton.h>
 
 
-CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *tqparent, const char *name )
-        :CodeViewerOptionsBase(tqparent,name)
+CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *parent, const char *name )
+        :CodeViewerOptionsBase(parent,name)
 {
     init (options);
 }
diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.h b/umbrello/umbrello/dialogs/codevieweroptionspage.h
index f5a21736..1e1b4eea 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionspage.h
+++ b/umbrello/umbrello/dialogs/codevieweroptionspage.h
@@ -30,7 +30,7 @@ class CodeViewerOptionsPage : public CodeViewerOptionsBase  {
     Q_OBJECT
   TQ_OBJECT
 public:
-    CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *tqparent, const char *name=0);
+    CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *parent, const char *name=0);
     ~CodeViewerOptionsPage();
 
     Settings::CodeViewerState getOptions();
diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
index 9732bbaf..3da163b7 100644
--- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
+++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
@@ -29,10 +29,10 @@
 /** This is the page which comes up IF there is no special options for the
  * code generator.
  */
-DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy )
-        :CodeGenerationPolicyPage(tqparent,name,policy)
+DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *parent, const char *name, CodeGenPolicyExt * policy )
+        :CodeGenerationPolicyPage(parent,name,policy)
 {
-    textLabel = new TQLabel(tqparent,"textLabel");
+    textLabel = new TQLabel(parent,"textLabel");
     textLabel->setText(tr2i18n("<p align=\"center\">No Options Available.</p>"));
 }
 
diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
index 2bbf169c..bbc1c85a 100644
--- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
+++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
@@ -28,7 +28,7 @@ class DefaultCodeGenPolicyPage : public CodeGenerationPolicyPage
 
 public:
 
-    explicit DefaultCodeGenPolicyPage( TQWidget* tqparent = 0, const char* name = 0, CodeGenPolicyExt * policy =0);
+    explicit DefaultCodeGenPolicyPage( TQWidget* parent = 0, const char* name = 0, CodeGenPolicyExt * policy =0);
 
     ~DefaultCodeGenPolicyPage();
 
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp
index cff98397..34176e3a 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.cpp
+++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp
@@ -30,7 +30,7 @@
 #include "../umlnamespace.h"
 
 
-DiagramPrintPage::DiagramPrintPage(TQWidget * tqparent, UMLDoc * m_pDoc) : KPrintDialogPage(tqparent), m_pDoc(m_pDoc) {
+DiagramPrintPage::DiagramPrintPage(TQWidget * parent, UMLDoc * m_pDoc) : KPrintDialogPage(parent), m_pDoc(m_pDoc) {
     int margin = fontMetrics().height();
     setTitle(i18n("&Diagrams"));
     TQHBoxLayout * mainLayout = new TQHBoxLayout(this);
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.h b/umbrello/umbrello/dialogs/diagramprintpage.h
index 94e1deb5..b7980ca0 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.h
+++ b/umbrello/umbrello/dialogs/diagramprintpage.h
@@ -41,10 +41,10 @@ public:
     /**
      *  Constructs the diagram print page.
      *
-     *  @param tqparent The tqparent to the page.
+     *  @param parent The parent to the page.
      *  @param doc      The @ref UMLDoc class instance being used.
      */
-    DiagramPrintPage(TQWidget * tqparent, UMLDoc *doc);
+    DiagramPrintPage(TQWidget * parent, UMLDoc *doc);
 
     /**
      *  Stnadard deconstructor.
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
index fa1e6d60..443ad9e2 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@@ -25,12 +25,12 @@
 #include "../umlviewimageexportermodel.h"
 
 ExportAllViewsDialog::ExportAllViewsDialog(
-        TQWidget* tqparent /* = 0 */,
+        TQWidget* parent /* = 0 */,
         const char* name /* = 0 */,
         bool modal /* = false */,
         WFlags fl /* = 0*/,
         const TQString &defaultMimeType /*= "image/png"*/)
-  : ExportAllViewsDialogBase(tqparent,name, modal,fl) {
+  : ExportAllViewsDialogBase(parent,name, modal,fl) {
     // create and initialize m_imageType
     m_imageType = new KFileFilterCombo(this, "m_imageType");
     m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.h b/umbrello/umbrello/dialogs/exportallviewsdialog.h
index 3b28037c..69a4135d 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.h
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.h
@@ -35,7 +35,7 @@ public:
     /**
      * Constructor for UMLViewImageExporterModel.
      *
-     * @param tqparent The tqparent of the dialog.
+     * @param parent The parent of the dialog.
      * @param name The internal name.
      * @param modal If modal is true the dialog will block input to other the windows
      *              in the application until it's closed.
@@ -44,7 +44,7 @@ public:
      *
      * @see TQDialog::TQDialog
      */
-    explicit ExportAllViewsDialog(TQWidget* tqparent = 0, const char* name = 0,
+    explicit ExportAllViewsDialog(TQWidget* parent = 0, const char* name = 0,
                          bool modal = false, WFlags fl = 0,
                          const TQString& defaultMimeType = "image/png");
 
diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp
index 420b425e..effb585d 100644
--- a/umbrello/umbrello/dialogs/notedialog.cpp
+++ b/umbrello/umbrello/dialogs/notedialog.cpp
@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 
 
-NoteDialog::NoteDialog( TQWidget * tqparent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, tqparent, "_NOTEDIALOG_", true, true) {
+NoteDialog::NoteDialog( TQWidget * parent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, parent, "_NOTEDIALOG_", true, true) {
     m_pNoteWidget = pNote;
     int margin = fontMetrics().height();
 
diff --git a/umbrello/umbrello/dialogs/notedialog.h b/umbrello/umbrello/dialogs/notedialog.h
index 6f6e2fd2..ed42319f 100644
--- a/umbrello/umbrello/dialogs/notedialog.h
+++ b/umbrello/umbrello/dialogs/notedialog.h
@@ -33,7 +33,7 @@ public:
     /**
      *  Constructs an NoteDialog.
      */
-    NoteDialog( TQWidget * tqparent, NoteWidget * pNote );
+    NoteDialog( TQWidget * parent, NoteWidget * pNote );
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp
index c7661ced..9088b794 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.cpp
+++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp
@@ -23,8 +23,8 @@
 OverwriteDialogue::OverwriteDialogue(
         const TQString& fileName,
         const TQString& outputDirectory,
-        bool applyToAllRemaining, TQWidget* tqparent, const char* name) :
-KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, tqparent, name) {
+        bool applyToAllRemaining, TQWidget* parent, const char* name) :
+KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) {
 
     TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
 
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.h b/umbrello/umbrello/dialogs/overwritedialogue.h
index f67d7673..fb85e967 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.h
+++ b/umbrello/umbrello/dialogs/overwritedialogue.h
@@ -36,7 +36,7 @@ public:
      * constructor sets up the dialog, adding checkbox and label
      */
     OverwriteDialogue(const TQString& fileName, const TQString& outputDirectory,
-                      bool applyToAllRemaining, TQWidget* tqparent=0, const char* name=0);
+                      bool applyToAllRemaining, TQWidget* parent=0, const char* name=0);
 
     /**
      * destrictor doesn't do anything
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp
index ce5b5590..38a75292 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp
@@ -31,8 +31,8 @@
 
 #include "parmpropdlg.moc"
 
-ParmPropDlg::ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a)
-        : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, tqparent, "_PARMPROPDLG_", true, true)
+ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a)
+        : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, parent, "_PARMPROPDLG_", true, true)
 {
     m_pUmldoc = doc;
     m_pAtt = a;
@@ -127,9 +127,9 @@ ParmPropDlg::ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a)
 //    m_pTypeCB->setAutoCompletion(false);
 
     //add template parameters
-    UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() );
+    UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
     if (pConcept == NULL) {
-        kError() << "ParmPropDlg: grandtqparent of " << m_pAtt->getName()
+        kError() << "ParmPropDlg: grandparent of " << m_pAtt->getName()
         << " is not a UMLClassifier" << endl;
     } else {
         UMLTemplateList tmplParams( pConcept->getTemplateList() );
@@ -219,9 +219,9 @@ void ParmPropDlg::slotOk() {
         m_pAtt->setParmKind( getParmKind() );
         m_pAtt->setStereotype( m_pStereoTypeCB->currentText() );
         TQString typeName = m_pTypeCB->currentText();
-        UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() );
+        UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
         if (pConcept == NULL) {
-            kError() << "ParmPropDlg::slotOk: grandtqparent of " << m_pAtt->getName()
+            kError() << "ParmPropDlg::slotOk: grandparent of " << m_pAtt->getName()
             << " is not a UMLClassifier" << endl;
         } else {
             UMLTemplate *tmplParam = pConcept->findTemplate(typeName);
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h
index 8beca582..0164277d 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.h
+++ b/umbrello/umbrello/dialogs/parmpropdlg.h
@@ -29,7 +29,7 @@ class UMLDoc;
 /**
  * Displays a dialog box that displays properties of a paramater.
  * You need to make sure that @ref UMLDoc is made to be the
- * tqparent.
+ * parent.
  *
  * @short A properties dialog box for a parameter.
  * @author Paul Hensgen <phensgen@techie.com>
@@ -42,10 +42,10 @@ public:
     /**
      * Constructs a ParmPropDlg.
      *
-     * @param tqparent    The tqparent of the dialog.
+     * @param parent    The parent of the dialog.
      * @param a The parameter to represent.
      */
-    ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a);
+    ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a);
 
     /**
      * Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
index 6d9473c7..a5b742b1 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
@@ -17,8 +17,8 @@
 #include "../umldoc.h"
 #include "classpropdlg.h"
 
-PkgContentsPage::PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg)
-        : TQWidget(tqparent)
+PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg)
+        : TQWidget(parent)
 {
     m_pPackage = pkg;
     int margin = fontMetrics().height();
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.h b/umbrello/umbrello/dialogs/pkgcontentspage.h
index ef6faff1..65db8d8f 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.h
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.h
@@ -32,10 +32,10 @@ public:
     /**
      * Constructs an instance of PkgContentsPage.
      *
-     * @param tqparent    The tqparent of the page.
+     * @param parent    The parent of the page.
      * @param pkg               The UMLPackage being represented.
      */
-    PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg);
+    PkgContentsPage(TQWidget *parent, UMLPackage *pkg);
 
     /**
      * Standard destructor.
diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp
index e49ea6d9..1c175752 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.cpp
+++ b/umbrello/umbrello/dialogs/selectopdlg.cpp
@@ -26,10 +26,10 @@
 #include "../umlview.h"
 #include "../dialog_utils.h"
 
-SelectOpDlg::SelectOpDlg(UMLView * tqparent, UMLClassifier * c)
-        : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, tqparent, "_SELOPDLG_", true, true)
+SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c)
+        : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, parent, "_SELOPDLG_", true, true)
 {
-    m_pView = tqparent;
+    m_pView = parent;
     TQVBoxLayout * topLayout = new TQVBoxLayout(plainPage());
 
     m_pOpGB = new TQGroupBox(i18n("Select Operation"), plainPage());
diff --git a/umbrello/umbrello/dialogs/selectopdlg.h b/umbrello/umbrello/dialogs/selectopdlg.h
index 3c12b1b1..be8a38ad 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.h
+++ b/umbrello/umbrello/dialogs/selectopdlg.h
@@ -44,10 +44,10 @@ public:
     /**
      *  Constructs a SelectOpDlg instance.
      *
-     *  @param  tqparent  The tqparent to this instance.
+     *  @param  parent  The parent to this instance.
      *  @param  c       The concept to get the operations from.
      */
-    SelectOpDlg(UMLView * tqparent, UMLClassifier * c);
+    SelectOpDlg(UMLView * parent, UMLClassifier * c);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index a227572d..b5cddff5 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -26,9 +26,9 @@
 #include "codevieweroptionspage.h"
 #include "../dialog_utils.h"
 
-SettingsDlg::SettingsDlg( TQWidget * tqparent, Settings::OptionState *state )
+SettingsDlg::SettingsDlg( TQWidget * parent, Settings::OptionState *state )
         : KDialogBase( IconList, i18n("Umbrello Setup"),
-               Help | Default | Apply | Ok | Cancel, Ok, tqparent, 0, true, true ) {
+               Help | Default | Apply | Ok | Cancel, Ok, parent, 0, true, true ) {
     m_bChangesApplied = false;
     m_pOptionState = state;
     setHelp( "umbrello/index.html", TQString() );
diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h
index a01696c8..228ac654 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.h
+++ b/umbrello/umbrello/dialogs/settingsdlg.h
@@ -46,7 +46,7 @@ class SettingsDlg : public KDialogBase {
   TQ_OBJECT
 
 public:
-    SettingsDlg(TQWidget * tqparent, Settings::OptionState *state);
+    SettingsDlg(TQWidget * parent, Settings::OptionState *state);
     ~SettingsDlg();
 
     //public methods
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp
index af59de17..d6ea57ce 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp
@@ -157,7 +157,7 @@ bool UMLAttributeDialog::apply() {
         m_pNameLE->setText( m_pAttribute->getName() );
         return false;
     }
-    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->tqparent() );
+    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->parent() );
     UMLObject *o = pConcept->findChildObject(name);
     if (o && o != m_pAttribute) {
         KMessageBox::error(this, i18n("The attribute name you have chosen is already being used in this operation."),
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
index ba111405..55a47857 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
@@ -186,7 +186,7 @@ bool UMLEntityAttributeDialog::apply() {
         m_pNameLE->setText( m_pEntityAttribute->getName() );
         return false;
     }
-    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->tqparent() );
+    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->parent() );
     UMLObject *o = pConcept->findChildObject(name);
     if (o && o != m_pEntityAttribute) {
         KMessageBox::error(this, i18n("The entity attribute name you have chosen is already being used in this operation."),
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index 7edb1e35..e8216b99 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -46,8 +46,8 @@
 #include "../stereotype.h"
 #include "../uniqueid.h"
 
-UMLOperationDialog::UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation )
-        : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLOPERATIONDLG_", true, true) {
+UMLOperationDialog::UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation )
+        : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, parent, "_UMLOPERATIONDLG_", true, true) {
     m_pOperation = pOperation;
     m_doc = UMLApp::app()->getDocument();
     m_pMenu = 0;
@@ -162,7 +162,7 @@ void UMLOperationDialog::setupDialog() {
     m_pRtypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
 
     // add template parameters
-    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->tqparent());
+    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->parent());
     if (classifier) {
         UMLClassifierListItemList tmplParams( classifier->getFilteredList(Uml::ot_Template) );
         for (UMLClassifierListItem *li = tmplParams.first(); li; li = tmplParams.next())
@@ -459,7 +459,7 @@ bool UMLOperationDialog::apply()
         return false;
     }
 
-    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->tqparent() );
+    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->parent() );
     if( classifier != 0L &&
             classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) )
     {
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.h b/umbrello/umbrello/dialogs/umloperationdialog.h
index 2f67bfe2..7a932554 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.h
+++ b/umbrello/umbrello/dialogs/umloperationdialog.h
@@ -43,7 +43,7 @@ public:
     /**
     *   Constructor
     */
-    UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation );
+    UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation );
 
     /**
     *   Deconstructor
diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp
index 00f2bd1a..607ac759 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.cpp
+++ b/umbrello/umbrello/dialogs/umlroledialog.cpp
@@ -21,8 +21,8 @@
 #include "../umlrole.h"
 #include "umlroleproperties.h"
 
-UMLRoleDialog::UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole )
-        : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLROLEDLG_", true, true)
+UMLRoleDialog::UMLRoleDialog( TQWidget * parent, UMLRole * pRole )
+        : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, parent, "_UMLROLEDLG_", true, true)
 {
     m_pRole = pRole;
     setupDialog();
diff --git a/umbrello/umbrello/dialogs/umlroledialog.h b/umbrello/umbrello/dialogs/umlroledialog.h
index 0b41060d..c429e2e4 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.h
+++ b/umbrello/umbrello/dialogs/umlroledialog.h
@@ -30,7 +30,7 @@ public:
     /**
     *   Constructor
     */
-    UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole );
+    UMLRoleDialog( TQWidget * parent, UMLRole * pRole );
 
     /**
     *   Deconstructor
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp
index 481eafb3..fe2e2f5f 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.cpp
+++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp
@@ -21,8 +21,8 @@
 #include <kdebug.h>
 
 
-UMLRoleProperties::UMLRoleProperties ( TQWidget *tqparent, UMLRole *role)
-        : UMLRolePropertiesBase (tqparent)
+UMLRoleProperties::UMLRoleProperties ( TQWidget *parent, UMLRole *role)
+        : UMLRolePropertiesBase (parent)
 {
 
     m_pRole = role;
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.h b/umbrello/umbrello/dialogs/umlroleproperties.h
index cd3cb005..f52eaf4d 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.h
+++ b/umbrello/umbrello/dialogs/umlroleproperties.h
@@ -30,10 +30,10 @@ public:
     /**
      *  Sets up the UMLRoleProperties.
      *
-     *  @param  tqparent  The tqparent widget to the UMLRoleProperties.
+     *  @param  parent  The parent widget to the UMLRoleProperties.
      *  @param  role    The UMLRole to display the properties of.
      */
-    UMLRoleProperties( TQWidget *tqparent, UMLRole *role);
+    UMLRoleProperties( TQWidget *parent, UMLRole *role);
 
     /**
      *  Standard deconstructor.
@@ -48,7 +48,7 @@ public:
 
 protected:
 
-    // the tqparent role object
+    // the parent role object
     UMLRole * m_pRole;
 
 private:
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
index 20183e3a..6075fbe4 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
@@ -131,7 +131,7 @@ bool UMLTemplateDialog::apply() {
         return false;
     }
 
-    UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->tqparent() );
+    UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->parent() );
     if (pClass) {
         UMLObject *o = pClass->findChildObject(name);
         if (o && o != m_pTemplate) {
diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
index a330ad30..824d708f 100644
--- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
+++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
@@ -87,12 +87,12 @@ void UMLWidgetColorPage::init()
 UMLWidgetColorPage::~UMLWidgetColorPage() {}
 
 void UMLWidgetColorPage::slotLineButtonClicked() {
-    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() );
+    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
     m_pLineColorB -> setColor( Settings::getOptionState().uiState.lineColor );
 }
 
 void UMLWidgetColorPage::slotFillButtonClicked() {
-    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() );
+    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
     m_pFillColorB -> setColor( Settings::getOptionState().uiState.fillColor );
 }
 
diff --git a/umbrello/umbrello/docgenerators/xmi2docbook.xsl b/umbrello/umbrello/docgenerators/xmi2docbook.xsl
index a48938f7..ff10aac5 100644
--- a/umbrello/umbrello/docgenerators/xmi2docbook.xsl
+++ b/umbrello/umbrello/docgenerators/xmi2docbook.xsl
@@ -450,12 +450,12 @@
       <title>Supertypes:</title>
       <xsl:for-each select="$generalizations">
       
-        <!-- get the tqparent in the generalization -->
+        <!-- get the parent in the generalization -->
         <xsl:variable name="generalization"
               select="key('generalization', ./@xmi.idref)" />
         <xsl:variable name="target"
               select="$generalization/
-                    Foundation.Core.Generalization.tqparent/
+                    Foundation.Core.Generalization.parent/
                     */@xmi.idref" /> 
         <xsl:call-template name="classify">
             <xsl:with-param name="target" select="$target"/>
diff --git a/umbrello/umbrello/docwindow.cpp b/umbrello/umbrello/docwindow.cpp
index ddd056a2..ab935d00 100644
--- a/umbrello/umbrello/docwindow.cpp
+++ b/umbrello/umbrello/docwindow.cpp
@@ -26,7 +26,7 @@
 #include "umlwidget.h"
 
 
-DocWindow::DocWindow( UMLDoc * doc, TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ) {
+DocWindow::DocWindow( UMLDoc * doc, TQWidget *parent, const char *name ) : TQWidget( parent, name ) {
     //setup visual display
     TQHBoxLayout * mainLayout = new TQHBoxLayout( this );
 
diff --git a/umbrello/umbrello/docwindow.h b/umbrello/umbrello/docwindow.h
index 217e7d83..a2dce505 100644
--- a/umbrello/umbrello/docwindow.h
+++ b/umbrello/umbrello/docwindow.h
@@ -34,7 +34,7 @@ public:
     /**
      * Constructor
      */
-    explicit DocWindow( UMLDoc * doc, TQWidget *tqparent = 0, const char *name = 0 );
+    explicit DocWindow( UMLDoc * doc, TQWidget *parent = 0, const char *name = 0 );
 
     /**
      * Deconstructor
diff --git a/umbrello/umbrello/entity.cpp b/umbrello/umbrello/entity.cpp
index 38c73138..31ef1513 100644
--- a/umbrello/umbrello/entity.cpp
+++ b/umbrello/umbrello/entity.cpp
@@ -107,7 +107,7 @@ UMLObject* UMLEntity::addEntityAttribute(const TQString& name, Uml::IDType id) {
 bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, IDChangeLog* Log /* = 0*/) {
     TQString name = (TQString)attribute->getName();
     if (findChildObject(name) == NULL) {
-        attribute->tqparent()->removeChild(attribute);
+        attribute->parent()->removeChild(attribute);
         this->insertChild(attribute);
         m_List.append(attribute);
         emit entityAttributeAdded(attribute);
@@ -124,7 +124,7 @@ bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, IDChangeLog* L
 bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, int position) {
     TQString name = (TQString)attribute->getName();
     if (findChildObject(name) == NULL) {
-        attribute->tqparent()->removeChild(attribute);
+        attribute->parent()->removeChild(attribute);
         this->insertChild(attribute);
         if ( position >= 0 && position <= (int)m_List.count() )  {
             m_List.insert(position,attribute);
diff --git a/umbrello/umbrello/entity.h b/umbrello/umbrello/entity.h
index 9b507f00..c9ec4633 100644
--- a/umbrello/umbrello/entity.h
+++ b/umbrello/umbrello/entity.h
@@ -60,7 +60,7 @@ public:
     virtual UMLObject* clone() const;
 
     /**
-     * Creates an entity attribute for the tqparent concept.
+     * Creates an entity attribute for the parent concept.
      * Reimplementation of method from UMLClassifier.
      *
      * @param name  An optional name, used by when creating through UMLListView
diff --git a/umbrello/umbrello/entityattribute.cpp b/umbrello/umbrello/entityattribute.cpp
index ebc2111f..b8030fed 100644
--- a/umbrello/umbrello/entityattribute.cpp
+++ b/umbrello/umbrello/entityattribute.cpp
@@ -21,17 +21,17 @@
 #include "dialogs/umlentityattributedialog.h"
 #include "object_factory.h"
 
-UMLEntityAttribute::UMLEntityAttribute( const UMLObject *tqparent, const TQString& name,
+UMLEntityAttribute::UMLEntityAttribute( const UMLObject *parent, const TQString& name,
                                         Uml::IDType id, Uml::Visibility s,
                                         UMLObject *type, const TQString& iv )
-        : UMLAttribute(tqparent, name, id, s, type, iv) {
+        : UMLAttribute(parent, name, id, s, type, iv) {
     init();
     if (m_pSecondary) {
         m_pSecondary->setBaseType(Uml::ot_Entity);
     }
 }
 
-UMLEntityAttribute::UMLEntityAttribute(const UMLObject *tqparent) : UMLAttribute(tqparent) {
+UMLEntityAttribute::UMLEntityAttribute(const UMLObject *parent) : UMLAttribute(parent) {
     init();
 }
 
@@ -119,7 +119,7 @@ bool UMLEntityAttribute::operator==( UMLEntityAttribute &rhs) {
 
 void UMLEntityAttribute::copyInto(UMLEntityAttribute *rhs) const
 {
-    // call the tqparent first.
+    // call the parent first.
     UMLClassifierListItem::copyInto(rhs);
 
     // Copy all datamembers
@@ -131,7 +131,7 @@ void UMLEntityAttribute::copyInto(UMLEntityAttribute *rhs) const
 
 UMLObject* UMLEntityAttribute::clone() const
 {
-    UMLEntityAttribute* clone = new UMLEntityAttribute( (UMLEntityAttribute*)tqparent() );
+    UMLEntityAttribute* clone = new UMLEntityAttribute( (UMLEntityAttribute*)parent() );
     copyInto(clone);
 
     return clone;
@@ -169,8 +169,8 @@ bool UMLEntityAttribute::load( TQDomElement & element ) {
     return true;
 }
 
-bool UMLEntityAttribute::showPropertiesDialog(TQWidget* tqparent) {
-    UMLEntityAttributeDialog dialog(tqparent, this);
+bool UMLEntityAttribute::showPropertiesDialog(TQWidget* parent) {
+    UMLEntityAttributeDialog dialog(parent, this);
     return dialog.exec();
 }
 
diff --git a/umbrello/umbrello/entityattribute.h b/umbrello/umbrello/entityattribute.h
index 4a094dfb..aee70bcf 100644
--- a/umbrello/umbrello/entityattribute.h
+++ b/umbrello/umbrello/entityattribute.h
@@ -31,14 +31,14 @@ public:
     /**
      * Sets up an entityattribute.
      *
-     * @param tqparent    The tqparent of this UMLEntityAttribute.
+     * @param parent    The parent of this UMLEntityAttribute.
      * @param name      The name of this UMLEntityAttribute.
      * @param id        The unique id given to this UMLEntityAttribute.
      * @param s         The visibility of the UMLEntityAttribute.
      * @param type      The type of this UMLEntityAttribute.
      * @param iv        The initial value of the entityattribute.
      */
-    UMLEntityAttribute(const UMLObject* tqparent, const TQString& name,
+    UMLEntityAttribute(const UMLObject* parent, const TQString& name,
                        Uml::IDType id = Uml::id_None,
                        Uml::Visibility s = Uml::Visibility::Private,
                        UMLObject *type = 0, const TQString& iv = 0);
@@ -46,9 +46,9 @@ public:
     /**
      * Sets up an entityattribute.
      *
-     * @param tqparent    The tqparent of this UMLEntityAttribute.
+     * @param parent    The parent of this UMLEntityAttribute.
      */
-    UMLEntityAttribute(const UMLObject* tqparent);
+    UMLEntityAttribute(const UMLObject* parent);
 
     /**
      * Overloaded '==' operator
@@ -158,7 +158,7 @@ public:
     /**
      * Display the properties configuration dialog for the entityattribute.
      */
-    bool showPropertiesDialog(TQWidget* tqparent);
+    bool showPropertiesDialog(TQWidget* parent);
 
 protected:
     /**
diff --git a/umbrello/umbrello/entitywidget.h b/umbrello/umbrello/entitywidget.h
index 55b0e625..e99da521 100644
--- a/umbrello/umbrello/entitywidget.h
+++ b/umbrello/umbrello/entitywidget.h
@@ -33,7 +33,7 @@ public:
     /**
      * Constructs an EntityWidget.
      *
-     * @param view              The tqparent of this EntityWidget.
+     * @param view              The parent of this EntityWidget.
      * @param o         The UMLObject this will be representing.
      */
     EntityWidget(UMLView* view, UMLObject* o);
diff --git a/umbrello/umbrello/enum.cpp b/umbrello/umbrello/enum.cpp
index 491817e2..93ee1bdd 100644
--- a/umbrello/umbrello/enum.cpp
+++ b/umbrello/umbrello/enum.cpp
@@ -109,7 +109,7 @@ UMLObject* UMLEnum::addEnumLiteral(const TQString &name, Uml::IDType id) {
 bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, IDChangeLog* Log /* = 0*/) {
     TQString name = (TQString)literal->getName();
     if (findChildObject(name) == NULL) {
-        literal->tqparent()->removeChild(literal);
+        literal->parent()->removeChild(literal);
         this->insertChild(literal);
         m_List.append(literal);
         UMLObject::emitModified();
@@ -126,7 +126,7 @@ bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, IDChangeLog* Log /* = 0*/)
 bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, int position) {
     TQString name = (TQString)literal->getName();
     if (findChildObject(name) == NULL) {
-        literal->tqparent()->removeChild(literal);
+        literal->parent()->removeChild(literal);
         this->insertChild(literal);
         if ( position >= 0 && position <= (int)m_List.count() )  {
             m_List.insert(position,literal);
diff --git a/umbrello/umbrello/enumliteral.cpp b/umbrello/umbrello/enumliteral.cpp
index b6efb808..8158e40e 100644
--- a/umbrello/umbrello/enumliteral.cpp
+++ b/umbrello/umbrello/enumliteral.cpp
@@ -15,13 +15,13 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-UMLEnumLiteral::UMLEnumLiteral(const UMLObject *tqparent,
+UMLEnumLiteral::UMLEnumLiteral(const UMLObject *parent,
                                const TQString& name, Uml::IDType id)
-        : UMLClassifierListItem(tqparent, name, id) {
+        : UMLClassifierListItem(parent, name, id) {
     m_BaseType = Uml::ot_EnumLiteral;
 }
 
-UMLEnumLiteral::UMLEnumLiteral(const UMLObject *tqparent) : UMLClassifierListItem(tqparent) {
+UMLEnumLiteral::UMLEnumLiteral(const UMLObject *parent) : UMLClassifierListItem(parent) {
     m_BaseType = Uml::ot_EnumLiteral;
 }
 
@@ -44,7 +44,7 @@ void UMLEnumLiteral::copyInto(UMLEnumLiteral *rhs) const
 
 UMLObject* UMLEnumLiteral::clone() const
 {
-    UMLEnumLiteral *clone = new UMLEnumLiteral((UMLObject *) tqparent());
+    UMLEnumLiteral *clone = new UMLEnumLiteral((UMLObject *) parent());
     copyInto(clone);
 
     return clone;
@@ -60,9 +60,9 @@ bool UMLEnumLiteral::load(TQDomElement& ) {
     return true;
 }
 
-bool UMLEnumLiteral::showPropertiesDialog(TQWidget* tqparent) {
+bool UMLEnumLiteral::showPropertiesDialog(TQWidget* parent) {
     bool ok;
-    TQString name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), getName(), &ok, tqparent);
+    TQString name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), getName(), &ok, parent);
     if ( ok && !name.isEmpty() )  {
         setName(name);
         return true;
diff --git a/umbrello/umbrello/enumliteral.h b/umbrello/umbrello/enumliteral.h
index 3e530c4d..e9a63b1a 100644
--- a/umbrello/umbrello/enumliteral.h
+++ b/umbrello/umbrello/enumliteral.h
@@ -29,19 +29,19 @@ public:
     /**
      * Sets up an enum literal.
      *
-     * @param tqparent    The tqparent of this UMLEnumLiteral.
+     * @param parent    The parent of this UMLEnumLiteral.
      * @param name              The name of this UMLEnumLiteral.
      * @param id                The unique id given to this UMLEnumLiteral.
      */
-    UMLEnumLiteral(const UMLObject* tqparent,
+    UMLEnumLiteral(const UMLObject* parent,
                    const TQString& name, Uml::IDType id = Uml::id_None);
 
     /**
      * Sets up an enum literal.
      *
-     * @param tqparent    The tqparent of this UMLEnumLiteral.
+     * @param parent    The parent of this UMLEnumLiteral.
      */
-    UMLEnumLiteral(const UMLObject* tqparent);
+    UMLEnumLiteral(const UMLObject* parent);
 
     /**
      * Overloaded '==' operator
@@ -72,7 +72,7 @@ public:
     /**
      * Display the properties configuration dialog for the enum literal.
      */
-    bool showPropertiesDialog(TQWidget* tqparent);
+    bool showPropertiesDialog(TQWidget* parent);
 
 protected:
     /**
diff --git a/umbrello/umbrello/enumwidget.h b/umbrello/umbrello/enumwidget.h
index b5802135..aa61f4ea 100644
--- a/umbrello/umbrello/enumwidget.h
+++ b/umbrello/umbrello/enumwidget.h
@@ -33,7 +33,7 @@ public:
     /**
      * Constructs an EnumWidget.
      *
-     * @param view              The tqparent of this EnumWidget.
+     * @param view              The parent of this EnumWidget.
      * @param o         The UMLObject this will be representing.
      */
     EnumWidget(UMLView* view, UMLObject* o);
diff --git a/umbrello/umbrello/floatingtextwidget.h b/umbrello/umbrello/floatingtextwidget.h
index ad33e532..635d750e 100644
--- a/umbrello/umbrello/floatingtextwidget.h
+++ b/umbrello/umbrello/floatingtextwidget.h
@@ -54,7 +54,7 @@ public:
     /**
      * Constructs a FloatingTextWidget instance.
      *
-     * @param view The tqparent of this FloatingTextWidget.
+     * @param view The parent of this FloatingTextWidget.
      * @param role The role this FloatingTextWidget will take up.
      * @param text The main text to display.
      * @param id The ID to assign (-1 will prompt a new ID.)
diff --git a/umbrello/umbrello/floatingtextwidgetcontroller.h b/umbrello/umbrello/floatingtextwidgetcontroller.h
index 5b89c3ad..93c91d69 100644
--- a/umbrello/umbrello/floatingtextwidgetcontroller.h
+++ b/umbrello/umbrello/floatingtextwidgetcontroller.h
@@ -55,7 +55,7 @@ protected:
     /**
      * Overridden from UMLWidgetController.
      * Saves the values of the widget needed for move/resize.
-     * Calls tqparent method and then saves the value of m_unconstrainedPositionX/Y
+     * Calls parent method and then saves the value of m_unconstrainedPositionX/Y
      * and m_movementDirectionX/Y.
      *
      * @param me The TQMouseEvent to get the offset from.
diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp
index 7a4d11ab..127c3b34 100644
--- a/umbrello/umbrello/folder.cpp
+++ b/umbrello/umbrello/folder.cpp
@@ -157,8 +157,8 @@ void UMLFolder::removeAllViews() {
     UMLView *v = NULL;
     for (UMLViewListIt vit(m_diagrams); (v = vit.current()) != NULL; ++vit) {
         // TODO ------------------ check this code - bad: calling back to UMLDoc::removeView()
-        v->removeAllAssociations(); // note : It may not be aptqparent, but when we remove all associations
-        // from a view, it also causes any UMLAssociations that lack tqparent
+        v->removeAllAssociations(); // note : It may not be apparent, but when we remove all associations
+        // from a view, it also causes any UMLAssociations that lack parent
         // association widgets (but once had them) to remove themselves from
         // this document.
         UMLApp::app()->getDocument()->removeView(v, false);
@@ -249,7 +249,7 @@ void UMLFolder::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) {
     folderRoot.setAttribute("filename", m_folderFile);
     folderRoot.setAttribute("mainModel", umldoc->URL().fileName());
     folderRoot.setAttribute("parentId", ID2STR(m_pUMLPackage->getID()));
-    folderRoot.setAttribute("tqparent", m_pUMLPackage->getFullyQualifiedName("::", true));
+    folderRoot.setAttribute("parent", m_pUMLPackage->getFullyQualifiedName("::", true));
     saveContents(folderDoc, folderRoot);
     folderDoc.appendChild(folderRoot);
     TQTextStream stream(&file);
diff --git a/umbrello/umbrello/forkjoinwidget.h b/umbrello/umbrello/forkjoinwidget.h
index def633b4..8ee869ea 100644
--- a/umbrello/umbrello/forkjoinwidget.h
+++ b/umbrello/umbrello/forkjoinwidget.h
@@ -31,7 +31,7 @@ public:
     /**
      * Constructs a ForkJoinWidget.
      *
-     * @param view          The tqparent to this widget.
+     * @param view          The parent to this widget.
      * @param drawVertical  Whether to draw the plate horizontally or vertically.
      * @param id            The ID to assign (-1 will prompt a new ID.)
      */
diff --git a/umbrello/umbrello/hierarchicalcodeblock.cpp b/umbrello/umbrello/hierarchicalcodeblock.cpp
index 73e59bab..8802cbcf 100644
--- a/umbrello/umbrello/hierarchicalcodeblock.cpp
+++ b/umbrello/umbrello/hierarchicalcodeblock.cpp
@@ -114,7 +114,7 @@ bool HierarchicalCodeBlock::insertTextBlock(TextBlock * newBlock, TextBlock * ex
         return false;
 
     TQString tag = existingBlock->getTag();
-    // FIX: just do a quick check if the tqparent DOCUMENT has this.
+    // FIX: just do a quick check if the parent DOCUMENT has this.
     // IF it does, then the lack of an index will force us into
     // a search of any child hierarchical codeblocks we may have
     // Its not efficient, but works. I don't think speed is a problem
@@ -365,7 +365,7 @@ TextBlock * HierarchicalCodeBlock::findCodeClassFieldTextBlockByTag ( const TQSt
     if(cdoc)
         return cdoc->findCodeClassFieldTextBlockByTag(tag);
     else
-        kError()<<" HierarchicalCodeBlock: findCodeClassFieldTextBlockByTag() finds NO tqparent document! Badly constructed textblock?!?"<<endl;
+        kError()<<" HierarchicalCodeBlock: findCodeClassFieldTextBlockByTag() finds NO parent document! Badly constructed textblock?!?"<<endl;
 
     // if we get here, we failed.
     return (TextBlock*) NULL;
diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp
index 5210f8ea..c5efcb65 100644
--- a/umbrello/umbrello/kplayerslideraction.cpp
+++ b/umbrello/umbrello/kplayerslideraction.cpp
@@ -67,8 +67,8 @@ void KPlayerPopupFrame::mouseReleaseEvent (TQMouseEvent* ev)
 
 KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text,
         const TQString& pix, const KShortcut& shortcut, const TQObject* receiver,
-        const char* slot, TQObject* tqparent, const char* name)
-        : KAction (text, pix, shortcut, tqparent, name)
+        const char* slot, TQObject* parent, const char* name)
+        : KAction (text, pix, shortcut, parent, name)
 {
     m_frame = new KPlayerPopupFrame;
     m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised);
@@ -158,9 +158,9 @@ void KPlayerPopupSliderAction::slotActivated (void)
 }
 
 KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const KShortcut& cut,
-        const TQObject* receiver, const char* slot, KActionCollection* tqparent, const char* name)
-        : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, tqparent, name)
-        //: KAction (text, 0, tqparent, name)
+        const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name)
+        : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, parent, name)
+        //: KAction (text, 0, parent, name)
 {
     setAutoSized (true);
     connect (slider(), TQT_SIGNAL (changed (int)), receiver, slot);
@@ -213,7 +213,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget)
     //Q_ASSERT (isPlugged());
     //Q_ASSERT (widget -> inherits ("KToolBar"));
     KWidgetAction::unplug (widget);
-    if ( ! slider() || ! isPlugged() || TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(slider() -> tqparent()) )
+    if ( ! slider() || ! isPlugged() || TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(slider() -> parent()) )
         return;
     //KToolBar* toolbar = (KToolBar*) widget;
     disconnect (widget, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation)));
@@ -264,9 +264,9 @@ void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation)
     m_slider -> reparent (0, TQPoint());
 }*/
 
-KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* tqparent, const char* name)
-//CHANGED  : TQSlider (orientation, tqparent, name)
-        : TQSlider (300, 2200, 400, 1000, orientation, tqparent, name)
+KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* parent, const char* name)
+//CHANGED  : TQSlider (orientation, parent, name)
+        : TQSlider (300, 2200, 400, 1000, orientation, parent, name)
 {
     m_changing_orientation = false;
     setTickmarks (TQSlider::Both);
diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h
index ea4d290d..8c0b11ef 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -31,7 +31,7 @@ class KPlayerSlider : public TQSlider
 public:
     /** The KPlayerSlider constructor. Parameters are passed on to TQSlider.
       */
-    explicit KPlayerSlider (Qt::Orientation, TQWidget* tqparent = 0, const char* name = 0);
+    explicit KPlayerSlider (Qt::Orientation, TQWidget* parent = 0, const char* name = 0);
     /** The KPlayerSlider destructor. Does nothing.
       */
     virtual ~KPlayerSlider();
@@ -110,8 +110,8 @@ class KPlayerPopupFrame : public TQFrame
 public:
     /** The KPlayerPopupFrame constructor. Parameters are passed on to TQFrame.
       */
-    KPlayerPopupFrame (TQWidget* tqparent = 0, const char* name = 0)
-            : TQFrame (tqparent, name, TQt::WType_Popup) { }
+    KPlayerPopupFrame (TQWidget* parent = 0, const char* name = 0)
+            : TQFrame (parent, name, TQt::WType_Popup) { }
     /** The KPlayerPopupFrame destructor. Does nothing.
       */
     virtual ~KPlayerPopupFrame() { }
@@ -134,7 +134,7 @@ public:
     /** The KPlayerPopupSliderAction constructor. Parameters are passed on to KAction.
       */
     KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const KShortcut& shortcut,
-                              const TQObject* receiver, const char* slot, TQObject* tqparent = 0, const char* name = 0);
+                              const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0);
     /** The KPlayerPopupSliderAction destructor. Deletes the KPlayerPopupFrame.
       */
     virtual ~KPlayerPopupSliderAction();
@@ -175,7 +175,7 @@ public:
     /** The KPlayerSliderAction constructor. Parameters are passed on to KAction.
       */
     KPlayerSliderAction (const TQString& text, const KShortcut&, const TQObject* receiver,
-                         const char* slot, KActionCollection* tqparent = 0, const char* name = 0);
+                         const char* slot, KActionCollection* parent = 0, const char* name = 0);
     /** The KPlayerSliderAction destructor. Does nothing.
       */
     virtual ~KPlayerSliderAction();
diff --git a/umbrello/umbrello/kstartuplogo.cpp b/umbrello/umbrello/kstartuplogo.cpp
index 48df28a8..1839dc06 100644
--- a/umbrello/umbrello/kstartuplogo.cpp
+++ b/umbrello/umbrello/kstartuplogo.cpp
@@ -17,8 +17,8 @@
 #include <kstandarddirs.h>
 #include <tqtimer.h>
 
-KStartupLogo::KStartupLogo(TQWidget * tqparent, const char *name)
-        : TQWidget(tqparent,name, TQt::WStyle_NoBorder | TQt::WStyle_Customize | TQt::WDestructiveClose )
+KStartupLogo::KStartupLogo(TQWidget * parent, const char *name)
+        : TQWidget(parent,name, TQt::WStyle_NoBorder | TQt::WStyle_Customize | TQt::WDestructiveClose )
 ,m_bReadyToHide(false) {
     //pm.load(locate("appdata", "pics/startlogo.png"));
     KStandardDirs * dirs = KGlobal::dirs();
diff --git a/umbrello/umbrello/kstartuplogo.h b/umbrello/umbrello/kstartuplogo.h
index 07770d6c..84302075 100644
--- a/umbrello/umbrello/kstartuplogo.h
+++ b/umbrello/umbrello/kstartuplogo.h
@@ -28,7 +28,7 @@ class KStartupLogo : public TQWidget  {
     Q_OBJECT
   TQ_OBJECT
 public:
-    KStartupLogo(TQWidget *tqparent=0, const char *name=0);
+    KStartupLogo(TQWidget *parent=0, const char *name=0);
     ~KStartupLogo();
     void setHideEnabled(bool bEnabled);
 
diff --git a/umbrello/umbrello/linepath.cpp b/umbrello/umbrello/linepath.cpp
index 12f4b6c8..2d23021d 100644
--- a/umbrello/umbrello/linepath.cpp
+++ b/umbrello/umbrello/linepath.cpp
@@ -84,7 +84,7 @@ void LinePath::setAssociation(AssociationWidget * association ) {
     createHeadLines();
     if( getAssocType() == Uml::at_Coll_Message )
         setupParallelLine();
-    UMLView * view =  (UMLView *)m_pAssociation -> tqparent();
+    UMLView * view =  (UMLView *)m_pAssociation -> parent();
     connect( view, TQT_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineColorChanged( Uml::IDType ) ) );
     connect( view, TQT_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineWidthChanged( Uml::IDType ) ) );
 }
@@ -847,7 +847,7 @@ void LinePath::cleanup() {
     m_pClearPoly = 0;
     m_bHeadCreated = m_bParallelLineCreated = false;
     if( m_pAssociation ) {
-        UMLView * view =  (UMLView *)m_pAssociation -> tqparent();
+        UMLView * view =  (UMLView *)m_pAssociation -> parent();
         if(view) {
             disconnect( view, TQT_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineColorChanged( Uml::IDType ) ) );
             disconnect( view, TQT_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineWidthChanged( Uml::IDType ) ) );
diff --git a/umbrello/umbrello/linepath.h b/umbrello/umbrello/linepath.h
index d02714ed..c0343478 100644
--- a/umbrello/umbrello/linepath.h
+++ b/umbrello/umbrello/linepath.h
@@ -169,7 +169,7 @@ public:
     *   This is needed because the m_pAssociation does not yet
     *   exist at the time of the LinePath::loadFromXMI call.
     *   However, this means that the points in the m_LineList
-    *   do not have a tqparent when they are loaded.
+    *   do not have a parent when they are loaded.
     *   They need to be reparented by calling LinePath::activate()
     *   once the m_pAssociation exists.
     */
diff --git a/umbrello/umbrello/linkwidget.cpp b/umbrello/umbrello/linkwidget.cpp
index 259d6567..508de933 100644
--- a/umbrello/umbrello/linkwidget.cpp
+++ b/umbrello/umbrello/linkwidget.cpp
@@ -30,7 +30,7 @@ UMLClassifier *LinkWidget::getOperationOwner() {
     UMLOperation *op = getOperation();
     if (op == NULL)
         return NULL;
-    return static_cast<UMLClassifier*>(op->tqparent());
+    return static_cast<UMLClassifier*>(op->parent());
 }
 
 TQString LinkWidget::getOperationText(UMLView *view /* = NULL */) {
diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp
index 548ded25..8eacf57e 100644
--- a/umbrello/umbrello/listpopupmenu.cpp
+++ b/umbrello/umbrello/listpopupmenu.cpp
@@ -37,15 +37,15 @@
 #include "objectwidget.h"
 
 //ListPopupMenu for a UMLView (diagram)
-ListPopupMenu::ListPopupMenu(TQWidget *tqparent, Menu_Type type, UMLView * view)
-        : KPopupMenu(tqparent) {
+ListPopupMenu::ListPopupMenu(TQWidget *parent, Menu_Type type, UMLView * view)
+        : KPopupMenu(parent) {
     init();
     setupMenu(type, view);
 }
 
 //ListPopupMenu for the tree list view
-ListPopupMenu::ListPopupMenu(TQWidget *tqparent, Uml::ListView_Type type)
-        : KPopupMenu(tqparent) {
+ListPopupMenu::ListPopupMenu(TQWidget *parent, Uml::ListView_Type type)
+        : KPopupMenu(parent) {
     init();
     Menu_Type mt = mt_Undefined;
     switch(type)
@@ -205,9 +205,9 @@ ListPopupMenu::ListPopupMenu(TQWidget *tqparent, Uml::ListView_Type type)
 }
 
 //ListPopupMenu for a canvas widget
-ListPopupMenu::ListPopupMenu(TQWidget * tqparent, UMLWidget * object,
+ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
                              bool multi, bool unique)
-        : KPopupMenu(tqparent)
+        : KPopupMenu(parent)
 {
     init();
     //make the right menu for the type
@@ -259,7 +259,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * tqparent, UMLWidget * object,
 
     StateWidget *pState;
     ActivityWidget *pActivity;
-    UMLView * pView = static_cast<UMLView *>( tqparent );
+    UMLView * pView = static_cast<UMLView *>( parent );
 
     switch(type) {
     case Uml::wt_Actor:
diff --git a/umbrello/umbrello/listpopupmenu.h b/umbrello/umbrello/listpopupmenu.h
index 54c7336c..e7030090 100644
--- a/umbrello/umbrello/listpopupmenu.h
+++ b/umbrello/umbrello/listpopupmenu.h
@@ -187,30 +187,30 @@ public:
     /**
      * Constructs the popup menu for a diagram
      *
-     * @param tqparent    The tqparent to ListPopupMenu.
+     * @param parent    The parent to ListPopupMenu.
      * @param type      The type of menu to display.
      * @param view      The UMLView in which this ListPopupMenu is going to be displayed
      */
-    explicit ListPopupMenu(TQWidget* tqparent, Menu_Type type = mt_Undefined, UMLView* view = 0);
+    explicit ListPopupMenu(TQWidget* parent, Menu_Type type = mt_Undefined, UMLView* view = 0);
 
     /**
      * Constructs the popup menu for a list view item.
      *
-     * @param tqparent    The tqparent to ListPopupMenu.
+     * @param parent    The parent to ListPopupMenu.
      * @param type              The type of menu to display.
      */
-    ListPopupMenu(TQWidget* tqparent, Uml::ListView_Type type);
+    ListPopupMenu(TQWidget* parent, Uml::ListView_Type type);
 
     /**
      * Constructs the popup menu for a canvas widget.
      *
-     * @param tqparent    The tqparent to ListPopupMenu.
+     * @param parent    The parent to ListPopupMenu.
      * @param object    The UMLWidget to represent a menu for.
      * @param multi             True if multiple items are selected.
      * @param unique    True if multiple selected items all have
      *                  the same type (e.g. Class, Interface)
      */
-    ListPopupMenu(TQWidget* tqparent, UMLWidget* object, bool multi = false, bool unique = false);
+    ListPopupMenu(TQWidget* parent, UMLWidget* object, bool multi = false, bool unique = false);
 
     /**
      * Standard deconstructor.
@@ -296,7 +296,7 @@ private:
      * Shortcut for commonly used menu initializations.
      *
      * @param type      The Menu_Type for which to set up the menu.
-     * @param view      The UMLView tqparent of the menu.
+     * @param view      The UMLView parent of the menu.
      */
     void setupMenu(Menu_Type type, UMLView * view = 0);
 
diff --git a/umbrello/umbrello/messagewidget.h b/umbrello/umbrello/messagewidget.h
index e1374cd3..9d36922b 100644
--- a/umbrello/umbrello/messagewidget.h
+++ b/umbrello/umbrello/messagewidget.h
@@ -47,7 +47,7 @@ public:
     /**
      * Constructs a MessageWidget.
      *
-     * @param view      The tqparent to this class.
+     * @param view      The parent to this class.
      * @param a The role A widget for this message.
      * @param b The role B widget for this message.
      * @param y The vertical position to display this message.
@@ -62,7 +62,7 @@ public:
     /**
      * Constructs a MessageWidget.
      *
-     * @param view              The tqparent to this class.
+     * @param view              The parent to this class.
      * @param sequenceMessageType The Uml::Sequence_Message_Type of this message widget
      * @param id                The ID to assign (-1 will prompt a new ID.)
      */
diff --git a/umbrello/umbrello/messagewidgetcontroller.h b/umbrello/umbrello/messagewidgetcontroller.h
index 6d13034b..a691f465 100644
--- a/umbrello/umbrello/messagewidgetcontroller.h
+++ b/umbrello/umbrello/messagewidgetcontroller.h
@@ -64,7 +64,7 @@ protected:
     /**
      * Overriden from UMLWidgetController.
      * Saves the values of the widget needed for move/resize.
-     * Calls tqparent method and then saves the value of m_unconstrainedPositionY
+     * Calls parent method and then saves the value of m_unconstrainedPositionY
      *
      * @param me The TQMouseEvent to get the offset from.
      */
diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp
index 3f012e08..4131d9b1 100644
--- a/umbrello/umbrello/model_utils.cpp
+++ b/umbrello/umbrello/model_utils.cpp
@@ -130,7 +130,7 @@ UMLObject* findUMLObject(const UMLObjectList& inList,
     if (currentObj) {
         UMLPackage *pkg = NULL;
         if (dynamic_cast<UMLClassifierListItem*>(currentObj)) {
-            currentObj = static_cast<UMLObject*>(currentObj->tqparent());
+            currentObj = static_cast<UMLObject*>(currentObj->parent());
         }
         pkg = dynamic_cast<UMLPackage*>(currentObj);
         if (pkg == NULL)
diff --git a/umbrello/umbrello/nodewidget.h b/umbrello/umbrello/nodewidget.h
index c1151212..c06ea759 100644
--- a/umbrello/umbrello/nodewidget.h
+++ b/umbrello/umbrello/nodewidget.h
@@ -31,7 +31,7 @@ public:
     /**
      * Constructs a NodeWidget.
      *
-     * @param view              The tqparent of this NodeWidget.
+     * @param view              The parent of this NodeWidget.
      * @param n         The UMLNode this will be representing.
      */
     NodeWidget(UMLView * view, UMLNode *n );
diff --git a/umbrello/umbrello/notewidget.h b/umbrello/umbrello/notewidget.h
index b14dbe57..1ba65a57 100644
--- a/umbrello/umbrello/notewidget.h
+++ b/umbrello/umbrello/notewidget.h
@@ -41,7 +41,7 @@ public:
     /**
      * Constructs a NoteWidget.
      *
-     * @param view              The tqparent to this widget.
+     * @param view              The parent to this widget.
      * @param noteType          The NoteWidget::NoteType of this NoteWidget
      * @param id                The unique id of the widget.
      *                  The default (-1) will prompt a new ID.
diff --git a/umbrello/umbrello/object_factory.cpp b/umbrello/umbrello/object_factory.cpp
index cf49a1e1..327cb54b 100644
--- a/umbrello/umbrello/object_factory.cpp
+++ b/umbrello/umbrello/object_factory.cpp
@@ -176,8 +176,8 @@ UMLObject* createUMLObject(Uml::Object_Type type, const TQString &n,
     return o;
 }
 
-UMLAttribute *createAttribute(UMLObject *tqparent, const TQString& name, UMLObject *type) {
-    UMLAttribute *attr = new UMLAttribute(tqparent);
+UMLAttribute *createAttribute(UMLObject *parent, const TQString& name, UMLObject *type) {
+    UMLAttribute *attr = new UMLAttribute(parent);
     attr->setName(name);
     attr->setType(type);
     if (g_predefinedId == Uml::id_None)
@@ -185,35 +185,35 @@ UMLAttribute *createAttribute(UMLObject *tqparent, const TQString& name, UMLObje
     return attr;
 }
 
-UMLOperation *createOperation(UMLClassifier *tqparent, const TQString& name) {
-    UMLOperation *op = new UMLOperation(tqparent, name, g_predefinedId);
+UMLOperation *createOperation(UMLClassifier *parent, const TQString& name) {
+    UMLOperation *op = new UMLOperation(parent, name, g_predefinedId);
     return op;
 }
 
-UMLClassifierListItem* createChildObject(UMLClassifier* tqparent, Uml::Object_Type type) {
+UMLClassifierListItem* createChildObject(UMLClassifier* parent, Uml::Object_Type type) {
     UMLObject* returnObject = NULL;
     switch (type) {
     case Uml::ot_Attribute:
     case Uml::ot_EntityAttribute: {
-            UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent);
+            UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent);
             if (c && !c->isInterface())
                 returnObject = c->createAttribute();
             break;
         }
     case Uml::ot_Operation: {
-            UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent);
+            UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent);
             if (c)
                 returnObject = c->createOperation();
             break;
         }
     case Uml::ot_Template: {
-            UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent);
+            UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent);
             if (c)
                 returnObject = c->createTemplate();
             break;
         }
     case Uml::ot_EnumLiteral: {
-            UMLEnum* umlenum = dynamic_cast<UMLEnum*>(tqparent);
+            UMLEnum* umlenum = dynamic_cast<UMLEnum*>(parent);
             if (umlenum) {
                 returnObject = umlenum->createEnumLiteral();
             }
diff --git a/umbrello/umbrello/object_factory.h b/umbrello/umbrello/object_factory.h
index 69338203..4c178ba4 100644
--- a/umbrello/umbrello/object_factory.h
+++ b/umbrello/umbrello/object_factory.h
@@ -31,7 +31,7 @@ namespace Object_Factory {
  * @param n         A name to give to the object (optional.)
  *                  If not given then an input dialog prompts
  *                  the user to supply a name.
- * @param parentPkg The object's tqparent package.
+ * @param parentPkg The object's parent package.
  * @param solicitNewName  Ask user for a different name if an object
  *                        of the given name already exists.
  *                        If set to false and the name already exists
@@ -45,18 +45,18 @@ UMLObject* createUMLObject(Uml::Object_Type type,
 
 /**
  * Creates an operation, attribute, template, or enum literal
- * for the tqparent classifier.
+ * for the parent classifier.
  *
- * @param tqparent    The tqparent concept
+ * @param parent    The parent concept
  * @param type      The type to create
  * @return      Pointer to the UMLClassifierListItem created
  */
-UMLClassifierListItem* createChildObject(UMLClassifier *tqparent, Uml::Object_Type type);
+UMLClassifierListItem* createChildObject(UMLClassifier *parent, Uml::Object_Type type);
 
-UMLAttribute *createAttribute(UMLObject *tqparent, const TQString& name,
+UMLAttribute *createAttribute(UMLObject *parent, const TQString& name,
                               UMLObject *type = 0);
 
-UMLOperation *createOperation(UMLClassifier *tqparent, const TQString& name);
+UMLOperation *createOperation(UMLClassifier *parent, const TQString& name);
 
 /**
  * Control whether the createUMLObject() solicits a new unique ID for the
diff --git a/umbrello/umbrello/objectwidget.h b/umbrello/umbrello/objectwidget.h
index fff23f2a..812ea067 100644
--- a/umbrello/umbrello/objectwidget.h
+++ b/umbrello/umbrello/objectwidget.h
@@ -39,7 +39,7 @@ public:
     /**
      * Creates an ObjectWidget.
      *
-     * @param view              The tqparent to this object.
+     * @param view              The parent to this object.
      * @param o         The object it will be representing.
      * @param lid               The local id for the object.
      */
diff --git a/umbrello/umbrello/operation.cpp b/umbrello/umbrello/operation.cpp
index 3f62bf05..dce9b41e 100644
--- a/umbrello/umbrello/operation.cpp
+++ b/umbrello/umbrello/operation.cpp
@@ -25,9 +25,9 @@
 #include "uniqueid.h"
 #include "dialogs/umloperationdialog.h"
 
-UMLOperation::UMLOperation(const UMLClassifier *tqparent, const TQString& name,
+UMLOperation::UMLOperation(const UMLClassifier *parent, const TQString& name,
                            Uml::IDType id, Uml::Visibility s, UMLObject *rt)
-        : UMLClassifierListItem(tqparent, name, id)
+        : UMLClassifierListItem(parent, name, id)
 {
     if (rt)
         m_returnId = UniqueID::gen();
@@ -39,8 +39,8 @@ UMLOperation::UMLOperation(const UMLClassifier *tqparent, const TQString& name,
     m_bConst = false;
 }
 
-UMLOperation::UMLOperation(const UMLClassifier * tqparent)
-        : UMLClassifierListItem (tqparent)
+UMLOperation::UMLOperation(const UMLClassifier * parent)
+        : UMLClassifierListItem (parent)
 {
     m_BaseType = Uml::ot_Operation;
     m_bConst = false;
@@ -150,7 +150,7 @@ TQString UMLOperation::toString(Uml::Signature_Type sig) {
     } else if (parameterlessOpNeedsParentheses) {
         s.append("()");
     }
-    UMLClassifier *ownParent = static_cast<UMLClassifier*>(tqparent());
+    UMLClassifier *ownParent = static_cast<UMLClassifier*>(parent());
     TQString returnType;
     UMLClassifier *retType = UMLClassifierListItem::getType();
     if (retType) {
@@ -218,8 +218,8 @@ void UMLOperation::copyInto(UMLOperation *rhs) const
 
 UMLObject* UMLOperation::clone() const
 {
-    //FIXME: The new operation should be slaved to the NEW tqparent not the old.
-    UMLOperation *clone = new UMLOperation( static_cast<UMLClassifier*>(tqparent()) );
+    //FIXME: The new operation should be slaved to the NEW parent not the old.
+    UMLOperation *clone = new UMLOperation( static_cast<UMLClassifier*>(parent()) );
     copyInto(clone);
 
     return clone;
@@ -243,24 +243,24 @@ bool UMLOperation::isConstructorOperation() {
     if (getStereotype() == strConstructor)
         return true;
 
-    UMLClassifier * c = static_cast<UMLClassifier*>(this->tqparent());
+    UMLClassifier * c = static_cast<UMLClassifier*>(this->parent());
     TQString cName = c->getName();
     TQString opName = getName();
     // It's a constructor operation if the operation name
-    // matches that of the tqparent classifier.
+    // matches that of the parent classifier.
     return (cName == opName);
 }
 
 bool UMLOperation::isDestructorOperation() {
     if (getStereotype() == "destructor")
         return true;
-    UMLClassifier * c = static_cast<UMLClassifier*>(this->tqparent());
+    UMLClassifier * c = static_cast<UMLClassifier*>(this->parent());
 
     TQString cName = c->getName();
     TQString opName = getName();
     // Special support for C++ syntax:
     // It's a destructor operation if the operation name begins
-    // with "~" followed by the name of the tqparent classifier.
+    // with "~" followed by the name of the parent classifier.
     if (! opName.startsWith("~"))
         return false;
     opName.remove( TQRegExp("^~\\s*") );
@@ -279,8 +279,8 @@ bool UMLOperation::getConst() const {
     return m_bConst;
 }
 
-bool UMLOperation::showPropertiesDialog(TQWidget* tqparent) {
-    UMLOperationDialog dialog(tqparent, this);
+bool UMLOperation::showPropertiesDialog(TQWidget* parent) {
+    UMLOperationDialog dialog(parent, this);
     return dialog.exec();
 }
 
diff --git a/umbrello/umbrello/operation.h b/umbrello/umbrello/operation.h
index 12625ac2..a088ef5e 100644
--- a/umbrello/umbrello/operation.h
+++ b/umbrello/umbrello/operation.h
@@ -32,13 +32,13 @@ public:
      * umbrello's TQt signalling for object creation.
      * If you want to create an Operation use the method in UMLDoc instead.
      *
-     * @param tqparent    The tqparent to this operation.
+     * @param parent    The parent to this operation.
      * @param name      The name of the operation.
      * @param id        The id of the operation.
      * @param s         The visibility of the operation.
      * @param rt        The return type of the operation.
      */
-    UMLOperation(const UMLClassifier * tqparent, const TQString& name,
+    UMLOperation(const UMLClassifier * parent, const TQString& name,
                  Uml::IDType id = Uml::id_None,
                  Uml::Visibility s = Uml::Visibility::Public,
                  UMLObject *rt = 0);
@@ -49,9 +49,9 @@ public:
      * umbrello's TQt signalling for object creation.
      * If you want to create an Operation use the method in UMLDoc instead.
      *
-     * @param tqparent    The tqparent to this operation.
+     * @param parent    The parent to this operation.
      */
-    UMLOperation(const UMLClassifier * tqparent);
+    UMLOperation(const UMLClassifier * parent);
 public:
 
     /**
@@ -157,7 +157,7 @@ public:
     /**
      * Display the properties configuration dialog for the template.
      */
-    bool showPropertiesDialog(TQWidget* tqparent);
+    bool showPropertiesDialog(TQWidget* parent);
 
     /**
      * Returns whether this operation is a constructor.
diff --git a/umbrello/umbrello/ownedcodeblock.cpp b/umbrello/umbrello/ownedcodeblock.cpp
index 3b141500..f80fd315 100644
--- a/umbrello/umbrello/ownedcodeblock.cpp
+++ b/umbrello/umbrello/ownedcodeblock.cpp
@@ -34,10 +34,10 @@
 // Constructors/Destructors
 //
 
-OwnedCodeBlock::OwnedCodeBlock ( UMLObject * tqparent )
-        : TQObject ( (TQObject*)tqparent, "anOwnedCodeBlock" )
+OwnedCodeBlock::OwnedCodeBlock ( UMLObject * parent )
+        : TQObject ( (TQObject*)parent, "anOwnedCodeBlock" )
 {
-    initFields(tqparent);
+    initFields(parent);
 }
 
 OwnedCodeBlock::~OwnedCodeBlock ( ) {
@@ -110,11 +110,11 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e
  */
 void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) {
 
-    // set local attributes, tqparent object first
+    // set local attributes, parent object first
     TQString idStr = elem.attribute("parent_id","-1");
     Uml::IDType id = STR2ID(idStr);
 
-    // always disconnect from current tqparent
+    // always disconnect from current parent
     getParentObject()->disconnect(this);
 
     // now, what is the new object we want to set?
@@ -125,7 +125,7 @@ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) {
         // FIX..one day.
         // Ugh. This is UGLY, but we have to do it this way because UMLRoles
         // don't go into the document list of UMLobjects, and have the same
-        // ID as their tqparent UMLAssociations. So..the drill is then special
+        // ID as their parent UMLAssociations. So..the drill is then special
         // for Associations..in that case we need to find out which role will
         // serve as the parametger here. The REAL fix, of course, would be to
         // treat UMLRoles on a more even footing, but im not sure how that change
@@ -159,13 +159,13 @@ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) {
 
 }
 
-void OwnedCodeBlock::initFields(UMLObject * tqparent )
+void OwnedCodeBlock::initFields(UMLObject * parent )
 {
 
-    m_parentObject = tqparent;
+    m_parentObject = parent;
 
     // one reason for being: set up the connection between
-    // this code block and the tqparent UMLObject..when the tqparent
+    // this code block and the parent UMLObject..when the parent
     // signals a change has been made, we automatically update
     // ourselves
     connect(m_parentObject, TQT_SIGNAL(modified()), this, TQT_SLOT(syncToParent()));
diff --git a/umbrello/umbrello/ownedcodeblock.h b/umbrello/umbrello/ownedcodeblock.h
index 130bd4dd..a911351b 100644
--- a/umbrello/umbrello/ownedcodeblock.h
+++ b/umbrello/umbrello/ownedcodeblock.h
@@ -29,7 +29,7 @@ class UMLObject;
 /**
   * class OwnedCodeBlock
   * Describes any codeblock which is 'owned' by a UMLobject of some sort and should
-  * be in sync with that tqparent.
+  * be in sync with that parent.
   */
 
 class OwnedCodeBlock : virtual public TQObject
@@ -44,7 +44,7 @@ public:
     /**
      * Constructor
      */
-    OwnedCodeBlock ( UMLObject * tqparent );
+    OwnedCodeBlock ( UMLObject * parent );
 
     /**
      * Empty Destructor
@@ -56,7 +56,7 @@ public:
      */
     UMLObject * getParentObject ( );
 
-    // get the tqparent code document of this code block
+    // get the parent code document of this code block
     virtual CodeDocument * getParentDocument ( ) = 0;
 
 protected:
@@ -88,7 +88,7 @@ protected:
 
 private:
 
-    void initFields ( UMLObject * tqparent );
+    void initFields ( UMLObject * parent );
 
     UMLObject * m_parentObject;
 
diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp
index bb2e4990..078a02b7 100644
--- a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp
+++ b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp
@@ -31,8 +31,8 @@
 // Constructors/Destructors
 //
 
-OwnedHierarchicalCodeBlock::OwnedHierarchicalCodeBlock ( UMLObject *tqparent, CodeDocument * doc, const TQString &start, const TQString &end, const TQString &comment)
-        : HierarchicalCodeBlock ( doc, start, end, comment), OwnedCodeBlock(tqparent)
+OwnedHierarchicalCodeBlock::OwnedHierarchicalCodeBlock ( UMLObject *parent, CodeDocument * doc, const TQString &start, const TQString &end, const TQString &comment)
+        : HierarchicalCodeBlock ( doc, start, end, comment), OwnedCodeBlock(parent)
 {
 
 }
diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.h b/umbrello/umbrello/ownedhierarchicalcodeblock.h
index 0999b02f..6cbdb983 100644
--- a/umbrello/umbrello/ownedhierarchicalcodeblock.h
+++ b/umbrello/umbrello/ownedhierarchicalcodeblock.h
@@ -39,7 +39,7 @@ public:
     /** constructor with TQString so we can create & populate it in
      * one step.
      */
-    OwnedHierarchicalCodeBlock ( UMLObject * tqparent, CodeDocument * parentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" );
+    OwnedHierarchicalCodeBlock ( UMLObject * parent, CodeDocument * parentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" );
 
     /**
      * Empty Destructor
@@ -49,7 +49,7 @@ public:
     // Public attributes
     //
 
-    // Return the tqparent code document
+    // Return the parent code document
     CodeDocument * getParentDocument();
 
     // these next 2 methods should be supplied by inheriting classes
diff --git a/umbrello/umbrello/packagewidget.h b/umbrello/umbrello/packagewidget.h
index c3fa4a8e..3cff4ed6 100644
--- a/umbrello/umbrello/packagewidget.h
+++ b/umbrello/umbrello/packagewidget.h
@@ -33,7 +33,7 @@ public:
     /**
      * Constructs a PackageWidget.
      *
-     * @param view              The tqparent of this PackageWidget.
+     * @param view              The parent of this PackageWidget.
      * @param o         The UMLObject this will be representing.
      */
     PackageWidget(UMLView * view, UMLPackage * o);
diff --git a/umbrello/umbrello/petaltree2uml.cpp b/umbrello/umbrello/petaltree2uml.cpp
index 6bd4086f..8d56a3ec 100644
--- a/umbrello/umbrello/petaltree2uml.cpp
+++ b/umbrello/umbrello/petaltree2uml.cpp
@@ -129,12 +129,12 @@ public:
     }
 
     /**
-     * Insert the given UMLClassifierListItem at the tqparent Umbrello object.
+     * Insert the given UMLClassifierListItem at the parent Umbrello object.
      * Abstract method to be implemented by inheriting classes.
-     * NB the tqparent Umbrello object is not included in the ClassifierListReader
+     * NB the parent Umbrello object is not included in the ClassifierListReader
      * class - it must be added at inheriting classes.
      *
-     * @param node   The PetalNode which corresponds to the tqparent Umbrello object.
+     * @param node   The PetalNode which corresponds to the parent Umbrello object.
      * @param o      The UMLObject to insert.
      */
     virtual void insertAtParent(const PetalNode *node, UMLObject *o) = 0;
@@ -249,7 +249,7 @@ public:
         return new UMLAssociation(Uml::at_Generalization);
     }
     /**
-     * Override tqparent implementation: The secondary data is not for the
+     * Override parent implementation: The secondary data is not for the
      * UMLAssociation itself but for its role B object.
      */
     void setTypeReferences(UMLObject *item,
@@ -282,7 +282,7 @@ public:
         return new UMLAssociation(Uml::at_Realization);
     }
     /**
-     * Override tqparent implementation: The secondary data is not for the
+     * Override parent implementation: The secondary data is not for the
      * UMLAssociation itself but for its role B object.
      */
     void setTypeReferences(UMLObject *item,
@@ -310,7 +310,7 @@ protected:
  * @param node       Pointer to the PetalNode which may contain a controlled unit
  * @param name       Name of the current node
  * @param id         TQUID of the current node
- * @param parentPkg  Pointer to the current tqparent UMLPackage.
+ * @param parentPkg  Pointer to the current parent UMLPackage.
  * @return      True if the node actually contained a controlled unit.
  */
 bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, UMLPackage *parentPkg) {
@@ -455,9 +455,9 @@ bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) {
     return true;
 }
 
-Uml::ListView_Type folderType(UMLListViewItem *tqparent) {
+Uml::ListView_Type folderType(UMLListViewItem *parent) {
     Uml::ListView_Type type = Uml::lvt_Unknown;
-    switch (tqparent->getType()) {
+    switch (parent->getType()) {
         case Uml::lvt_Logical_View:
         case Uml::lvt_Logical_Folder:
             type = Uml::lvt_Logical_Folder;
@@ -488,7 +488,7 @@ Uml::ListView_Type folderType(UMLListViewItem *tqparent) {
  *           Given a PetalNode for which the mapping to Umbrello is not yet
  *           implemented umbrellify() is a no-op but also returns true.
  */
-bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *tqparent) {
+bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *parent) {
     if (node == NULL) {
         kError() << "umbrellify(" << modelsName << "): node is NULL" << endl;
         return false;
@@ -501,13 +501,13 @@ bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *tq
     UMLListViewItem *item = NULL;
 
     if (objType == "Class_Category") {
-        Uml::ListView_Type lvType = folderType(tqparent);
-        item = new UMLListViewItem( tqparent, name, lvType, id );
+        Uml::ListView_Type lvType = folderType(parent);
+        item = new UMLListViewItem( parent, name, lvType, id );
     } else if (objType == "Class") {
         TQString stereotype = clean(node->findAttribute("stereotype").string);
         if (stereotype == "Actor") {
             UMLActor *act = new UMLActor(name, id);
-            item = new UMLListViewItem(tqparent, name, Uml::lvt_Actor, act);
+            item = new UMLListViewItem(parent, name, Uml::lvt_Actor, act);
             obj = act;
         } else {
             kDebug() << "umbrellify(" << name << "): handling of Class stereotype "
@@ -515,16 +515,16 @@ bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *tq
         }
     } else if (objType == "UseCase") {
         UMLUseCase *uc = new UMLUseCase(name, id);
-        item = new UMLListViewItem(tqparent, name, Uml::lvt_UseCase, uc);
+        item = new UMLListViewItem(parent, name, Uml::lvt_UseCase, uc);
         obj = uc;
     } else if (objType == "SubSystem") {
         UMLComponent *comp = new UMLComponent(name, id);
-        item = new UMLListViewItem(tqparent, name, Uml::lvt_Component, comp);
+        item = new UMLListViewItem(parent, name, Uml::lvt_Component, comp);
         obj = comp;
     } else if (objType == "Processor" || objType == "Device") {
         UMLNode *un = new UMLNode(name, id);
         un->setStereotype(objType.lower());
-        item = new UMLListViewItem(tqparent, name, Uml::lvt_Node, un);
+        item = new UMLListViewItem(parent, name, Uml::lvt_Node, un);
         obj = un;
     } else {
         kDebug() << "umbrellify: object type " << objType
diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp
index 72dc3169..a682db06 100644
--- a/umbrello/umbrello/plugin.cpp
+++ b/umbrello/umbrello/plugin.cpp
@@ -28,10 +28,10 @@
 
 using namespace Umbrello;
 
-Plugin::Plugin(TQObject *tqparent,
+Plugin::Plugin(TQObject *parent,
                const char *name,
                const TQStringList & /* args */) :
-        TQObject(tqparent, name),
+        TQObject(parent, name),
         Configurable(),
         _ref(0),
         _instanceName(name),
diff --git a/umbrello/umbrello/plugin.h b/umbrello/umbrello/plugin.h
index e566c5cc..1fa4d7f4 100644
--- a/umbrello/umbrello/plugin.h
+++ b/umbrello/umbrello/plugin.h
@@ -81,7 +81,7 @@ class PluginLoader;
  * only available within the scope of the shared library, the configuration
  * records must be set in the constructor of the derived plugin class. However,
  * because the construction name is passed to this constructor (as are the
- * tqparent object and args), we can simply capture the name when the object
+ * parent object and args), we can simply capture the name when the object
  * is constructed.
  */
 class Plugin :
@@ -113,7 +113,7 @@ public:
 
 protected:
     /** Construct a plugin */
-    Plugin(TQObject *tqparent, const char *name, const TQStringList &args);
+    Plugin(TQObject *parent, const char *name, const TQStringList &args);
 
     /** Can be reimplemented to define plugin specific startup behavior */
     virtual bool onInit();
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp
index 3c0cb32c..1986cfa3 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.cpp
+++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp
@@ -35,8 +35,8 @@
 using std::type_info;
 
 
-RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQWidget *tqparent, const char *name ):
-        KListView( tqparent, name ), m_doc( doc )
+RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQWidget *parent, const char *name ):
+        KListView( parent, name ), m_doc( doc )
 {
     loadPixmaps();
 
@@ -159,7 +159,7 @@ void RefactoringAssistant::umlObjectModified( const UMLObject *obj )
 void RefactoringAssistant::operationAdded( UMLClassifierListItem *o )
 {
     UMLOperation *op = static_cast<UMLOperation*>(o);
-    UMLClassifier *c = dynamic_cast<UMLClassifier*>(op->tqparent());
+    UMLClassifier *c = dynamic_cast<UMLClassifier*>(op->parent());
     if(!c)
     {
         kWarning() << "RefactoringAssistant::operationAdded(" << op->getName()
@@ -201,7 +201,7 @@ void RefactoringAssistant::operationRemoved( UMLClassifierListItem *o )
 void RefactoringAssistant::attributeAdded( UMLClassifierListItem *a )
 {
     UMLAttribute *att = static_cast<UMLAttribute*>(a);
-    UMLClassifier *c = dynamic_cast<UMLClassifier*>(att->tqparent());
+    UMLClassifier *c = dynamic_cast<UMLClassifier*>(att->parent());
     if(!c)
     {
         kWarning() << "RefactoringAssistant::attributeAdded(" << att->getName()
@@ -456,12 +456,12 @@ void RefactoringAssistant::createAttribute()
 }
 
 
-void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewItem *tqparent, bool addSuper, bool addSub, bool recurse)
+void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewItem *parent, bool addSuper, bool addSub, bool recurse)
 {
     TQListViewItem *classifierItem, *item;
-    if( tqparent )
+    if( parent )
     {
-        classifierItem = tqparent;
+        classifierItem = parent;
     }
     else
     {
@@ -566,7 +566,7 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const
             break;
     }
     if(!movingItem || !parentItem)
-    {   kDebug()<<"moving/tqparent items not found - can't accept drag!"<<endl;
+    {   kDebug()<<"moving/parent items not found - can't accept drag!"<<endl;
         return false;
     }
 
@@ -583,18 +583,18 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const
         return false;
     }
 
-    kDebug()<<"tqparent item is "<<parentItem->text(0)<<endl;
+    kDebug()<<"parent item is "<<parentItem->text(0)<<endl;
     UMLObject *parentObject = me->findUMLObject(parentItem);
     if( parentObject && dynamic_cast<UMLClassifier*>(parentObject) )
     {
         //droping to a classifier, ok
     }
     else
-    {//tqparent is not a classifier, so maybe  it's a folder.. check types
+    {//parent is not a classifier, so maybe  it's a folder.. check types
         if( (parentItem->text(1) == "operations" && t == Uml::ot_Operation)
                 || (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute))
         {
-            parentObject = me->findUMLObject( parentItem->tqparent() );
+            parentObject = me->findUMLObject( parentItem->parent() );
         }
         else
         {
@@ -637,11 +637,11 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
         if ((parentItem->text(1) == "operations" && t == Uml::ot_Operation)
                 || (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute))
         {
-            newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( parentItem->tqparent() ) );
+            newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( parentItem->parent() ) );
         }
         if(!newClassifier)
         {
-            kWarning()<<"New tqparent of object is not a Classifier - Drop had already been accepted - check!"<<endl;
+            kWarning()<<"New parent of object is not a Classifier - Drop had already been accepted - check!"<<endl;
             return;
         }
     }
@@ -656,7 +656,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
             KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
             return;
         }
-        UMLClassifier *oldClassifier = dynamic_cast<UMLClassifier*>(op->tqparent());
+        UMLClassifier *oldClassifier = dynamic_cast<UMLClassifier*>(op->parent());
         if(oldClassifier)
             oldClassifier->removeOperation( op );
         newClassifier->addOperation( op );
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.h b/umbrello/umbrello/refactoring/refactoringassistant.h
index f69536ad..7acec605 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.h
+++ b/umbrello/umbrello/refactoring/refactoringassistant.h
@@ -35,7 +35,7 @@ class RefactoringAssistant : public KListView
 public:
     typedef std::map<TQListViewItem*, UMLObject*> UMLObjectMap;
 
-    explicit RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj = 0, TQWidget *tqparent = 0, const char *name = 0 );
+    explicit RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj = 0, TQWidget *parent = 0, const char *name = 0 );
     virtual ~RefactoringAssistant();
 
     void refactor( UMLClassifier *obj );
@@ -72,10 +72,10 @@ protected:
     UMLObject* findUMLObject( const TQListViewItem* );
     TQListViewItem* findListViewItem( const UMLObject *obj );
     void editProperties( UMLObject *obj );
-    void addClassifier( UMLClassifier *classifier, TQListViewItem *tqparent = 0, bool addSuper = true, bool addSub = true, bool recurse = false );
+    void addClassifier( UMLClassifier *classifier, TQListViewItem *parent = 0, bool addSuper = true, bool addSub = true, bool recurse = false );
     void loadPixmaps();
     virtual bool acceptDrag(TQDropEvent *event) const;
-    virtual void movableDropEvent (TQListViewItem* tqparent, TQListViewItem* afterme);
+    virtual void movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme);
     void setVisibilityIcon( TQListViewItem *item , const UMLObject *obj );
     UMLClassifier *m_umlObject;
     UMLDoc *m_doc;
diff --git a/umbrello/umbrello/statewidget.h b/umbrello/umbrello/statewidget.h
index 84471f10..eabe0670 100644
--- a/umbrello/umbrello/statewidget.h
+++ b/umbrello/umbrello/statewidget.h
@@ -51,7 +51,7 @@ public:
     /**
      * Creates a State widget.
      *
-     * @param view              The tqparent of the widget.
+     * @param view              The parent of the widget.
      * @param stateType The type of state.
      * @param id                The ID to assign (-1 will prompt a new ID.)
      */
diff --git a/umbrello/umbrello/stereotype.cpp b/umbrello/umbrello/stereotype.cpp
index e77f6c03..c3b912f4 100644
--- a/umbrello/umbrello/stereotype.cpp
+++ b/umbrello/umbrello/stereotype.cpp
@@ -71,9 +71,9 @@ void UMLStereotype::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) {
     qElement.appendChild( stereotypeElement );
 }
 
-bool UMLStereotype::showPropertiesDialog(TQWidget* tqparent) {
+bool UMLStereotype::showPropertiesDialog(TQWidget* parent) {
     bool ok;
-    TQString name = KInputDialog::getText(i18n("Stereotype"), i18n("Enter name:"), getName(),&ok, tqparent);
+    TQString name = KInputDialog::getText(i18n("Stereotype"), i18n("Enter name:"), getName(),&ok, parent);
     if (ok) {
         setName(name);
     }
diff --git a/umbrello/umbrello/stereotype.h b/umbrello/umbrello/stereotype.h
index e5e593cc..a727fed8 100644
--- a/umbrello/umbrello/stereotype.h
+++ b/umbrello/umbrello/stereotype.h
@@ -85,7 +85,7 @@ public:
      * Display the properties configuration dialog for the stereotype
      * (just a line edit).
      */
-    bool showPropertiesDialog(TQWidget* tqparent);
+    bool showPropertiesDialog(TQWidget* parent);
 
 protected:
     /**
diff --git a/umbrello/umbrello/template.cpp b/umbrello/umbrello/template.cpp
index 615e12de..f02f4426 100644
--- a/umbrello/umbrello/template.cpp
+++ b/umbrello/umbrello/template.cpp
@@ -21,15 +21,15 @@
 #include "umldoc.h"
 #include "dialogs/umltemplatedialog.h"
 
-UMLTemplate::UMLTemplate(const UMLObject *tqparent, const TQString& name,
+UMLTemplate::UMLTemplate(const UMLObject *parent, const TQString& name,
                          Uml::IDType id, const TQString& type)
-        : UMLClassifierListItem( tqparent, name, id ) {
+        : UMLClassifierListItem( parent, name, id ) {
     setTypeName( type );
     m_BaseType = Uml::ot_Template;
 }
 
-UMLTemplate::UMLTemplate(const UMLObject *tqparent)
-        : UMLClassifierListItem( tqparent ) {
+UMLTemplate::UMLTemplate(const UMLObject *parent)
+        : UMLClassifierListItem( parent ) {
     m_BaseType = Uml::ot_Template;
 }
 
@@ -69,7 +69,7 @@ void UMLTemplate::copyInto(UMLTemplate *rhs) const
 
 UMLObject* UMLTemplate::clone() const
 {
-    UMLTemplate *clone = new UMLTemplate( (UMLTemplate*) tqparent());
+    UMLTemplate *clone = new UMLTemplate( (UMLTemplate*) parent());
     copyInto(clone);
 
     return clone;
@@ -89,7 +89,7 @@ bool UMLTemplate::load(TQDomElement& element) {
     return true;
 }
 
-bool UMLTemplate::showPropertiesDialog(TQWidget* tqparent) {
-    UMLTemplateDialog dialog(tqparent, this);
+bool UMLTemplate::showPropertiesDialog(TQWidget* parent) {
+    UMLTemplateDialog dialog(parent, this);
     return dialog.exec();
 }
diff --git a/umbrello/umbrello/template.h b/umbrello/umbrello/template.h
index e7558010..6b471207 100644
--- a/umbrello/umbrello/template.h
+++ b/umbrello/umbrello/template.h
@@ -30,20 +30,20 @@ public:
     /**
      * Sets up a template.
      *
-     * @param tqparent    The tqparent of this UMLTemplate (i.e. its concept).
+     * @param parent    The parent of this UMLTemplate (i.e. its concept).
      * @param name              The name of this UMLTemplate.
      * @param id                The unique id given to this UMLTemplate.
      * @param type              The type of this UMLTemplate.
      */
-    UMLTemplate(const UMLObject *tqparent, const TQString& name,
+    UMLTemplate(const UMLObject *parent, const TQString& name,
                 Uml::IDType id = Uml::id_None, const TQString& type = "class");
 
     /**
      * Sets up a template.
      *
-     * @param tqparent    The tqparent of this UMLTemplate (i.e. its concept).
+     * @param parent    The parent of this UMLTemplate (i.e. its concept).
      */
-    UMLTemplate(const UMLObject *tqparent);
+    UMLTemplate(const UMLObject *parent);
 
     /**
      * Overloaded '==' operator
@@ -89,7 +89,7 @@ public:
      *
      * @return  Success status.
      */
-    bool showPropertiesDialog(TQWidget* tqparent);
+    bool showPropertiesDialog(TQWidget* parent);
 
     /**
      * Writes the <UML:TemplateParameter> XMI element.
diff --git a/umbrello/umbrello/textblock.cpp b/umbrello/umbrello/textblock.cpp
index 1a66c113..6ae42c52 100644
--- a/umbrello/umbrello/textblock.cpp
+++ b/umbrello/umbrello/textblock.cpp
@@ -30,10 +30,10 @@
 // Constructors/Destructors
 //
 
-TextBlock::TextBlock ( CodeDocument * tqparent, const TQString & text )
-        : TQObject ( (TQObject *)tqparent, "textBlock")
+TextBlock::TextBlock ( CodeDocument * parent, const TQString & text )
+        : TQObject ( (TQObject *)parent, "textBlock")
 {
-    initFields(tqparent);
+    initFields(parent);
     setText(text);
 }
 
@@ -49,7 +49,7 @@ TextBlock::~TextBlock ( ) { }
 
 
 /**
- * Set the value of the  tqparent code document
+ * Set the value of the  parent code document
  * @param new_var the new value of m_parentDocument
  */
 void TextBlock::setParentDocument ( CodeDocument * new_var ) {
@@ -137,7 +137,7 @@ void TextBlock::setIndentationLevel ( int level ) {
 }
 
 /** Get how many times to indent this text block.
- * The amount of each indenatation is determined from the tqparent
+ * The amount of each indenatation is determined from the parent
  * codedocument codegeneration policy.
  */
 int TextBlock::getIndentationLevel ( ) {
@@ -308,10 +308,10 @@ TQString TextBlock::toString ( )
         return "";
 }
 
-void TextBlock::initFields ( CodeDocument * tqparent ) {
+void TextBlock::initFields ( CodeDocument * parent ) {
     m_canDelete = true;
     m_writeOutText = true;
-    m_parentDocument = tqparent;
+    m_parentDocument = parent;
     m_text = "";
     m_tag = "";
     m_indentationLevel = 0;
diff --git a/umbrello/umbrello/textblock.h b/umbrello/umbrello/textblock.h
index 3e470c7a..9386f3d6 100644
--- a/umbrello/umbrello/textblock.h
+++ b/umbrello/umbrello/textblock.h
@@ -42,7 +42,7 @@ public:
     /**
      * Constructors
      */
-    explicit TextBlock ( CodeDocument * tqparent, const TQString & text = "");
+    explicit TextBlock ( CodeDocument * parent, const TQString & text = "");
 
     // destructor
     ~TextBlock ( );
@@ -108,13 +108,13 @@ public:
     bool getWriteOutText ( );
 
     /** Set how many times to indent this text block.
-     * The amount of each indenatation is determined from the tqparent
+     * The amount of each indenatation is determined from the parent
      * codedocument codegeneration policy.
      */
     void setIndentationLevel ( int level );
 
     /** Get how many times to indent this text block.
-     * The amount of each indenatation is determined from the tqparent
+     * The amount of each indenatation is determined from the parent
      * codedocument codegeneration policy.
      */
     int getIndentationLevel ( );
diff --git a/umbrello/umbrello/toolbarstate.h b/umbrello/umbrello/toolbarstate.h
index 5bcb12bf..976a4a90 100644
--- a/umbrello/umbrello/toolbarstate.h
+++ b/umbrello/umbrello/toolbarstate.h
@@ -163,7 +163,7 @@ protected:
 
     /**
      * Creates a new ToolBarState.
-     * UMLView is set as tqparent of this TQObject, and name is left empty.
+     * UMLView is set as parent of this TQObject, and name is left empty.
      * Protected to avoid classes other than derived to create objects of this
      * class.
      *
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index 93cd981e..b2f9181d 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -82,7 +82,7 @@ public:
     /**
      * Constructor. Calls all init functions to create the application.
      */
-    UMLApp(TQWidget* tqparent=0, const char* name=0);
+    UMLApp(TQWidget* parent=0, const char* name=0);
 
     /**
      * Standard deconstructor.
@@ -247,7 +247,7 @@ public:
     void setDiagramMenuItemsState(bool bState);
 
     /**
-     * Returns the widget used as the tqparent for UMLViews.
+     * Returns the widget used as the parent for UMLViews.
      * @return  The main view widget.
      */
     TQWidget* getMainViewWidget();
@@ -984,13 +984,13 @@ private:
     bool m_loading;
 
     /**
-     * Shows, and is tqparent of, all the UMLViews (diagrams)
+     * Shows, and is parent of, all the UMLViews (diagrams)
      * if tabbed diagrams are not enabled.
      */
     TQWidgetStack* m_viewStack;
 
     /**
-     * Shows, and is tqparent of, all the UMLViews (diagrams)
+     * Shows, and is parent of, all the UMLViews (diagrams)
      * if tabbed diagrams are enabled.
      */
     KTabWidget* m_tabWidget;
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();
diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h
index 60154fa9..5ee9cc39 100644
--- a/umbrello/umbrello/umldoc.h
+++ b/umbrello/umbrello/umldoc.h
@@ -213,7 +213,7 @@ public:
     bool isUnique(const TQString &name, UMLPackage *package);
 
     /**
-     * Finds or creates a stereotype for the tqparent object.
+     * Finds or creates a stereotype for the parent object.
      */
     UMLStereotype* findOrCreateStereotype(const TQString &name);
 
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index 992e0f7f..6fe7b84f 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -66,7 +66,7 @@
 class LVToolTip : public TQToolTip
 {
 public:
-    LVToolTip (TQWidget* tqparent) : TQToolTip (tqparent) {}
+    LVToolTip (TQWidget* parent) : TQToolTip (parent) {}
     virtual ~LVToolTip () {}
 protected:
     /**
@@ -93,8 +93,8 @@ protected:
 #endif
 
 
-UMLListView::UMLListView(TQWidget *tqparent, const char *name)
-        : KListView(tqparent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument())
+UMLListView::UMLListView(TQWidget *parent, const char *name)
+        : KListView(parent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument())
 {
     loadPixmaps();
 
@@ -232,7 +232,7 @@ void UMLListView::keyPressEvent(TQKeyEvent *ke) {
                 deleteItem(dynamic_cast<UMLListViewItem*>(item));
             }
         } else {
-            TQListView::keyPressEvent(ke); // let tqparent handle it
+            TQListView::keyPressEvent(ke); // let parent handle it
         }
     }
 }
@@ -601,7 +601,7 @@ UMLListViewItem* UMLListView::determineParentItem(UMLObject* object) const {
                 UMLListViewItem* pkgItem = findUMLObject(pkg);
                 if (pkgItem == NULL)
                     kError() << "UMLListView::determineParentItem: could not find "
-                        << "tqparent package " << pkg->getName() << endl;
+                        << "parent package " << pkg->getName() << endl;
                 else
                     parentItem = pkgItem;
             } else if ((lvt == Uml::lvt_UseCase_Folder &&
@@ -764,22 +764,22 @@ void UMLListView::slotObjectChanged() {
 }
 
 void UMLListView::childObjectAdded(UMLClassifierListItem* obj) {
-    UMLClassifier *tqparent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender()));
-    childObjectAdded(obj, tqparent);
+    UMLClassifier *parent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender()));
+    childObjectAdded(obj, parent);
 }
 
-void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* tqparent) {
+void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* parent) {
     if (m_bCreatingChildObject)
         return;
     const TQString text = child->toString(Uml::st_SigNoVis);
     UMLListViewItem *childItem = NULL;
-    UMLListViewItem *parentItem = findUMLObject(tqparent);
+    UMLListViewItem *parentItem = findUMLObject(parent);
     if (parentItem == NULL) {
         kDebug() << "UMLListView::childObjectAdded(" << child->getName()
-            << "): tqparent " << tqparent->getName()
+            << "): parent " << parent->getName()
             << " does not yet exist, creating it now." << endl;
-        const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(tqparent);
-        parentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], tqparent->getName(), lvt, tqparent);
+        const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(parent);
+        parentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], parent->getName(), lvt, parent);
     } else {
         childItem = parentItem->findChildObject(child);
     }
@@ -798,11 +798,11 @@ void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier*
 }
 
 void UMLListView::childObjectRemoved(UMLClassifierListItem* obj) {
-    UMLClassifier *tqparent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender()));
-    UMLListViewItem *parentItem = findUMLObject(tqparent);
+    UMLClassifier *parent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender()));
+    UMLListViewItem *parentItem = findUMLObject(parent);
     if (parentItem == NULL) {
         kError() << "UMLListView::childObjectRemoved(" << obj->getName()
-            << "): cannot find tqparent UMLListViewItem" << endl;
+            << "): cannot find parent UMLListViewItem" << endl;
         return;
     }
     parentItem->deleteChildItem(obj);
@@ -1065,7 +1065,7 @@ void UMLListView::contentsMouseDoubleClickEvent(TQMouseEvent * me) {
     Uml::Object_Type type = object -> getBaseType();
     int page = ClassPropDlg::page_gen;
     if(type == Uml::ot_Attribute || type == Uml::ot_Operation)
-        object = (UMLObject *)object -> tqparent();
+        object = (UMLObject *)object -> parent();
     //set what page to show
     if(type == Uml::ot_Attribute)
         page = ClassPropDlg::page_att;
@@ -1222,12 +1222,12 @@ bool UMLListView::acceptDrag(TQDropEvent* event) const {
     return accept;
 }
 
-void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *tqparent) {
+void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *parent) {
     UMLCanvasObject *o = static_cast<UMLCanvasObject*>(item->getUMLObject());
     if (o == NULL) {
         kDebug() << "UMLListView::addAtContainer(" << item->getText()
             << "): item's UMLObject is NULL" << endl;
-    } else if (Model_Utils::typeIsContainer(tqparent->getType())) {
+    } else if (Model_Utils::typeIsContainer(parent->getType())) {
         /**** TBC: Do this here?
                    If yes then remove that logic at the callers
                    and rename this method to moveAtContainer()
@@ -1235,12 +1235,12 @@ void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *tqparen
         if (oldPkg)
             oldPkg->removeObject(o);
          *********/
-        UMLPackage *pkg = static_cast<UMLPackage*>(tqparent->getUMLObject());
+        UMLPackage *pkg = static_cast<UMLPackage*>(parent->getUMLObject());
         o->setUMLPackage(pkg);
         pkg->addObject(o);
     } else {
         kError() << "UMLListView::addAtContainer(" << item->getText()
-            << "): tqparent type is " << tqparent->getType() << endl;
+            << "): parent type is " << parent->getType() << endl;
     }
     UMLView *currentView = UMLApp::app()->getCurrentView();
     if (currentView)
@@ -1256,7 +1256,7 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type
         return NULL;
 
     UMLObject *newParentObj = NULL;
-    // Remove the source object at the old tqparent package.
+    // Remove the source object at the old parent package.
     UMLObject *srcObj = m_doc->findObjectById(srcId);
     if (srcObj) {
         newParentObj = newParent->getUMLObject();
@@ -1422,14 +1422,14 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type
             // update model objects
             m_bCreatingChildObject = true;
 
-            UMLClassifier *oldParentClassifier = dynamic_cast<UMLClassifier*>(srcObj->tqparent());
+            UMLClassifier *oldParentClassifier = dynamic_cast<UMLClassifier*>(srcObj->parent());
             UMLClassifier *newParentClassifier = dynamic_cast<UMLClassifier*>(newParentObj);
             if (srcType == Uml::lvt_Attribute) {
                 UMLAttribute *att = dynamic_cast<UMLAttribute*>(srcObj);
                 // We can't use the existing 'att' directly
-                // because its tqparent is fixed to the old classifier
+                // because its parent is fixed to the old classifier
                 // and we have no way of changing that:
-                // TQObject does not permit changing the tqparent().
+                // TQObject does not permit changing the parent().
                 if (att == NULL) {
                     kError() << "moveObject internal error: srcObj "
                         << srcObj->getName() << " is not a UMLAttribute" << endl;
@@ -1454,9 +1454,9 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type
             } else {
                 UMLOperation *op = dynamic_cast<UMLOperation*>(srcObj);
                 // We can't use the existing 'op' directly
-                // because its tqparent is fixed to the old classifier
+                // because its parent is fixed to the old classifier
                 // and we have no way of changing that:
-                // TQObject does not permit changing the tqparent().
+                // TQObject does not permit changing the parent().
                 if (op && oldParentClassifier->takeItem(op) != -1) {
                     bool isExistingOp;
                     Model_Utils::NameAndType_List ntDummyList;
@@ -1502,7 +1502,7 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type
     return newItem;
 }
 
-void UMLListView::slotDropped(TQDropEvent* de, TQListViewItem* /* tqparent */, TQListViewItem* item) {
+void UMLListView::slotDropped(TQDropEvent* de, TQListViewItem* /* parent */, TQListViewItem* item) {
     item = (UMLListViewItem *)currentItem();
     if(!item) {
         kDebug() << "UMLListView::slotDropped: item is NULL - doing nothing" << endl;
@@ -1545,10 +1545,10 @@ int UMLListView::getSelectedItemsRoot(UMLListViewItemList &ItemList) {
     for ( ; it.current(); ++it ) {
         if ( it.current()->isSelected() ) {
             UMLListViewItem *item = (UMLListViewItem*)it.current();
-            // this is the trick, we select only the item with a tqparent unselected
-            // since we can't select a child and its grandfather without its tqparent
+            // this is the trick, we select only the item with a parent unselected
+            // since we can't select a child and its grandfather without its parent
             // we would be able to delete each item individually, without an invalid iterator
-            if (item && item->tqparent() && item->tqparent()->isSelected()==false) {
+            if (item && item->parent() && item->parent()->isSelected()==false) {
               ItemList.append(item);
             }
         }
@@ -1560,37 +1560,37 @@ int UMLListView::getSelectedItemsRoot(UMLListViewItemList &ItemList) {
 
 UMLListViewItem* UMLListView::createDiagramItem(UMLView *v) {
     Uml::ListView_Type lvt = Model_Utils::convert_DT_LVT(v->getType());
-    UMLListViewItem *tqparent = NULL;
+    UMLListViewItem *parent = NULL;
     UMLFolder *f = v->getFolder();
     if (f) {
-        tqparent = findUMLObject(f);
-        if (tqparent == NULL)
+        parent = findUMLObject(f);
+        if (parent == NULL)
             kError() << "UMLListView::createDiagramItem(" << v->getName()
                 << "): findUMLObject(" << f->getName() << ") returns NULL"
                 << endl;
     } else {
         kDebug() << "UMLListView::createDiagramItem(" << v->getName()
-            << "): no tqparent folder set, using predefined folder" << endl;
+            << "): no parent folder set, using predefined folder" << endl;
     }
-    if (tqparent == NULL) {
-        tqparent = determineParentItem(lvt);
+    if (parent == NULL) {
+        parent = determineParentItem(lvt);
         lvt = Model_Utils::convert_DT_LVT(v->getType());
     }
-    UMLListViewItem *item = new UMLListViewItem(tqparent, v->getName(), lvt, v->getID());
+    UMLListViewItem *item = new UMLListViewItem(parent, v->getName(), lvt, v->getID());
     return item;
 }
 
 /** Creates a new UMLListViewItem from a UMLListViewItem,
-    if tqparent is null the ListView Decides who is going to be
-    the tqparent */
+    if parent is null the ListView Decides who is going to be
+    the parent */
 UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDChanges,
-        UMLListViewItem* tqparent /*= 0*/) {
+        UMLListViewItem* parent /*= 0*/) {
     UMLObject* pObject = 0;
     UMLListViewItem* item = 0;
     Uml::ListView_Type lvt = Data.getType();
-    if(!tqparent) {
-        tqparent = determineParentItem(lvt);
-        if (!tqparent)
+    if(!parent) {
+        parent = determineParentItem(lvt);
+        if (!parent)
             return 0;
     }
 
@@ -1618,13 +1618,13 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC
         //it could exist an Item already asocciated if the user chose to reuse an uml object
         if(!(item = findItem(newID))) {
                 pObject = m_doc->findObjectById( IDChanges.findNewID(Data.getID()) );
-                item = new UMLListViewItem(tqparent, Data.getText(), lvt, pObject);
+                item = new UMLListViewItem(parent, Data.getText(), lvt, pObject);
         } ***/
         pObject = m_doc->findObjectById( Data.getID() );
-        item = new UMLListViewItem(tqparent, Data.getText(), lvt, pObject);
+        item = new UMLListViewItem(parent, Data.getText(), lvt, pObject);
         break;
     case Uml::lvt_Datatype_Folder:
-        item = new UMLListViewItem(tqparent, Data.getText(), lvt);
+        item = new UMLListViewItem(parent, Data.getText(), lvt);
         break;
     case Uml::lvt_Attribute:
     case Uml::lvt_EntityAttribute:
@@ -1632,11 +1632,11 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC
     case Uml::lvt_Template:
     case Uml::lvt_EnumLiteral:
         {
-            UMLClassifier *pClass =  static_cast<UMLClassifier*>(tqparent->getUMLObject());
+            UMLClassifier *pClass =  static_cast<UMLClassifier*>(parent->getUMLObject());
             Uml::IDType newID = IDChanges.findNewID( Data.getID() );
             pObject = pClass->findChildObjectById(newID);
             if (pObject) {
-                item = new UMLListViewItem( tqparent, Data.getText(), lvt, pObject );
+                item = new UMLListViewItem( parent, Data.getText(), lvt, pObject );
             } else {
                 item = 0;
             }
@@ -1658,7 +1658,7 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC
                 return NULL;
             }
             const Uml::ListView_Type lvt = Model_Utils::convert_DT_LVT(v->getType());
-            item = new UMLListViewItem(tqparent, v->getName(), lvt, newID);
+            item = new UMLListViewItem(parent, v->getName(), lvt, newID);
         }
         break;
     default:
@@ -1669,36 +1669,36 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC
 }
 
 UMLListViewItem* UMLListView::determineParentItem(Uml::ListView_Type lvt) const {
-    UMLListViewItem* tqparent = 0;
+    UMLListViewItem* parent = 0;
     switch (lvt) {
     case Uml::lvt_Datatype:
-        tqparent = m_datatypeFolder;
+        parent = m_datatypeFolder;
         break;
     case Uml::lvt_Actor:
     case Uml::lvt_UseCase:
     case Uml::lvt_UseCase_Folder:
     case Uml::lvt_UseCase_Diagram:
-        tqparent = m_lv[Uml::mt_UseCase];
+        parent = m_lv[Uml::mt_UseCase];
         break;
     case Uml::lvt_Component_Diagram:
     case Uml::lvt_Component:
     case Uml::lvt_Artifact:
-        tqparent = m_lv[Uml::mt_Component];
+        parent = m_lv[Uml::mt_Component];
         break;
     case Uml::lvt_Deployment_Diagram:
     case Uml::lvt_Node:
-        tqparent = m_lv[Uml::mt_Deployment];
+        parent = m_lv[Uml::mt_Deployment];
         break;
     case Uml::lvt_EntityRelationship_Diagram:
     case Uml::lvt_Entity:
-        tqparent = m_lv[Uml::mt_EntityRelationship];
+        parent = m_lv[Uml::mt_EntityRelationship];
         break;
     default:
         if (Model_Utils::typeIsDiagram(lvt) || !Model_Utils::typeIsClassifierList(lvt))
-            tqparent = m_lv[Uml::mt_Logical];
+            parent = m_lv[Uml::mt_Logical];
         break;
     }
-    return tqparent;
+    return parent;
 }
 
 int UMLListView::getSelectedCount() {
@@ -1737,9 +1737,9 @@ Uml::ListView_Type UMLListView::rootViewType(UMLListViewItem *item) {
         return Uml::lvt_Deployment_View;
     if (item == m_lv[Uml::mt_EntityRelationship])
         return Uml::lvt_EntityRelationship_Model;
-    UMLListViewItem *tqparent = dynamic_cast<UMLListViewItem*>(item->tqparent());
-    if (tqparent)
-        return rootViewType(tqparent);
+    UMLListViewItem *parent = dynamic_cast<UMLListViewItem*>(item->parent());
+    if (parent)
+        return rootViewType(parent);
     return Uml::lvt_Unknown;
 }
 
@@ -1872,8 +1872,8 @@ void UMLListView::addNewItem(UMLListViewItem *parentItem, Uml::ListView_Type typ
             return;
         }
         if (Model_Utils::typeIsClassifierList(type)) {
-            UMLClassifier *tqparent = static_cast<UMLClassifier*>(parentPkg);
-            name = tqparent->uniqChildName(ot);
+            UMLClassifier *parent = static_cast<UMLClassifier*>(parentPkg);
+            name = parent->uniqChildName(ot);
         } else {
             name = Model_Utils::uniqObjectName(ot, parentPkg);
         }
@@ -2073,7 +2073,7 @@ UMLObject *UMLListView::createUMLObject( UMLListViewItem * item, Uml::Object_Typ
         return NULL;
     }
 
-    UMLListViewItem * parentItem = static_cast<UMLListViewItem *>(item->tqparent());
+    UMLListViewItem * parentItem = static_cast<UMLListViewItem *>(item->parent());
     const Uml::ListView_Type lvt = parentItem->getType();
     if (! Model_Utils::typeIsContainer(lvt)) {
         kError() << "UMLListView::createUMLObject(" << object->getName()
@@ -2093,9 +2093,9 @@ UMLObject *UMLListView::createUMLObject( UMLListViewItem * item, Uml::Object_Typ
 bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type type ) {
     m_bCreatingChildObject = true;
     TQString text = item->text( 0 );
-    UMLObject* tqparent = static_cast<UMLListViewItem *>( item->tqparent() )->getUMLObject();
-    if( !tqparent ) {
-        kError() << "UMLListView::createChildUMLObject: tqparent UMLObject is NULL" << endl;
+    UMLObject* parent = static_cast<UMLListViewItem *>( item->parent() )->getUMLObject();
+    if( !parent ) {
+        kError() << "UMLListView::createChildUMLObject: parent UMLObject is NULL" << endl;
         m_bCreatingChildObject = false;
         return false;
     }
@@ -2103,13 +2103,13 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
     //kDebug() << "UMLListView::createChildUMLObject (" << text << ")" << endl;
     UMLObject* newObject = NULL;
     if ( type == Uml::ot_EnumLiteral ) {
-        UMLEnum *owningEnum = static_cast<UMLEnum*>(tqparent);
+        UMLEnum *owningEnum = static_cast<UMLEnum*>(parent);
         newObject = owningEnum->createEnumLiteral(text);
 
         UMLEnumLiteral* enumLiteral = static_cast<UMLEnumLiteral*>(newObject);
         text = enumLiteral->toString(Uml::st_SigNoVis);
     } else if ( type == Uml::ot_Template )  {
-        UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(tqparent);
+        UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent);
         Model_Utils::NameAndType nt;
         Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(text, nt, owningClassifier);
         if (st) {
@@ -2124,7 +2124,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
         tmplParm->setType(nt.m_type);
         text = tmplParm->toString(Uml::st_SigNoVis);
     } else if (type == Uml::ot_Attribute || type == Uml::ot_EntityAttribute)  {
-        UMLClassifier *owningClass = static_cast<UMLClassifier*>(tqparent);
+        UMLClassifier *owningClass = static_cast<UMLClassifier*>(parent);
         Model_Utils::NameAndType nt;
         Uml::Visibility vis;
         Model_Utils::Parse_tqStatus st;
@@ -2141,7 +2141,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
         att->setParmKind(nt.m_direction);
         text = att->toString(Uml::st_SigNoVis);
     } else if ( type == Uml::ot_Operation ) {
-        UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(tqparent);
+        UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent);
         Model_Utils::OpDescriptor od;
         Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(text, od, owningClassifier);
         if (st) {
@@ -2180,9 +2180,9 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
     item->setText( text );
     ensureItemVisible(item);
 
-    // as it's a ClassifierListItem add it to the childObjectMap of the tqparent
+    // as it's a ClassifierListItem add it to the childObjectMap of the parent
     UMLClassifierListItem* classifierListItem = static_cast<UMLClassifierListItem*>( newObject );
-    static_cast<UMLListViewItem*>( item->tqparent() )->addClassifierListItem(classifierListItem, item );
+    static_cast<UMLListViewItem*>( item->parent() )->addClassifierListItem(classifierListItem, item );
 
     m_bCreatingChildObject = false;
 
@@ -2198,11 +2198,11 @@ void UMLListView::createDiagram( UMLListViewItem * item, Uml::Diagram_Type type
         delete item;
         return;
     }
-    UMLListViewItem *parentItem = static_cast<UMLListViewItem*>(item->tqparent());
+    UMLListViewItem *parentItem = static_cast<UMLListViewItem*>(item->parent());
     UMLFolder *parentFolder = dynamic_cast<UMLFolder*>(parentItem->getUMLObject());
     if (parentFolder == NULL) {
         kError() << "UMLListView::createDiagram(" << name
-            << "): tqparent UMLObject is not a UMLFolder" << endl;
+            << "): parent UMLObject is not a UMLFolder" << endl;
         delete item;
         return;
     }
@@ -2223,7 +2223,7 @@ TQString UMLListView::getUniqueDiagramName(Uml::Diagram_Type type) {
 }
 
 bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) {
-    UMLListViewItem * parentItem = static_cast<UMLListViewItem *>( item -> tqparent() );
+    UMLListViewItem * parentItem = static_cast<UMLListViewItem *>( item -> parent() );
     Uml::ListView_Type type = item -> getType();
     switch( type ) {
     case Uml::lvt_Class_Diagram:
@@ -2289,7 +2289,7 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) {
             UMLPackage *pkg = static_cast<UMLPackage*>(parentItem->getUMLObject());
             if (pkg == NULL) {
                 kError() << "UMLListView::isUnique: internal error - "
-                    << "tqparent listviewitem is package but has no UMLObject" << endl;
+                    << "parent listviewitem is package but has no UMLObject" << endl;
                 return true;
             }
             return (pkg->findObject(name) == NULL);
@@ -2302,8 +2302,8 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) {
     case Uml::lvt_Operation:
     case Uml::lvt_EnumLiteral:
         {
-            UMLClassifier *tqparent = static_cast<UMLClassifier*>(parentItem->getUMLObject());
-            return (tqparent->findChildObject(name) == NULL);
+            UMLClassifier *parent = static_cast<UMLClassifier*>(parentItem->getUMLObject());
+            return (parent->findChildObject(name) == NULL);
             break;
         }
 
@@ -2355,7 +2355,7 @@ bool UMLListView::loadFromXMI( TQDomElement & element ) {
     return true;
 }
 
-bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement & element ) {
+bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & element ) {
     TQDomNode node = element.firstChild();
     TQDomElement domElement = node.toElement();
     const TQString pfx("UMLListView::loadChildrenFromXMI: ");
@@ -2400,7 +2400,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
                     label = pObject->getName();
             } else if (Model_Utils::typeIsFolder(lvType)) {
                 // Synthesize the UMLFolder here
-                UMLObject *umlParent = tqparent->getUMLObject();
+                UMLObject *umlParent = parent->getUMLObject();
                 UMLPackage *parentPkg = dynamic_cast<UMLPackage*>(umlParent);
                 if (parentPkg == NULL) {
                     kError() << pfx << "umlParent(" << umlParent << ") is not a UMLPackage"
@@ -2412,7 +2412,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
                 f->setUMLPackage(parentPkg);
                 parentPkg->addObject(f);
                 pObject = f;
-                item = new UMLListViewItem(tqparent, label, lvType, pObject);
+                item = new UMLListViewItem(parent, label, lvType, pObject);
                 // Moving all relevant UMLObjects to the new UMLFolder is done below,
                 // in the switch(lvType)
             }
@@ -2454,7 +2454,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
                     << "findItem(id " << ID2STR(nID) << ") returns NULL" << endl;
                 /*
                 if (pObject && pObject->getUMLPackage() &&
-                        tqparent->getType() != Uml::lvt_Package) {
+                        parent->getType() != Uml::lvt_Package) {
                     // Pre-1.2 file format:
                     // Objects were not nested in their packages.
                     // Synthesize the nesting here.
@@ -2463,17 +2463,17 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
                     if (pkgItem == NULL) {
                         kDebug() << pfx << "synthesizing ListViewItem for package "
                             << ID2STR(umlpkg->getID()) << endl;
-                        pkgItem = new UMLListViewItem(tqparent, umlpkg->getName(),
+                        pkgItem = new UMLListViewItem(parent, umlpkg->getName(),
                                                       Uml::lvt_Package, umlpkg);
                         pkgItem->setOpen(true);
                     }
                     item = new UMLListViewItem(pkgItem, label, lvType, pObject);
                 } else {
-                    item = new UMLListViewItem(tqparent, label, lvType, pObject);
+                    item = new UMLListViewItem(parent, label, lvType, pObject);
                 }
                  */
             }
-            else if (tqparent != item->tqparent()) {
+            else if (parent != item->parent()) {
                 // The existing item was created by the slot event triggered
                 // by the loading of the corresponding model object from the
                 // XMI file.
@@ -2481,23 +2481,23 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
                 // of foreign XMI files that do not have the umbrello specific
                 // <listview> tag.
                 // However, now that we encountered the real <listview> info,
-                // we need to delete the existing item: Its tqparent is always
+                // we need to delete the existing item: Its parent is always
                 // one of the default predefined folders, but the actual
                 // listview item might be located in a user created folder.
                 // Thanks to Achim Spangler for spotting the problem.
-                UMLListViewItem *itmParent = dynamic_cast<UMLListViewItem*>(item->tqparent());
-                kDebug() << pfx << item->getText() << " tqparent "
-                    << tqparent->getText() << " (" << tqparent << ") != "
+                UMLListViewItem *itmParent = dynamic_cast<UMLListViewItem*>(item->parent());
+                kDebug() << pfx << item->getText() << " parent "
+                    << parent->getText() << " (" << parent << ") != "
                     << itmParent->getText() << " (" << itmParent << ")" << endl;
                 if (item == m_datatypeFolder && itmParent == m_lv[Uml::mt_Logical]) {
                     kDebug() << pfx << "Reparenting the Datatypes folder is prohibited" << endl;
                 } else {
-                    UMLListViewItem *newItem = moveObject(nID, lvType, tqparent);
+                    UMLListViewItem *newItem = moveObject(nID, lvType, parent);
                     item = newItem;
                     if (item) {
                         kDebug() << pfx << "Attempted reparenting of " << item->getText()
-                            << "(current tqparent: " << (itmParent ? itmParent->getText() : "NULL")
-                            << ", new tqparent: " << tqparent->getText() << ")" << endl;
+                            << "(current parent: " << (itmParent ? itmParent->getText() : "NULL")
+                            << ", new parent: " << parent->getText() << ")" << endl;
                     }
                 }
             }
@@ -2511,9 +2511,9 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
             if (item == NULL) {
                 kDebug() << pfx << "item " << ID2STR(nID) << " (of type "
                     << lvType << ") does not yet exist..." << endl;
-                UMLObject* umlObject = tqparent->getUMLObject();
+                UMLObject* umlObject = parent->getUMLObject();
                 if (!umlObject) {
-                    kDebug() << "And also the tqparent->getUMLObject() does not exist" << endl;
+                    kDebug() << "And also the parent->getUMLObject() does not exist" << endl;
                     return false;
                 }
                 if (nID == Uml::id_None) {
@@ -2525,7 +2525,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
                         if (umlObject) {
                             connectNewObjectsSlots(umlObject);
                             label = umlObject->getName();
-                            item = new UMLListViewItem( tqparent, label, lvType, umlObject);
+                            item = new UMLListViewItem( parent, label, lvType, umlObject);
                         } else {
                             kDebug() << pfx << "lvtype " << lvType << " child object "
                                 << ID2STR(nID) << " not found" << endl;
@@ -2556,7 +2556,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
             break;
         default:
             if (Model_Utils::typeIsDiagram(lvType)) {
-                item = new UMLListViewItem( tqparent, label, lvType, nID );
+                item = new UMLListViewItem( parent, label, lvType, nID );
             } else {
                 kError() << pfx << "INTERNAL ERROR: unexpected listview type "
                     << lvType << " (ID " << ID2STR(nID) << ")" << endl;
@@ -2634,14 +2634,14 @@ UMLListViewItem *UMLListView::rootView(Uml::ListView_Type type) {
     return theView;
 }
 
-void UMLListView::deleteChildrenOf(TQListViewItem* tqparent) {
-    if ( !tqparent ) {
+void UMLListView::deleteChildrenOf(TQListViewItem* parent) {
+    if ( !parent ) {
         return;
     }
-    if (tqparent == m_lv[Uml::mt_Logical])
+    if (parent == m_lv[Uml::mt_Logical])
         m_datatypeFolder = NULL;
-    while ( tqparent->firstChild() ) {
-        delete tqparent->firstChild();
+    while ( parent->firstChild() ) {
+        delete parent->firstChild();
     }
 }
 
diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h
index 3420c1f4..b6bf201c 100644
--- a/umbrello/umbrello/umllistview.h
+++ b/umbrello/umbrello/umllistview.h
@@ -49,10 +49,10 @@ public:
     /**
      * Constructs the tree view.
      *
-     * @param tqparent    The tqparent to this.
+     * @param parent    The parent to this.
      * @param name              The internal name for this class.
      */
-    UMLListView(TQWidget *tqparent,const char *name);
+    UMLListView(TQWidget *parent,const char *name);
 
     /**
      *  Standard deconstructor.
@@ -106,41 +106,41 @@ public:
      * CHECK - This is perhaps redundant since the
      *         UMLListViewItemData => UMLListViewItem merge.
      * Creates a new UMLListViewItem from a UMLListViewItem, if
-     * tqparent is null the ListView Decides who is going to be the
-     * tqparent
+     * parent is null the ListView Decides who is going to be the
+     * parent
      */
     UMLListViewItem* createItem(UMLListViewItem& Data, IDChangeLog& IDChanges,
-                                UMLListViewItem* tqparent = 0);
+                                UMLListViewItem* parent = 0);
 
     /**
-     * Find the tqparent folder for a diagram.
+     * Find the parent folder for a diagram.
      * If the currently selected item in the list view is a folder
-     * then that folder is returned as the tqparent.
+     * then that folder is returned as the parent.
      *
      * @param dt   The Diagram_Type of the diagram.
      *             The type will only be used if there is no currently
      *             selected item, or if the current item is not a folder.
      *             In that case the root folder which is suitable for the
      *             Diagram_Type is returned.
-     * @return  Pointer to the tqparent UMLListViewItem for the diagram.
+     * @return  Pointer to the parent UMLListViewItem for the diagram.
      */
     UMLListViewItem *findFolderForDiagram(Uml::Diagram_Type dt);
 
     /**
-     * Determine the tqparent ListViewItem given an UMLObject.
+     * Determine the parent ListViewItem given an UMLObject.
      *
-     * @param object   Pointer to the UMLObject for which to look up the tqparent.
-     * @return    Pointer to the tqparent UMLListViewItem chosen.
-     *            Returns NULL on error (no tqparent could be determined.)
+     * @param object   Pointer to the UMLObject for which to look up the parent.
+     * @return    Pointer to the parent UMLListViewItem chosen.
+     *            Returns NULL on error (no parent could be determined.)
      */
     UMLListViewItem* determineParentItem(UMLObject* object) const;
 
     /**
-     * Determine the tqparent ListViewItem given a ListView_Type.
-     * This tqparent is used for creating new UMLListViewItems.
+     * Determine the parent ListViewItem given a ListView_Type.
+     * This parent is used for creating new UMLListViewItems.
      *
-     * @param lvt       The ListView_Type for which to lookup the tqparent.
-     * @return  Pointer to the tqparent UMLListViewItem chosen.
+     * @param lvt       The ListView_Type for which to lookup the parent.
+     * @return  Pointer to the parent UMLListViewItem chosen.
      */
     UMLListViewItem* determineParentItem(Uml::ListView_Type lvt) const;
 
@@ -169,11 +169,11 @@ public:
     }
 
     /**
-     * Adds a new item to the tree of the given type under the given tqparent.
+     * Adds a new item to the tree of the given type under the given parent.
      * Method will take care of signalling anyone needed on creation of new item.
      * e.g. UMLDoc if an UMLObject is created.
      */
-    void addNewItem(UMLListViewItem * tqparent, Uml::ListView_Type type);
+    void addNewItem(UMLListViewItem * parent, Uml::ListView_Type type);
 
     /**
      * Find an UMLObject in the listview.
@@ -260,7 +260,7 @@ public:
 
     /**
      * Moves an object given is unique ID and listview type to an
-     * other listview tqparent item.
+     * other listview parent item.
      * Also takes care of the corresponding move in the model.
      */
     UMLListViewItem * moveObject(Uml::IDType srcId, Uml::ListView_Type srcType,
@@ -286,7 +286,7 @@ public:
      * predefined root views (Root, Logical, UseCase, Component,
      * Deployment, EntityRelationship.) Returns the ListView_Type
      * of the matching root view; if no match then continues the
-     * search using the item's tqparent, then grandtqparent, and so forth.
+     * search using the item's parent, then grandparent, and so forth.
      * Returns Uml::lvt_Unknown if no match at all is found.
      */
     Uml::ListView_Type rootViewType(UMLListViewItem *item);
@@ -295,7 +295,7 @@ public:
 
     bool loadFromXMI( TQDomElement & element );
 
-    bool loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement & element );
+    bool loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & element );
 
 protected:
     UMLListViewItem* m_rv;    // root view (home)
@@ -343,9 +343,9 @@ protected:
     void loadPixmaps();
 
     /**
-     * Deletes all child-items of @p tqparent.
+     * Deletes all child-items of @p parent.
      */
-    void deleteChildrenOf( TQListViewItem *tqparent );
+    void deleteChildrenOf( TQListViewItem *parent );
 
     /**
      * Delete a listview item.
@@ -357,18 +357,18 @@ protected:
 
     /**
      * Adds a new operation, attribute or template item to a classifier, identical to
-     * childObjectAdded(obj) but with an explicit tqparent.
+     * childObjectAdded(obj) but with an explicit parent.
      * @param child the child object
-     * @param tqparent the tqparent object
+     * @param parent the parent object
      */
-    void childObjectAdded(UMLClassifierListItem* child, UMLClassifier* tqparent);
+    void childObjectAdded(UMLClassifierListItem* child, UMLClassifier* parent);
 
     /**
      * Auxiliary method for moveObject(): Adds the model object at the proper
      * new container (package if nested, UMLDoc if at global level), and
      * updates the containment relationships in the model.
      */
-    void addAtContainer(UMLListViewItem *item, UMLListViewItem *tqparent);
+    void addAtContainer(UMLListViewItem *item, UMLListViewItem *parent);
 
 public slots:
 
@@ -433,7 +433,7 @@ public slots:
     /**
      * Something has been dragged and dropped onto the list view
      */
-    void slotDropped(TQDropEvent* de, TQListViewItem* tqparent, TQListViewItem* item);
+    void slotDropped(TQDropEvent* de, TQListViewItem* parent, TQListViewItem* item);
 
     /**
      * calls updateFolder() on the item to update the icon to open
diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp
index e6b7e569..01680fde 100644
--- a/umbrello/umbrello/umllistviewitem.cpp
+++ b/umbrello/umbrello/umllistviewitem.cpp
@@ -39,10 +39,10 @@
 
 UMLListView* UMLListViewItem::s_pListView = 0;
 
-UMLListViewItem::UMLListViewItem( UMLListView * tqparent, const TQString &name,
+UMLListViewItem::UMLListViewItem( UMLListView * parent, const TQString &name,
                                   Uml::ListView_Type t, UMLObject* o)
-        : TQListViewItem(tqparent, name) {
-    init(tqparent);
+        : TQListViewItem(parent, name) {
+    init(parent);
     m_Type = t;
     m_pObject = o;
     if (o)
@@ -52,20 +52,20 @@ UMLListViewItem::UMLListViewItem( UMLListView * tqparent, const TQString &name,
     setRenameEnabled( 0, false );
 }
 
-UMLListViewItem::UMLListViewItem(UMLListView * tqparent)
-        : TQListViewItem(tqparent) {
-    init(tqparent);
-    if (tqparent == NULL)
-        kDebug() << "UMLListViewItem constructor called with a NULL listview tqparent" << endl;
+UMLListViewItem::UMLListViewItem(UMLListView * parent)
+        : TQListViewItem(parent) {
+    init(parent);
+    if (parent == NULL)
+        kDebug() << "UMLListViewItem constructor called with a NULL listview parent" << endl;
 }
 
-UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent)
-        : TQListViewItem(tqparent)  {
+UMLListViewItem::UMLListViewItem(UMLListViewItem * parent)
+        : TQListViewItem(parent)  {
     init();
 }
 
-UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t,UMLObject*o)
-        : TQListViewItem(tqparent, name) {
+UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t,UMLObject*o)
+        : TQListViewItem(parent, name) {
     init();
     m_Type = t;
     m_pObject = o;
@@ -75,7 +75,7 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &nam
     } else {
         UMLClassifierListItem *umlchild = dynamic_cast<UMLClassifierListItem*>(o);
         if (umlchild)
-            tqparent->addClassifierListItem(umlchild, this);
+            parent->addClassifierListItem(umlchild, this);
         updateObject();
         m_nId = o->getID();
     }
@@ -83,8 +83,8 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &nam
     setText( name );
 }
 
-UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t,Uml::IDType id)
-        : TQListViewItem(tqparent, name) {
+UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t,Uml::IDType id)
+        : TQListViewItem(parent, name) {
     init();
     m_Type = t;
     m_nId = id;
@@ -127,16 +127,16 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &nam
 
 UMLListViewItem::~UMLListViewItem() {}
 
-void UMLListViewItem::init(UMLListView * tqparent) {
+void UMLListViewItem::init(UMLListView * parent) {
     m_Type = Uml::lvt_Unknown;
     m_bCreating = false;
     m_pObject = NULL;
     m_nId = Uml::id_None;
     m_nChildren = 0;
-    if (s_pListView == NULL && tqparent != NULL) {
+    if (s_pListView == NULL && parent != NULL) {
         kDebug() << "UMLListViewItem::init: s_pListView still NULL, setting it now "
                   << endl;
-        s_pListView = tqparent;
+        s_pListView = parent;
     }
 }
 
@@ -182,7 +182,7 @@ bool UMLListViewItem::isOwnParent(Uml::IDType listViewItemID) {
             << ID2STR(listViewItemID) << ") returns NULL" << endl;
         return true;
     }
-    for (TQListViewItem *self = (TQListViewItem*)this; self; self = self->tqparent()) {
+    for (TQListViewItem *self = (TQListViewItem*)this; self; self = self->parent()) {
         if (lvi == self)
             return true;
     }
@@ -331,9 +331,9 @@ void UMLListViewItem::okRename( int col ) {
                 return;
             }
             UMLOperation *op = static_cast<UMLOperation*>(m_pObject);
-            UMLClassifier *tqparent = static_cast<UMLClassifier *>( op -> tqparent() );
+            UMLClassifier *parent = static_cast<UMLClassifier *>( op -> parent() );
             Model_Utils::OpDescriptor od;
-            Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, tqparent);
+            Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, parent);
             if (st == Model_Utils::PS_OK) {
                 // TODO: Check that no operation with the exact same profile exists.
                 op->setName( od.m_name );
@@ -382,13 +382,13 @@ void UMLListViewItem::okRename( int col ) {
                 cancelRenameWithMsg();
                 return;
             }
-            UMLClassifier *tqparent = static_cast<UMLClassifier*>(m_pObject->tqparent());
+            UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent());
             Model_Utils::NameAndType nt;
             Uml::Visibility vis;
             Model_Utils::Parse_tqStatus st;
-            st = Model_Utils::parseAttribute(newText, nt, tqparent, &vis);
+            st = Model_Utils::parseAttribute(newText, nt, parent, &vis);
             if (st == Model_Utils::PS_OK) {
-                UMLObject *exists = tqparent->findChildObject(newText);
+                UMLObject *exists = parent->findChildObject(newText);
                 if (exists) {
                     cancelRenameWithMsg();
                     return;
@@ -415,11 +415,11 @@ void UMLListViewItem::okRename( int col ) {
                 cancelRenameWithMsg();
                 return;
             }
-            UMLClassifier *tqparent = static_cast<UMLClassifier*>(m_pObject->tqparent());
+            UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent());
             Model_Utils::NameAndType nt;
-            Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, tqparent);
+            Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, parent);
             if (st == Model_Utils::PS_OK) {
-                UMLObject *exists = tqparent->findChildObject(newText);
+                UMLObject *exists = parent->findChildObject(newText);
                 if (exists) {
                     cancelRenameWithMsg();
                     return;
@@ -521,8 +521,8 @@ int UMLListViewItem::compare(TQListViewItem *other, int col, bool ascending) con
 #endif
         return retval;
     }
-    UMLClassifier *ourParent = dynamic_cast<UMLClassifier*>(m_pObject->tqparent());
-    UMLClassifier *otherParent = dynamic_cast<UMLClassifier*>(otherObj->tqparent());
+    UMLClassifier *ourParent = dynamic_cast<UMLClassifier*>(m_pObject->parent());
+    UMLClassifier *otherParent = dynamic_cast<UMLClassifier*>(otherObj->parent());
     if (ourParent == NULL) {
         retval = (subItem ? 1 : alphaOrder);
 #ifdef DEBUG_LVITEM_INSERTION_ORDER
diff --git a/umbrello/umbrello/umllistviewitem.h b/umbrello/umbrello/umllistviewitem.h
index 105b751e..596a93f5 100644
--- a/umbrello/umbrello/umllistviewitem.h
+++ b/umbrello/umbrello/umllistviewitem.h
@@ -38,46 +38,46 @@ public:
     /**
      * Sets up an instance.
      *
-     * @param tqparent    The tqparent to this instance.
+     * @param parent    The parent to this instance.
      * @param name              The name of this instance.
      * @param t         The type of this instance.
      * @param o         The object it represents.
      */
-    UMLListViewItem(UMLListView * tqparent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0);
+    UMLListViewItem(UMLListView * parent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0);
 
     /**
      * Sets up an instance for subsequent loadFromXMI().
      *
-     * @param tqparent    The tqparent to this instance.
+     * @param parent    The parent to this instance.
      */
-    UMLListViewItem(UMLListView * tqparent);
+    UMLListViewItem(UMLListView * parent);
 
     /**
      * Sets up an instance for subsequent loadFromXMI().
      *
-     * @param tqparent    The tqparent to this instance.
+     * @param parent    The parent to this instance.
      */
-    UMLListViewItem(UMLListViewItem * tqparent);
+    UMLListViewItem(UMLListViewItem * parent);
 
     /**
      * Sets up an instance.
      *
-     * @param tqparent    The tqparent to this instance.
+     * @param parent    The parent to this instance.
      * @param name              The name of this instance.
      * @param t         The type of this instance.
      * @param o         The object it represents.
      */
-    UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0);
+    UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0);
 
     /**
      * Sets up an instance.
      *
-     * @param tqparent    The tqparent to this instance.
+     * @param parent    The parent to this instance.
      * @param name              The name of this instance.
      * @param t         The type of this instance.
      * @param id                The id of this instance.
      */
-    UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t, Uml::IDType id);
+    UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t, Uml::IDType id);
 
     /**
      * Standard deconstructor.
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * Returns true if the UMLListViewItem of the given ID is a tqparent of
+     * Returns true if the UMLListViewItem of the given ID is a parent of
      * this UMLListViewItem.
      */
     bool isOwnParent(Uml::IDType listViewItemID);
@@ -199,7 +199,7 @@ public:
 
     /**
      * Create a deep copy of this UMLListViewItem, but using the
-     * given tqparent instead of the tqparent of this UMLListViewItem.
+     * given parent instead of the parent of this UMLListViewItem.
      * Return the new UMLListViewItem created.
      */
     UMLListViewItem* deepCopy(UMLListViewItem *newParent);
@@ -243,7 +243,7 @@ protected:
     /**
      * Initializes key variables of the class.
      */
-    void init(UMLListView * tqparent = 0);
+    void init(UMLListView * parent = 0);
 
     /**
      * This function is called if the user presses Enter during in-place renaming
diff --git a/umbrello/umbrello/umlobject.cpp b/umbrello/umbrello/umlobject.cpp
index b9a1b2d8..85de579f 100644
--- a/umbrello/umbrello/umlobject.cpp
+++ b/umbrello/umbrello/umlobject.cpp
@@ -30,8 +30,8 @@
 #include "docwindow.h"
 #include "dialogs/classpropdlg.h"
 
-UMLObject::UMLObject(const UMLObject * tqparent, const TQString &name, Uml::IDType id)
-        : TQObject(const_cast<UMLObject*>(tqparent), "UMLObject" ) {
+UMLObject::UMLObject(const UMLObject * parent, const TQString &name, Uml::IDType id)
+        : TQObject(const_cast<UMLObject*>(parent), "UMLObject" ) {
     init();
     if (id == Uml::id_None)
         m_nId = UniqueID::gen();
@@ -50,8 +50,8 @@ UMLObject::UMLObject(const TQString &name, Uml::IDType id)
     m_Name = name;
 }
 
-UMLObject::UMLObject(const UMLObject * tqparent)
-        : TQObject(const_cast<UMLObject*>(tqparent)) {
+UMLObject::UMLObject(const UMLObject * parent)
+        : TQObject(const_cast<UMLObject*>(parent)) {
     init();
 }
 
@@ -200,9 +200,9 @@ void UMLObject::copyInto(UMLObject *rhs) const
     // Create a new ID.
     rhs->m_nId = UniqueID::gen();
 
-    // Hope that the tqparent from TQObject is okay.
-    if (rhs->tqparent() != tqparent())
-        kDebug() << "copyInto has a wrong tqparent" << endl;
+    // Hope that the parent from TQObject is okay.
+    if (rhs->parent() != parent())
+        kDebug() << "copyInto has a wrong parent" << endl;
 }
 
 
@@ -721,7 +721,7 @@ bool UMLObject::loadFromXMI( TQDomElement & element) {
             m_BaseType != Uml::ot_Template && m_BaseType != Uml::ot_Stereotype &&
             m_BaseType != Uml::ot_Role) {
         if (m_bInPaste) {
-            m_pUMLPackage = NULL;  // forget any old tqparent
+            m_pUMLPackage = NULL;  // forget any old parent
             UMLListView *listView = UMLApp::app()->getListView();
             UMLListViewItem *parentItem = (UMLListViewItem*)listView->currentItem();
             if (parentItem) {
diff --git a/umbrello/umbrello/umlobject.h b/umbrello/umbrello/umlobject.h
index 727ec1d9..a0e02160 100644
--- a/umbrello/umbrello/umlobject.h
+++ b/umbrello/umbrello/umlobject.h
@@ -41,19 +41,19 @@ public:
     /**
      * Creates a UMLObject.
      *
-     * @param tqparent    The tqparent of the object.
+     * @param parent    The parent of the object.
      * @param name              The name of the object.
      * @param id                The ID of the object (optional.) If omitted
      *                  then a new ID will be assigned internally.
      */
-    UMLObject(const UMLObject * tqparent, const TQString &name, Uml::IDType id = Uml::id_None);
+    UMLObject(const UMLObject * parent, const TQString &name, Uml::IDType id = Uml::id_None);
 
     /**
      * Creates a UMLObject.
      *
-     * @param   tqparent          The tqparent of the object.
+     * @param   parent          The parent of the object.
      */
-    UMLObject(const UMLObject * tqparent);
+    UMLObject(const UMLObject * parent);
 
     /**
      * Creates a UMLObject with a given name and unique ID.
diff --git a/umbrello/umbrello/umlrole.cpp b/umbrello/umbrello/umlrole.cpp
index 939b7167..ca33dffb 100644
--- a/umbrello/umbrello/umlrole.cpp
+++ b/umbrello/umbrello/umlrole.cpp
@@ -23,10 +23,10 @@
 
 
 // constructor
-UMLRole::UMLRole(UMLAssociation * tqparent, UMLObject * parentObj, Uml::Role_Type role)
-        : UMLObject(const_cast<UMLAssociation*>(tqparent))
+UMLRole::UMLRole(UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type role)
+        : UMLObject(const_cast<UMLAssociation*>(parent))
 {
-    init(tqparent, parentObj, role);
+    init(parent, parentObj, role);
 }
 
 UMLRole::~UMLRole() { }
@@ -59,9 +59,9 @@ TQString UMLRole::getMultiplicity() const {
 }
 
 void UMLRole::setObject (UMLObject *obj) {
-    // because we will get the id of this role from the tqparent
+    // because we will get the id of this role from the parent
     // object, we CANT allow UMLRoles to take other UMLRoles as
-    // tqparent objects. In fact, there is probably good reason
+    // parent objects. In fact, there is probably good reason
     // to only take UMLClassifiers here, but I'll leave it more open
     // for the time being. -b.t.
     if (obj && dynamic_cast<UMLRole*>(obj)) {
@@ -88,17 +88,17 @@ Uml::Role_Type UMLRole::getRole() {
     return m_role;
 }
 
-void UMLRole::init(UMLAssociation * tqparent, UMLObject * parentObj, Uml::Role_Type r) {
+void UMLRole::init(UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type r) {
     m_BaseType = Uml::ot_Role;
     m_role = r;
-    m_pAssoc = tqparent;
+    m_pAssoc = parent;
     m_pSecondary = parentObj;
     m_Multi = "";
     m_Name = "";
     m_Changeability = Uml::chg_Changeable;
 
-    // connect this up to tqparent
-    connect(this,TQT_SIGNAL(modified()),tqparent,TQT_SIGNAL(modified()));
+    // connect this up to parent
+    connect(this,TQT_SIGNAL(modified()),parent,TQT_SIGNAL(modified()));
 }
 
 void UMLRole::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) {
@@ -110,7 +110,7 @@ void UMLRole::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) {
         << "): m_pSecondary is NULL" << endl;
     if (!m_Multi.isEmpty())
         roleElement.setAttribute("multiplicity", m_Multi);
-    if (m_role == Uml::A) {  // role aggregation based on tqparent type
+    if (m_role == Uml::A) {  // role aggregation based on parent type
         // role A
         switch (m_pAssoc->getAssocType()) {
         case Uml::at_Composition:
@@ -268,8 +268,8 @@ bool UMLRole::load( TQDomElement & element ) {
     // Here comes the handling of the association type.
     // This is open for discussion - I'm pretty sure there are better ways..
 
-    // Yeah, for one, setting the *tqparent* object parameters from here is sucky
-    // as hell. Why are we using roleA to store what is essentially a tqparent (association)
+    // Yeah, for one, setting the *parent* object parameters from here is sucky
+    // as hell. Why are we using roleA to store what is essentially a parent (association)
     // parameter, eh? The UML13.dtd is pretty silly, but since that is what
     // is driving us to that point, we have to go with it. Some analysis of
     // the component roles/linked items needs to be done in order to get things
diff --git a/umbrello/umbrello/umlrole.h b/umbrello/umbrello/umlrole.h
index 464e264e..57bacbb1 100644
--- a/umbrello/umbrello/umlrole.h
+++ b/umbrello/umbrello/umlrole.h
@@ -30,11 +30,11 @@ public:
     /**
      * Sets up an association.
      *
-     * @param tqparent    The tqparent (association) of this UMLRole.
+     * @param parent    The parent (association) of this UMLRole.
      * @param parentUMLObject The Parent UML Object of this UMLRole
      * @param role  The Uml::Role_Type of this UMLRole 
      */
-    UMLRole (UMLAssociation * tqparent, UMLObject * parentUMLObject, Uml::Role_Type role);
+    UMLRole (UMLAssociation * parent, UMLObject * parentUMLObject, Uml::Role_Type role);
 
     /**
      * Overloaded '==' operator
@@ -89,7 +89,7 @@ public:
 
     UMLAssociation * getParentAssociation ();
 
-    /** get the 'id' of the role (NOT the tqparent object). This could be
+    /** get the 'id' of the role (NOT the parent object). This could be
      * either Uml::A or Uml::B. Yes, it would be better if we
      * could get along without this, but we need it to distinguish saved
      * umlrole objects in the XMI for 'self' associations where both roles
@@ -118,7 +118,7 @@ protected:
 private:
 
     /** do some initialization at construction time */
-    void init (UMLAssociation * tqparent, UMLObject * parentObj, Uml::Role_Type r);
+    void init (UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type r);
 
     UMLAssociation * m_pAssoc;
     Uml::Role_Type m_role;
diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp
index 7054105d..a64b770c 100644
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@@ -1149,10 +1149,10 @@ bool UMLView::isSavedInSeparateFile() {
                   << "listView->findUMLObject(this) returns false" << endl;
         return false;
     }
-    UMLListViewItem *parentItem = dynamic_cast<UMLListViewItem*>( lvItem->tqparent() );
+    UMLListViewItem *parentItem = dynamic_cast<UMLListViewItem*>( lvItem->parent() );
     if (parentItem == NULL) {
         kError() << msgPrefix
-                  << "tqparent item in listview is not a UMLListViewItem (?)" << endl;
+                  << "parent item in listview is not a UMLListViewItem (?)" << endl;
         return false;
     }
     const Uml::ListView_Type lvt = parentItem->getType();
@@ -1161,7 +1161,7 @@ bool UMLView::isSavedInSeparateFile() {
     UMLFolder *modelFolder = dynamic_cast<UMLFolder*>(parentItem->getUMLObject());
     if (modelFolder == NULL) {
         kError() << msgPrefix
-                  << "tqparent model object is not a UMLFolder (?)" << endl;
+                  << "parent model object is not a UMLFolder (?)" << endl;
         return false;
     }
     TQString folderFile = modelFolder->getFolderFile();
@@ -1882,7 +1882,7 @@ void UMLView::updateContainment(UMLCanvasObject *self) {
     if (self == NULL)
         return;
     // See if the object has a widget representation in this view.
-    // While we're at it, also see if the new tqparent has a widget here.
+    // While we're at it, also see if the new parent has a widget here.
     UMLWidget *selfWidget = NULL, *newParentWidget = NULL;
     UMLPackage *newParent = self->getUMLPackage();
     for (UMLWidgetListIt wit(m_WidgetList); wit.current(); ++wit) {
@@ -2073,11 +2073,11 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) {
         }
     }
     // if the UMLCanvasObject has a parentPackage then
-    UMLPackage *tqparent = umlObj->getUMLPackage();
-    if (tqparent == NULL)
+    UMLPackage *parent = umlObj->getUMLPackage();
+    if (parent == NULL)
         return;
     // if the parentPackage has a widget representation on this view then
-    Uml::IDType pkgID = tqparent->getID();
+    Uml::IDType pkgID = parent->getID();
     UMLWidget *pWidget;
     UMLWidgetListIt wit(m_WidgetList);
     while ((pWidget = wit.current()) != NULL) {
diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp
index 0fab653a..a8de3637 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.cpp
+++ b/umbrello/umbrello/umlviewimageexportermodel.cpp
@@ -174,14 +174,14 @@ TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQSt
     UMLListView *listView = UMLApp::app()->getListView();
     UMLListViewItem* listViewItem = listView->findItem(view->getID());
     // skip the name of the first item because it's the View
-    listViewItem = static_cast<UMLListViewItem*>(listViewItem->tqparent());
+    listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent());
 
     // Relies on the tree structure of the UMLListView. There are a base "Views" folder
     // and five tqchildren, one for each view type (Logical, use case, components, deployment
     // and entity relationship)
     while (listView->rootView(listViewItem->getType()) == NULL) {
         name.insert(0, listViewItem->getText() + '/');
-        listViewItem = static_cast<UMLListViewItem*>(listViewItem->tqparent());
+        listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent());
         if (listViewItem == NULL)
             break;
     }
@@ -193,7 +193,7 @@ bool UMLViewImageExporterModel::prepareDirectory(const KURL &url) const {
     KURL directory = url;
     directory.setPath("");
 
-    // creates the directory and any needed tqparent directories
+    // creates the directory and any needed parent directories
     TQStringList dirs = TQStringList::split(TQDir::separator(), url.directory());
     for (TQStringList::ConstIterator it = dirs.begin() ; it != dirs.end(); ++it ) {
         directory.addPath(*it);
diff --git a/umbrello/umbrello/umlviewimageexportermodel.h b/umbrello/umbrello/umlviewimageexportermodel.h
index a7f0193d..5e1b7dd5 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.h
+++ b/umbrello/umbrello/umlviewimageexportermodel.h
@@ -129,11 +129,11 @@ private:
     /**
      * Returns the name of the file where the view will be exported to.
      * The name of the exported images will be like their view's name and using the
-     * 'imageType' as extension. It can also include the tqparent folders of the view.
+     * 'imageType' as extension. It can also include the parent folders of the view.
      *
      * The views are stored in folders in the document. The same tree structure used
      * in the document to store the views can be created with 'useFolders', so the file name
-     * will include recursively also its tqparent folders. Only the folders made by the user
+     * will include recursively also its parent folders. Only the folders made by the user
      * are included in the file name (Logical view, use case view and so on aren't created).
      *
      * @param view The view to export.
@@ -146,7 +146,7 @@ private:
 
     /**
      * Creates, if it doesn't exist, the directory to save the file.
-     * It also creates all the needed tqparent directories.
+     * It also creates all the needed parent directories.
      *
      * @param url The url where the image will be saved.
      * @return True if the operation was successful,
diff --git a/umbrello/umbrello/umlwidgetcontroller.h b/umbrello/umbrello/umlwidgetcontroller.h
index 032b3fbd..8b3e2091 100644
--- a/umbrello/umbrello/umlwidgetcontroller.h
+++ b/umbrello/umbrello/umlwidgetcontroller.h
@@ -186,7 +186,7 @@ protected:
      * size in m_oldW/H.
      *
      * It can be overridden to save subclass specific values whenever a move or
-     * resize begins. However, tqparent method (that is, this method) must be
+     * resize begins. However, parent method (that is, this method) must be
      * called in the overridden method.
      *
      * @param me The TQMouseEvent to get the offset from.
diff --git a/umbrello/umbrello/usecasewidget.h b/umbrello/umbrello/usecasewidget.h
index de330b62..65613d1e 100644
--- a/umbrello/umbrello/usecasewidget.h
+++ b/umbrello/umbrello/usecasewidget.h
@@ -41,7 +41,7 @@ public:
     /**
      *  Creates a UseCase widget.
      *
-     *  @param  view            The tqparent of the widget.
+     *  @param  view            The parent of the widget.
      *  @param  o               The UMLObject to represent.
      */
     UseCaseWidget(UMLView * view, UMLUseCase *o);
diff --git a/umbrello/umbrello/worktoolbar.h b/umbrello/umbrello/worktoolbar.h
index 410644d2..6893284b 100644
--- a/umbrello/umbrello/worktoolbar.h
+++ b/umbrello/umbrello/worktoolbar.h
@@ -47,7 +47,7 @@ public:
     /**
      * Creates a work tool bar.
      *
-     * @param parentWindow      The tqparent of the toolbar.
+     * @param parentWindow      The parent of the toolbar.
      */
     WorkToolBar(TQMainWindow *parentWindow, const char *name);
author	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
committer	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
commit	22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60 (patch)
tree	babc4a761925023e16fa94633959f35d1c251887 /umbrello/umbrello
parent	0813b39aed2cf4c84157a22c4c9594336d93d412 (diff)
download	tdesdk-22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60.tar.gz tdesdk-22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60.zip