From 9150603ad32928e9c514c0492a8518b742d82ac3 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 9 Jul 2011 02:23:29 +0000
Subject: Remove the tq in front of these incorrectly TQt4-converted
 methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...]
 tqmask[...] tqlayout[...] tqalignment[...]

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 umbrello/umbrello/aligntoolbar.cpp                 |  4 +-
 umbrello/umbrello/aligntoolbar.h                   |  4 +-
 umbrello/umbrello/autolayout/autolayout.h          | 12 +--
 umbrello/umbrello/autolayout/autolayoutdlg.cpp     | 56 +++++++-------
 umbrello/umbrello/autolayout/autolayoutdlg.h       |  8 +-
 umbrello/umbrello/autolayout/autolayouter.cpp      |  4 +-
 umbrello/umbrello/autolayout/autolayouter.h        |  4 +-
 .../umbrello/autolayout/autolayouteradapter.cpp    | 40 +++++-----
 umbrello/umbrello/autolayout/autolayouteradapter.h |  8 +-
 umbrello/umbrello/autolayout/dotautolayouter.cpp   | 10 +--
 umbrello/umbrello/autolayout/dotautolayouter.h     |  8 +-
 .../umbrello/autolayout/graphvizautolayouter.cpp   | 18 ++---
 .../umbrello/autolayout/graphvizautolayouter.h     |  8 +-
 umbrello/umbrello/autolayout/graphvizgraph.h       |  2 +-
 .../umbrello/autolayout/newautolayoutdialog.ui     |  2 +-
 umbrello/umbrello/classifier.cpp                   | 14 ++--
 umbrello/umbrello/classifiercodedocument.cpp       | 14 ++--
 umbrello/umbrello/classifiercodedocument.h         |  4 +-
 umbrello/umbrello/classifierlistitem.cpp           |  8 +-
 umbrello/umbrello/clipboard/umldrag.cpp            |  4 +-
 umbrello/umbrello/clipboard/umldrag.h              |  2 +-
 umbrello/umbrello/codeaccessormethod.cpp           | 14 ++--
 umbrello/umbrello/codeaccessormethod.h             |  4 +-
 umbrello/umbrello/codeclassfield.cpp               | 20 ++---
 umbrello/umbrello/codeclassfield.h                 |  6 +-
 .../umbrello/codeclassfielddeclarationblock.cpp    | 18 ++---
 umbrello/umbrello/codeclassfielddeclarationblock.h |  2 +-
 umbrello/umbrello/codegenerators/adawriter.cpp     |  4 +-
 umbrello/umbrello/codegenerators/aswriter.cpp      |  2 +-
 .../umbrello/codegenerators/cppcodeclassfield.cpp  | 12 +--
 .../umbrello/codegenerators/cppcodeclassfield.h    |  4 +-
 .../codegenerators/cppcodegenerationformbase.ui    |  2 +-
 .../cppheaderclassdeclarationblock.cpp             | 18 ++---
 .../cppheaderclassdeclarationblock.h               |  2 +-
 .../codegenerators/cppheadercodeaccessormethod.cpp | 12 +--
 .../cppheadercodeclassfielddeclarationblock.cpp    |  2 +-
 .../codegenerators/cppheadercodedocument.cpp       |  4 +-
 .../codegenerators/cppheadercodeoperation.cpp      |  4 +-
 .../codegenerators/cppsourcecodeaccessormethod.cpp | 10 +--
 .../codegenerators/cppsourcecodeoperation.cpp      |  4 +-
 umbrello/umbrello/codegenerators/csharpwriter.cpp  |  6 +-
 .../codegenerators/javaantcodedocument.cpp         |  2 +-
 .../codegenerators/javaclassdeclarationblock.cpp   | 24 +++---
 .../codegenerators/javaclassdeclarationblock.h     |  2 +-
 .../codegenerators/javaclassifiercodedocument.cpp  |  8 +-
 .../codegenerators/javacodeaccessormethod.cpp      |  6 +-
 .../umbrello/codegenerators/javacodeclassfield.cpp | 12 +--
 .../umbrello/codegenerators/javacodeclassfield.h   |  4 +-
 .../javacodeclassfielddeclarationblock.cpp         |  6 +-
 .../codegenerators/javacodegenerationformbase.ui   |  2 +-
 .../umbrello/codegenerators/javacodeoperation.cpp  |  2 +-
 umbrello/umbrello/codegenerators/php5writer.cpp    |  4 +-
 umbrello/umbrello/codegenerators/phpwriter.cpp     |  4 +-
 .../codegenerators/rubyclassdeclarationblock.cpp   | 20 ++---
 .../codegenerators/rubyclassdeclarationblock.h     |  2 +-
 .../codegenerators/rubyclassifiercodedocument.cpp  |  6 +-
 .../codegenerators/rubycodeaccessormethod.cpp      |  6 +-
 .../umbrello/codegenerators/rubycodeclassfield.cpp | 12 +--
 .../umbrello/codegenerators/rubycodeclassfield.h   |  4 +-
 .../rubycodeclassfielddeclarationblock.cpp         |  6 +-
 .../codegenerators/rubycodegenerationformbase.ui   |  2 +-
 .../umbrello/codegenerators/rubycodeoperation.cpp  |  2 +-
 .../codegenerators/simplecodegenerator.cpp         | 10 +--
 .../codegenerators/xmlelementcodeblock.cpp         | 10 +--
 .../umbrello/codegenerators/xmlelementcodeblock.h  |  2 +-
 umbrello/umbrello/codegenobjectwithtextblocks.cpp  |  8 +-
 umbrello/umbrello/codeimport/adaimport.cpp         |  6 +-
 umbrello/umbrello/codeimport/import_utils.cpp      | 42 +++++-----
 umbrello/umbrello/codeimport/import_utils.h        | 10 +--
 umbrello/umbrello/codeimport/javaimport.cpp        |  6 +-
 umbrello/umbrello/codemethodblock.cpp              |  4 +-
 umbrello/umbrello/codemethodblock.h                |  2 +-
 umbrello/umbrello/codeoperation.cpp                | 14 ++--
 umbrello/umbrello/codeoperation.h                  |  2 +-
 umbrello/umbrello/codeparameter.cpp                | 12 +--
 umbrello/umbrello/codeparameter.h                  |  2 +-
 umbrello/umbrello/dialogs/codeeditor.cpp           | 80 +++++++++----------
 umbrello/umbrello/dialogs/codeeditor.h             |  4 +-
 .../umbrello/dialogs/codegenerationoptionsbase.ui  |  2 +-
 .../umbrello/dialogs/codegenerationpolicybase.ui   |  2 +-
 .../umbrello/dialogs/codegenerationwizardbase.ui   |  2 +-
 umbrello/umbrello/dialogs/codeviewerdialog.h       |  2 +-
 umbrello/umbrello/dialogs/codeviewerdialogbase.ui  |  2 +-
 umbrello/umbrello/dialogs/codevieweroptionsbase.ui |  2 +-
 umbrello/umbrello/dialogs/diagrampropertiespage.ui |  2 +-
 .../umbrello/dialogs/exportallviewsdialogbase.ui   |  2 +-
 umbrello/umbrello/dialogs/settingsdlg.cpp          |  2 +-
 umbrello/umbrello/dialogs/umlrolepropertiesbase.ui |  2 +-
 umbrello/umbrello/folder.cpp                       |  2 +-
 umbrello/umbrello/import_rose.cpp                  | 20 ++---
 umbrello/umbrello/kplayerslideraction.cpp          |  4 +-
 umbrello/umbrello/kplayerslideraction.h            |  4 +-
 umbrello/umbrello/model_utils.cpp                  | 10 +--
 umbrello/umbrello/model_utils.h                    |  4 +-
 umbrello/umbrello/object_factory.cpp               | 30 ++++----
 umbrello/umbrello/object_factory.h                 |  4 +-
 umbrello/umbrello/ownedcodeblock.cpp               |  8 +-
 umbrello/umbrello/ownedhierarchicalcodeblock.cpp   |  2 +-
 umbrello/umbrello/ownedhierarchicalcodeblock.h     |  2 +-
 umbrello/umbrello/petaltree2uml.cpp                | 12 +--
 .../umbrello/refactoring/refactoringassistant.cpp  | 34 ++++----
 umbrello/umbrello/uml.cpp                          |  4 +-
 umbrello/umbrello/uml.h                            |  2 +-
 umbrello/umbrello/umldoc.cpp                       | 14 ++--
 umbrello/umbrello/umllistview.cpp                  | 90 +++++++++++-----------
 umbrello/umbrello/umlobject.cpp                    |  8 +-
 umbrello/umbrello/umlrole.cpp                      |  8 +-
 umbrello/umbrello/umlrole.h                        |  6 +-
 umbrello/umbrello/umlview.cpp                      | 20 ++---
 umbrello/umbrello/umlview.h                        |  2 +-
 umbrello/umbrello/widget_factory.cpp               |  4 +-
 umbrello/umbrello/worktoolbar.cpp                  |  4 +-
 umbrello/umbrello/worktoolbar.h                    |  4 +-
 113 files changed, 528 insertions(+), 528 deletions(-)

(limited to 'umbrello')

diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp
index aa62f500..2ac38d4e 100644
--- a/umbrello/umbrello/aligntoolbar.cpp
+++ b/umbrello/umbrello/aligntoolbar.cpp
@@ -31,8 +31,8 @@
 #include "umlwidget.h"
 #include "umlwidgetlist.h"
 
-AlignToolBar::AlignToolBar(TQMainWindow* tqparentWindow, const char* )
-        : KToolBar(tqparentWindow,TQt::DockRight,false) {
+AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* )
+        : KToolBar(parentWindow,TQt::DockRight,false) {
     // load images for the buttons
     loadPixmaps();
 
diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h
index 297b0a8a..4e515489 100644
--- a/umbrello/umbrello/aligntoolbar.h
+++ b/umbrello/umbrello/aligntoolbar.h
@@ -36,10 +36,10 @@ public:
     /**
      * Creates a bar with tools for tqalignment.
      *
-     * @param tqparentWindow      The tqparent of the toolbar.
+     * @param parentWindow      The tqparent of the toolbar.
      * @param name              The name of the toolbar.
      */
-    AlignToolBar(TQMainWindow* tqparentWindow, const char* name);
+    AlignToolBar(TQMainWindow* parentWindow, const char* name);
 
     /**
      * Standard deconstructor.
diff --git a/umbrello/umbrello/autolayout/autolayout.h b/umbrello/umbrello/autolayout/autolayout.h
index fecb2c6f..9f34a1d8 100644
--- a/umbrello/umbrello/autolayout/autolayout.h
+++ b/umbrello/umbrello/autolayout/autolayout.h
@@ -31,12 +31,12 @@
 
 
 
-#include "autotqlayouter.h"
-#include "autotqlayouteradapter.h"
-#include "graphvizautotqlayouter.h"
-#include "dotautotqlayouter.h"
-#include "circoautotqlayouter.h"
-#include "neatoautotqlayouter.h"
+#include "autolayouter.h"
+#include "autolayouteradapter.h"
+#include "graphvizautolayouter.h"
+#include "dotautolayouter.h"
+#include "circoautolayouter.h"
+#include "neatoautolayouter.h"
 
 
 
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index 61bf16b6..7df110fb 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -9,18 +9,18 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "autotqlayoutdlg.h"
+#include "autolayoutdlg.h"
 #include "../associationwidget.h"
 #include "../umlwidget.h"
 #include "autotqlayout.h"
-#include "newautotqlayoutdialog.h"
+#include "newautolayoutdialog.h"
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 #include <tqslider.h>
 #include <kdebug.h>
 
 
-AutotqlayoutDlg::AutotqlayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const char *name)
+AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const char *name)
         :MyDialog1(tqparent, name)
 {
     view=v;
@@ -28,81 +28,81 @@ AutotqlayoutDlg::AutotqlayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const
     config=c;
 }
 
-void AutotqlayoutDlg::slotSetAssociationWeight(int i)
+void AutolayoutDlg::slotSetAssociationWeight(int i)
 {
     associationWeight=i;
 }
 
 
-void AutotqlayoutDlg::slotSetDependenciesWeight(int i)
+void AutolayoutDlg::slotSetDependenciesWeight(int i)
 {
     dependenciesWeight=i;
 }
 
 
-void AutotqlayoutDlg::slotSetGeneralizationWeight(int i)
+void AutolayoutDlg::slotSetGeneralizationWeight(int i)
 {
     generalizationWeight=i;
 }
-void AutotqlayoutDlg::slotSetGenralizationAsEdges(bool b)
+void AutolayoutDlg::slotSetGenralizationAsEdges(bool b)
 {
     genralizationAsEdges=b;
 }
 
 
-void AutotqlayoutDlg::slotSetDependenciesAsEdges(bool b)
+void AutolayoutDlg::slotSetDependenciesAsEdges(bool b)
 {
     dependenciesAsEdges=b;
 }
 
 
-void AutotqlayoutDlg::slotSetAssociationAsEdges(bool b)
+void AutolayoutDlg::slotSetAssociationAsEdges(bool b)
 {
     associationAsEdges=b;
 }
 
 
 
-void AutotqlayoutDlg::slotSetCompressShapes(bool b)
+void AutolayoutDlg::slotSetCompressShapes(bool b)
 {
     compressShapes=b;
 }
 
 
-void AutotqlayoutDlg::slotSetCenterDiagram(bool b)
+void AutolayoutDlg::slotSetCenterDiagram(bool b)
 {
     centerDiagram=b;
 }
 
 
-void AutotqlayoutDlg::slotSetClusterizeHierarchies(bool b)
+void AutolayoutDlg::slotSetClusterizeHierarchies(bool b)
 
 {
     clusterizeHierarchies=b;
 }
 
 
-void AutotqlayoutDlg::slotSetShapeSeparation(int i)
+void AutolayoutDlg::slotSetShapeSeparation(int i)
 {
     tqshapeSeparation=i;
 }
 
-void AutotqlayoutDlg::slotReloadSettings()
+void AutolayoutDlg::slotReloadSettings()
 {
     readConfig(config);
 }
 
 
-void AutotqlayoutDlg::slotSaveSettings()
+void AutolayoutDlg::slotSaveSettings()
 {
     writeConfig(config);
 }
 
 
-void AutotqlayoutDlg::slotDoAutotqlayout()
+void AutolayoutDlg::slotDoAutotqlayout()
 {
 
-    Autotqlayout::Autotqlayouter* a=getAutotqlayouter();;
+    Autotqlayout::Autolayouter* a=getAutolayouter();;
 
     a->setAssociationAsEdges( associationAsEdges);
     a->setAssociationWeight( associationWeight );
@@ -122,9 +122,9 @@ void AutotqlayoutDlg::slotDoAutotqlayout()
     accept();
 }
 
-void AutotqlayoutDlg::readConfig( KConfig * conf)
+void AutolayoutDlg::readConfig( KConfig * conf)
 {
-    conf->setGroup("AutotqlayoutDlg");
+    conf->setGroup("AutolayoutDlg");
     associationEdgesCB->setChecked((bool)(conf->readBoolEntry( "associationAsEdges",false)));
     centerDiagramCB->setChecked((bool)(conf->readBoolEntry( "centerDiagram",true)));
     dependenciesEdgesCB->setChecked((bool)(conf->readBoolEntry( "dependenciesAsEdges",false)));
@@ -138,10 +138,10 @@ void AutotqlayoutDlg::readConfig( KConfig * conf)
     algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0)));
 }
 
-void AutotqlayoutDlg::writeConfig( KConfig * conf)
+void AutolayoutDlg::writeConfig( KConfig * conf)
 {
     //  conf=kapp->config();
-    conf->setGroup("AutotqlayoutDlg");
+    conf->setGroup("AutolayoutDlg");
     conf->writeEntry( "associationAsEdges",associationEdgesCB->isChecked());
     conf->writeEntry( "centerDiagram", centerDiagramCB->isChecked());
     conf->writeEntry("dependenciesAsEdges",dependenciesEdgesCB->isChecked());
@@ -159,26 +159,26 @@ void AutotqlayoutDlg::writeConfig( KConfig * conf)
 
 }
 
-void AutotqlayoutDlg::slotSelectAlgorithm( const TQString& _algname)
+void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname)
 {
     algname=_algname;
 
 }
 
-Autotqlayout::Autotqlayouter * AutotqlayoutDlg::getAutotqlayouter( )
+Autotqlayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
 {
     const TQString text = algorithmCOB->currentText();
     kDebug() << "Autotqlayout Algorithm " << algname << " found " << text << endl;
     if (text == "dot")
-        return new Autotqlayout::DotAutotqlayouter();
+        return new Autotqlayout::DotAutolayouter();
     if (text == "circo")
-        return new Autotqlayout::CircoAutotqlayouter();
+        return new Autotqlayout::CircoAutolayouter();
     if (text ==  "neato")
-        return new Autotqlayout::NeatoAutotqlayouter();
+        return new Autotqlayout::NeatoAutolayouter();
     kError() << "Autotqlayout Algorithm not found" << endl;
-    return new Autotqlayout::DotAutotqlayouter();
+    return new Autotqlayout::DotAutolayouter();
 }
 
 
 
-#include "autotqlayoutdlg.moc"
+#include "autolayoutdlg.moc"
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index a664a7b7..ece6fc5f 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -12,18 +12,18 @@
 #ifndef AUTOLAYOUTDLG_H
 #define AUTOLAYOUTDLG_H
 
-#include "newautotqlayoutdialog.h"
+#include "newautolayoutdialog.h"
 #include "../umlview.h"
 #include <tqobject.h>
 #include <kconfig.h>
 #include "autotqlayout.h"
 
-class AutotqlayoutDlg : public MyDialog1
+class AutolayoutDlg : public MyDialog1
 {
     Q_OBJECT
   TQ_OBJECT
   public:
-    AutotqlayoutDlg(KConfig* c,UMLView* v, TQWidget *tqparent = 0, const char *name = 0);
+    AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *tqparent = 0, const char *name = 0);
   public slots:
     virtual void slotSetAssociationWeight(int i);
     virtual void slotSetDependenciesWeight(int i);
@@ -57,7 +57,7 @@ class AutotqlayoutDlg : public MyDialog1
     int tqshapeSeparation;
     KConfig* config;
     TQString algname;
-    Autotqlayout::Autotqlayouter* getAutotqlayouter();
+    Autotqlayout::Autolayouter* getAutolayouter();
 
 };
 
diff --git a/umbrello/umbrello/autolayout/autolayouter.cpp b/umbrello/umbrello/autolayout/autolayouter.cpp
index caf852b7..802bc438 100644
--- a/umbrello/umbrello/autolayout/autolayouter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouter.cpp
@@ -11,13 +11,13 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include "autotqlayouter.h"
+#include "autolayouter.h"
 
 namespace Autotqlayout {
 
 
 
-void Autotqlayouter::autotqlayout( UMLView * v )
+void Autolayouter::autotqlayout( UMLView * v )
 {
     setCanvas(v);
     setGraph(v);
diff --git a/umbrello/umbrello/autolayout/autolayouter.h b/umbrello/umbrello/autolayout/autolayouter.h
index 40a24235..5d4645f9 100644
--- a/umbrello/umbrello/autolayout/autolayouter.h
+++ b/umbrello/umbrello/autolayout/autolayouter.h
@@ -21,9 +21,9 @@ This is the super class of any class which encapsulate an autotqlayout algorithm
 
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class Autotqlayouter {
+class Autolayouter {
 public:
-    virtual ~Autotqlayouter() {}
+    virtual ~Autolayouter() {}
 
     virtual void setNoteConnectionWeight(int i)=0;
     virtual void setNoteConnectionsAsEdges(bool b)=0;
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
index 0bba19c7..3a245cbc 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
@@ -9,21 +9,21 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "autotqlayouteradapter.h"
+#include "autolayouteradapter.h"
 
 
 namespace Autotqlayout
   {
 
-  AutotqlayouterAdapter::AutotqlayouterAdapter()
-      : Autotqlayout::Autotqlayouter()
+  AutolayouterAdapter::AutolayouterAdapter()
+      : Autotqlayout::Autolayouter()
     {}
 
 
-  AutotqlayouterAdapter::~AutotqlayouterAdapter()
+  AutolayouterAdapter::~AutolayouterAdapter()
   {}}
 
-void Autotqlayout::AutotqlayouterAdapter::addRelationship( AssociationWidget * a )
+void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
   {
   int weight;
   switch (a->getAssocType())
@@ -71,57 +71,57 @@ void Autotqlayout::AutotqlayouterAdapter::addRelationship( AssociationWidget * a
   getGraph()->addEdge(a->getWidgetID(Uml::A).c_str(),a->getWidgetID(Uml::B).c_str(),weight);
   }
 
-void Autotqlayout::AutotqlayouterAdapter::setAssociationWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setAssociationWeight( int i )
   {
   associationWeight=i;
   }
 
-void Autotqlayout::AutotqlayouterAdapter::setDependenciesWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setDependenciesWeight( int i )
   {
   dependenciesWeight=i;
   }
 
-void Autotqlayout::AutotqlayouterAdapter::setGeneralizationWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setGeneralizationWeight( int i )
   {
   generalizationWeight=i;
   }
 
-void Autotqlayout::AutotqlayouterAdapter::setGeneralizationAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
   {
   genralizationAsEdges=b;
   }
 
-void Autotqlayout::AutotqlayouterAdapter::setDependenciesAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
   {
   dependenciesAsEdges=b;
   }
 
-void Autotqlayout::AutotqlayouterAdapter::setAssociationAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
   {
   associationAsEdges=b;
   }
 
-void Autotqlayout::AutotqlayouterAdapter::setCompressShapes( bool b )
+void Autotqlayout::AutolayouterAdapter::setCompressShapes( bool b )
   {
   compressShapes=b;
   }
 
-void Autotqlayout::AutotqlayouterAdapter::setCenterDiagram( bool b )
+void Autotqlayout::AutolayouterAdapter::setCenterDiagram( bool b )
   {
   centerDiagram=b;
   }
 
-void Autotqlayout::AutotqlayouterAdapter::setClusterizeHierarchies( bool b )
+void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
   {
   clusterizeHierarchies=b;
   }
 
-void Autotqlayout::AutotqlayouterAdapter::setShapeSeparation( int i )
+void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i )
   {
   tqshapeSeparation=i;
   }
 
-Autotqlayout::Graph  * Autotqlayout::AutotqlayouterAdapter::setGraph( UMLView * view )
+Autotqlayout::Graph  * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view )
   {
   if (! view) return 0;
   Autotqlayout::Graph * g=getGraph();
@@ -151,7 +151,7 @@ Autotqlayout::Graph  * Autotqlayout::AutotqlayouterAdapter::setGraph( UMLView *
   return g;
   }
 
-void Autotqlayout::AutotqlayouterAdapter::updateView( UMLView* view )
+void Autotqlayout::AutolayouterAdapter::updateView( UMLView* view )
   {
 if (! view) return ;
 UMLWidgetList list = view->getWidgetList();
@@ -175,17 +175,17 @@ UMLWidgetList list = view->getWidgetList();
       }
   }
 
-Autotqlayout::Canvas * Autotqlayout::AutotqlayouterAdapter::setCanvas( UMLView* view )
+Autotqlayout::Canvas * Autotqlayout::AutolayouterAdapter::setCanvas( UMLView* view )
   {
   return canvas=new Autotqlayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
   }
 
-void Autotqlayout::AutotqlayouterAdapter::setNoteConnectionWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
 {
 noteConnectionWeight=i;
 }
 
-void Autotqlayout::AutotqlayouterAdapter::setNoteConnectionsAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
 {
 noteConnectionAsEdges=b;
 }
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h
index 0d8e9021..1d05f0d2 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.h
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.h
@@ -13,7 +13,7 @@
 #define AUTOLAYOUTAUTOLAYOUTERADAPTER_H
 //#include "autotqlayout.h"
 #include "baseinclude.h"
-#include "autotqlayouter.h"
+#include "autolayouter.h"
 #include "../umlnamespace.h"
 
 
@@ -23,12 +23,12 @@ namespace Autotqlayout
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class AutotqlayouterAdapter : virtual public Autotqlayout::Autotqlayouter
+class AutolayouterAdapter : virtual public Autotqlayout::Autolayouter
 {
 public:
-    AutotqlayouterAdapter();
+    AutolayouterAdapter();
 
-    virtual ~AutotqlayouterAdapter();
+    virtual ~AutolayouterAdapter();
     virtual void setAssociationWeight(int i);
 
     virtual void setDependenciesWeight(int i);
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.cpp b/umbrello/umbrello/autolayout/dotautolayouter.cpp
index 20d5d34c..dea9b554 100644
--- a/umbrello/umbrello/autolayout/dotautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/dotautolayouter.cpp
@@ -11,25 +11,25 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include "dotautotqlayouter.h"
+#include "dotautolayouter.h"
 
 #include <graphviz/dotprocs.h>
 
 namespace Autotqlayout {
 
-DotAutotqlayouter::DotAutotqlayouter()
-        : Autotqlayout::GraphvizAutotqlayouter()
+DotAutolayouter::DotAutolayouter()
+        : Autotqlayout::GraphvizAutolayouter()
 {
 }
 
 
-DotAutotqlayouter::~DotAutotqlayouter()
+DotAutolayouter::~DotAutolayouter()
 {
     dot_cleanup(gg->_agraph);
 }
 
 
-void DotAutotqlayouter::run()
+void DotAutolayouter::run()
 {
     //#ifndef internal_renderizer
     /* bind graph to GV context - currently must be done before tqlayout */
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.h b/umbrello/umbrello/autolayout/dotautolayouter.h
index 1ccb4bcc..4b8af212 100644
--- a/umbrello/umbrello/autolayout/dotautolayouter.h
+++ b/umbrello/umbrello/autolayout/dotautolayouter.h
@@ -15,19 +15,19 @@
 #ifndef AUTOLAYOUTDOTAUTOLAYOUTER_H
 #define AUTOLAYOUTDOTAUTOLAYOUTER_H
 #include "baseinclude.h"
-#include "graphvizautotqlayouter.h"
+#include "graphvizautolayouter.h"
 
 namespace Autotqlayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class DotAutotqlayouter : virtual public Autotqlayout::GraphvizAutotqlayouter
+class DotAutolayouter : virtual public Autotqlayout::GraphvizAutolayouter
 {
 public:
-    DotAutotqlayouter();
+    DotAutolayouter();
 
-    virtual ~DotAutotqlayouter();
+    virtual ~DotAutolayouter();
 
     virtual void run();
 
diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
index b8fe49d1..da075642 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
@@ -11,42 +11,42 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include "graphvizautotqlayouter.h"
+#include "graphvizautolayouter.h"
 
 #include <graphviz/graph.h>
 
 namespace Autotqlayout {
 
-GraphvizAutotqlayouter::GraphvizAutotqlayouter()
-        : Autotqlayout::AutotqlayouterAdapter()
+GraphvizAutolayouter::GraphvizAutolayouter()
+        : Autotqlayout::AutolayouterAdapter()
 {
     gg = new GraphvizGraph();
 }
 
-GraphvizAutotqlayouter::~GraphvizAutotqlayouter()
+GraphvizAutolayouter::~GraphvizAutolayouter()
 {
     agclose(gg->_agraph);
     delete gg;
 }
 
-void GraphvizAutotqlayouter::setCompressShapes( bool b )
+void GraphvizAutolayouter::setCompressShapes( bool b )
 {
     gg->setCompressShapes(b);
 }
 
-void GraphvizAutotqlayouter::setCenterDiagram( bool b )
+void GraphvizAutolayouter::setCenterDiagram( bool b )
 {
     gg->setCenterDiagram(b);
 }
 
-void GraphvizAutotqlayouter::setShapeSeparation( int i )
+void GraphvizAutolayouter::setShapeSeparation( int i )
 {
     gg->setShapeSeparation(i);
 }
 
-Autotqlayout::Canvas * GraphvizAutotqlayouter::setCanvas( UMLView * view )
+Autotqlayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view )
 {
-    Canvas* canvas= AutotqlayouterAdapter::setCanvas(view);
+    Canvas* canvas= AutolayouterAdapter::setCanvas(view);
     gg->setCanvas(canvas);
 }
 
diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.h b/umbrello/umbrello/autolayout/graphvizautolayouter.h
index a2036749..95fa46ba 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.h
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.h
@@ -12,7 +12,7 @@
 #ifndef AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H
 #define AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H
 #include "baseinclude.h"
-#include "autotqlayouteradapter.h"
+#include "autolayouteradapter.h"
 #include "graphvizgraph.h"
 
 namespace Autotqlayout
@@ -21,10 +21,10 @@ namespace Autotqlayout
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizAutotqlayouter : virtual public Autotqlayout::AutotqlayouterAdapter
+class GraphvizAutolayouter : virtual public Autotqlayout::AutolayouterAdapter
 {
 public:
-    GraphvizAutotqlayouter();
+    GraphvizAutolayouter();
 
 
     virtual void setCompressShapes(bool b);
@@ -35,7 +35,7 @@ public:
 
     virtual Canvas* setCanvas(UMLView* view);
 
-    virtual ~GraphvizAutotqlayouter();
+    virtual ~GraphvizAutolayouter();
 
 protected:
     virtual Graph* getGraph(){if (!gg) gg=new GraphvizGraph(); return gg;}
diff --git a/umbrello/umbrello/autolayout/graphvizgraph.h b/umbrello/umbrello/autolayout/graphvizgraph.h
index 96ae6c31..1be57139 100644
--- a/umbrello/umbrello/autolayout/graphvizgraph.h
+++ b/umbrello/umbrello/autolayout/graphvizgraph.h
@@ -50,7 +50,7 @@ public:
     std::deque<Node*> nodelist;
     GVC_t* gvc;
     bool empty_flag;
-    friend class GraphvizAutotqlayouter;
+    friend class GraphvizAutolayouter;
 };
 
 }
diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
index 459f0e25..9301abe3 100644
--- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui
+++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
@@ -550,5 +550,5 @@
     <slot>slotSetShapeSeparation(int i)</slot>
     <slot specifier="pure virtual">slotSelectAlgorithm(const QString&amp;)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/classifier.cpp b/umbrello/umbrello/classifier.cpp
index b994097a..947590c1 100644
--- a/umbrello/umbrello/classifier.cpp
+++ b/umbrello/umbrello/classifier.cpp
@@ -392,13 +392,13 @@ UMLClassifierList UMLClassifier::findSuperClassConcepts (ClassifierType type) {
     UMLClassifierList list = getSuperClasses();
     UMLAssociationList rlist = getRealizations();
 
-    UMLClassifierList tqparentConcepts;
+    UMLClassifierList parentConcepts;
     Uml::IDType myID = getID();
     for (UMLClassifier *concept = list.first(); concept; concept = list.next())
     {
         if (type == ALL || (!concept->isInterface() && type == CLASS)
                 || (concept->isInterface() && type == INTERFACE))
-            tqparentConcepts.append(concept);
+            parentConcepts.append(concept);
     }
 
     for (UMLAssociation *a = rlist.first(); a; a = rlist.next())
@@ -409,12 +409,12 @@ UMLClassifierList UMLClassifier::findSuperClassConcepts (ClassifierType type) {
             UMLClassifier *concept = dynamic_cast<UMLClassifier*>(obj);
             if (concept && (type == ALL || (!concept->isInterface() && type == CLASS)
                             || (concept->isInterface() && type == INTERFACE))
-                        && (tqparentConcepts.tqfindRef(concept) == -1))
-                tqparentConcepts.append(concept);
+                        && (parentConcepts.tqfindRef(concept) == -1))
+                parentConcepts.append(concept);
         }
     }
 
-    return tqparentConcepts;
+    return parentConcepts;
 }
 
 bool UMLClassifier::operator==( UMLClassifier & rhs ) {
@@ -631,9 +631,9 @@ UMLOperationList UMLClassifier::getOpList(bool includeInherited) {
             ops.append(static_cast<UMLOperation*>(li));
     }
     if (includeInherited) {
-        UMLClassifierList tqparents = findSuperClassConcepts();
+        UMLClassifierList parents = findSuperClassConcepts();
         UMLClassifier *c;
-        for (UMLClassifierListIt pit(tqparents); (c = pit.current()) != NULL; ++pit) {
+        for (UMLClassifierListIt pit(parents); (c = pit.current()) != NULL; ++pit) {
             if (c == this) {
                 kError() << "UMLClassifier::getOpList: class " << c->getName()
                     << " is tqparent of itself ?!?" << endl;
diff --git a/umbrello/umbrello/classifiercodedocument.cpp b/umbrello/umbrello/classifiercodedocument.cpp
index 4f92dede..6ffca075 100644
--- a/umbrello/umbrello/classifiercodedocument.cpp
+++ b/umbrello/umbrello/classifiercodedocument.cpp
@@ -372,11 +372,11 @@ void ClassifierCodeDocument::declareClassFields (CodeClassFieldList & list ,
     }
 }
 
-bool ClassifierCodeDocument::tqparentIsClass() {
+bool ClassifierCodeDocument::parentIsClass() {
     return (m_parentclassifier->getBaseType() == Uml::ot_Class);
 }
 
-bool ClassifierCodeDocument::tqparentIsInterface() {
+bool ClassifierCodeDocument::parentIsInterface() {
     return (m_parentclassifier->getBaseType() == Uml::ot_Interface);
 }
 
@@ -396,7 +396,7 @@ void ClassifierCodeDocument::init (UMLClassifier * c )
     // initCodeClassFields(); // cant call here?..newCodeClassField is pure virtual
 
     // slots
-    if (tqparentIsClass())  {
+    if (parentIsClass())  {
         connect(c,TQT_SIGNAL(attributeAdded(UMLClassifierListItem*)),this,TQT_SLOT(addAttributeClassField(UMLClassifierListItem*)));
         connect(c,TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)),this,TQT_SLOT(removeAttributeClassField(UMLClassifierListItem*)));
     }
@@ -494,7 +494,7 @@ void ClassifierCodeDocument::initCodeClassFields ( ) {
 
     UMLClassifier * c = getParentClassifier();
     // first, do the code classifields that arise from attributes
-    if (tqparentIsClass()) {
+    if (parentIsClass()) {
         UMLAttributeList alist = c->getAttributeList();
         for(UMLAttribute * at = alist.first(); at; at = alist.next())
         {
@@ -635,7 +635,7 @@ void ClassifierCodeDocument::loadClassFieldsFromXMI( TQDomElement & elem) {
         TQString nodeName = childElem.tagName();
         if( nodeName == "codeclassfield")
         {
-            TQString id = childElem.attribute("tqparent_id","-1");
+            TQString id = childElem.attribute("parent_id","-1");
             int role_id = childElem.attribute("role_id","-1").toInt();
             CodeClassField * cf = findCodeClassFieldFromParentID(STR2ID(id), role_id);
             if(cf)
@@ -651,7 +651,7 @@ void ClassifierCodeDocument::loadClassFieldsFromXMI( TQDomElement & elem) {
                 m_classFieldMap.insert(cf->getParentObject(),cf);
 
             } else
-                kError()<<" LoadFromXMI: can't load classfield tqparent_id:"<<id<<" do you have a corrupt savefile?"<<endl;
+                kError()<<" LoadFromXMI: can't load classfield parent_id:"<<id<<" do you have a corrupt savefile?"<<endl;
         }
         node = childElem.nextSibling();
         childElem= node.toElement();
@@ -702,7 +702,7 @@ void ClassifierCodeDocument::setAttributesOnNode ( TQDomDocument & doc, TQDomEle
     CodeDocument::setAttributesOnNode(doc, docElement);
 
     // cache local attributes/fields
-    docElement.setAttribute("tqparent_class", ID2STR(getParentClassifier()->getID()));
+    docElement.setAttribute("parent_class", ID2STR(getParentClassifier()->getID()));
 
     // (code) class fields
     // which we will store in its own separate child node block
diff --git a/umbrello/umbrello/classifiercodedocument.h b/umbrello/umbrello/classifiercodedocument.h
index f142cade..33aed6ad 100644
--- a/umbrello/umbrello/classifiercodedocument.h
+++ b/umbrello/umbrello/classifiercodedocument.h
@@ -81,12 +81,12 @@ public:
     /**
      * Return if the tqparent classifier is an interface
      */
-    bool tqparentIsInterface();
+    bool parentIsInterface();
 
     /**
      * Return if the tqparent classifier is a class
      */
-    bool tqparentIsClass();
+    bool parentIsClass();
 
     /**
      * Tell if one or more codeclassfields are derived from any kind of association.
diff --git a/umbrello/umbrello/classifierlistitem.cpp b/umbrello/umbrello/classifierlistitem.cpp
index 933d9d59..3025353a 100644
--- a/umbrello/umbrello/classifierlistitem.cpp
+++ b/umbrello/umbrello/classifierlistitem.cpp
@@ -26,16 +26,16 @@
 UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent,
                                              const TQString& name, Uml::IDType id)
         : UMLObject(tqparent, name, id) {
-    UMLObject *tqparentObj = const_cast<UMLObject*>(tqparent);
-    UMLClassifier *pc = dynamic_cast<UMLClassifier*>(tqparentObj);
+    UMLObject *parentObj = const_cast<UMLObject*>(tqparent);
+    UMLClassifier *pc = dynamic_cast<UMLClassifier*>(parentObj);
     if (pc)
         UMLObject::setUMLPackage(pc);
 }
 
 UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent)
         : UMLObject(tqparent) {
-    UMLObject *tqparentObj = const_cast<UMLObject*>(tqparent);
-    UMLClassifier *pc = dynamic_cast<UMLClassifier*>(tqparentObj);
+    UMLObject *parentObj = const_cast<UMLObject*>(tqparent);
+    UMLClassifier *pc = dynamic_cast<UMLClassifier*>(parentObj);
     if (pc)
         UMLObject::setUMLPackage(pc);
 }
diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp
index e7bd5d90..6fb0be93 100644
--- a/umbrello/umbrello/clipboard/umldrag.cpp
+++ b/umbrello/umbrello/clipboard/umldrag.cpp
@@ -539,7 +539,7 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource,
 }
 
 bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& umlListViewItems,
-                            const UMLListView* tqparentListView){
+                            const UMLListView* parentListView){
     if ( !mimeSource->provides("application/x-uml-clip3") ) {
         return false;
     }
@@ -584,7 +584,7 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u
             continue;
         }
         Uml::ListView_Type t = (Uml::ListView_Type)(type.toInt());
-        UMLListViewItem* tqparent = tqparentListView->determineParentItem(t);
+        UMLListViewItem* tqparent = parentListView->determineParentItem(t);
         UMLListViewItem* itemData = new UMLListViewItem(tqparent);
         if ( itemData->loadFromXMI(listItemElement) )
             umlListViewItems.append(itemData);
diff --git a/umbrello/umbrello/clipboard/umldrag.h b/umbrello/umbrello/clipboard/umldrag.h
index 315e3c98..ad5e4f02 100644
--- a/umbrello/umbrello/clipboard/umldrag.h
+++ b/umbrello/umbrello/clipboard/umldrag.h
@@ -175,7 +175,7 @@ public:
      */
     static bool decodeClip3(const TQMimeSource* mimeSource,
                             UMLListViewItemList& umlListViewItems,
-                            const UMLListView* tqparentListView=0);
+                            const UMLListView* parentListView=0);
 
     struct LvTypeAndID {
         Uml::ListView_Type type;
diff --git a/umbrello/umbrello/codeaccessormethod.cpp b/umbrello/umbrello/codeaccessormethod.cpp
index fab32f7c..938aa88f 100644
--- a/umbrello/umbrello/codeaccessormethod.cpp
+++ b/umbrello/umbrello/codeaccessormethod.cpp
@@ -30,10 +30,10 @@
 // Constructors/Destructors
 //
 
-CodeAccessorMethod::CodeAccessorMethod ( CodeClassField * tqparentCF )
-        : CodeMethodBlock ( tqparentCF->getParentDocument(), tqparentCF->getParentObject() )
+CodeAccessorMethod::CodeAccessorMethod ( CodeClassField * parentCF )
+        : CodeMethodBlock ( parentCF->getParentDocument(), parentCF->getParentObject() )
 {
-    initFields(tqparentCF);
+    initFields(parentCF);
 }
 
 CodeAccessorMethod::~CodeAccessorMethod ( ) { }
@@ -54,8 +54,8 @@ CodeClassField * CodeAccessorMethod::getParentClassField ( ) {
     return m_parentclassfield;
 }
 
-bool CodeAccessorMethod::tqparentIsAttribute( ) {
-    return getParentClassField()->tqparentIsAttribute();
+bool CodeAccessorMethod::parentIsAttribute( ) {
+    return getParentClassField()->parentIsAttribute();
 }
 
 /**
@@ -183,9 +183,9 @@ void CodeAccessorMethod::setAttributesFromObject(TextBlock * obj)
 
 }
 
-void CodeAccessorMethod::initFields(CodeClassField * tqparentClassField ) {
+void CodeAccessorMethod::initFields(CodeClassField * parentClassField ) {
 
-    m_parentclassfield = tqparentClassField;
+    m_parentclassfield = parentClassField;
     m_accessorType = GET;
     m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead.
 
diff --git a/umbrello/umbrello/codeaccessormethod.h b/umbrello/umbrello/codeaccessormethod.h
index b144c068..14289e74 100644
--- a/umbrello/umbrello/codeaccessormethod.h
+++ b/umbrello/umbrello/codeaccessormethod.h
@@ -70,7 +70,7 @@ public:
     */
     // virtual UMLObject * getParentObject();
 
-    bool tqparentIsAttribute();
+    bool parentIsAttribute();
 
     /**
      * Save the XMI representation of this object
@@ -112,7 +112,7 @@ private:
     CodeClassField * m_parentclassfield;
     AccessorType m_accessorType;
 
-    void initFields(CodeClassField * tqparentCF );
+    void initFields(CodeClassField * parentCF );
 
 };
 
diff --git a/umbrello/umbrello/codeclassfield.cpp b/umbrello/umbrello/codeclassfield.cpp
index 0a108a18..2e242664 100644
--- a/umbrello/umbrello/codeclassfield.cpp
+++ b/umbrello/umbrello/codeclassfield.cpp
@@ -82,8 +82,8 @@ CodeClassField::~CodeClassField ( ) {
 void CodeClassField::setParentUMLObject (UMLObject * obj) {
     UMLRole *role = dynamic_cast<UMLRole*>(obj);
     if(role) {
-        UMLAssociation * tqparentAssoc = role->getParentAssociation();
-        Uml::Association_Type atype = tqparentAssoc->getAssocType();
+        UMLAssociation * parentAssoc = role->getParentAssociation();
+        Uml::Association_Type atype = parentAssoc->getAssocType();
         m_parentIsAttribute = false;
 
         if ( atype == Uml::at_Association || atype == Uml::at_Association_Self)
@@ -103,7 +103,7 @@ void CodeClassField::setParentUMLObject (UMLObject * obj) {
 
 TQString CodeClassField::getTypeName ( ) {
 
-    if (tqparentIsAttribute())
+    if (parentIsAttribute())
     {
         UMLAttribute * at = (UMLAttribute*) getParentObject();
         return at->getTypeName();
@@ -121,7 +121,7 @@ TQString CodeClassField::getTypeName ( ) {
 // of objects (as per specification of associations)
 TQString CodeClassField::getListObjectType() {
     TQString type = TQString ("");
-    if (!tqparentIsAttribute())
+    if (!parentIsAttribute())
     {
         UMLRole * role = dynamic_cast<UMLRole*>(getParentObject());
         type = getUMLObjectName(role->getObject());
@@ -133,7 +133,7 @@ TQString CodeClassField::getListObjectType() {
  * Get the value of m_isAbstract
  * @return the value of m_isAbstract
  */
-bool CodeClassField::tqparentIsAttribute ( ) {
+bool CodeClassField::parentIsAttribute ( ) {
     return m_parentIsAttribute;
     //  return (m_classFieldType == Attribute) ? true : false;
 }
@@ -323,7 +323,7 @@ void CodeClassField::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
 }
 
 int CodeClassField::minimumListOccurances( ) {
-    if (!tqparentIsAttribute())
+    if (!parentIsAttribute())
     {
         UMLRole * role = dynamic_cast<UMLRole*>(getParentObject());
         TQString multi = role->getMultiplicity();
@@ -340,7 +340,7 @@ int CodeClassField::minimumListOccurances( ) {
 }
 
 int CodeClassField::maximumListOccurances( ) {
-    if (!tqparentIsAttribute())
+    if (!parentIsAttribute())
     {
         UMLRole * role = dynamic_cast<UMLRole*>(getParentObject());
         TQString multi = role->getMultiplicity();
@@ -444,7 +444,7 @@ void CodeClassField::initAccessorMethods()
 
     // add in the add,remove and list methods for things which are role based.
     // (and only used if the role specifies a 'list' type object
-    if (!tqparentIsAttribute()) {
+    if (!parentIsAttribute()) {
 
         if(!findMethodByType(CodeAccessorMethod::ADD))
         {
@@ -485,7 +485,7 @@ void CodeClassField::updateContent()
     // I suppose this could be supported under individual accessor method synctotqparent
     // calls, but its going to happen again and again for many languages. Why not a catch
     // all here? -b.t.
-    if (tqparentIsAttribute())
+    if (parentIsAttribute())
     {
         for ( CodeAccessorMethod *method = m_methodVector.first(); method;
                 method = m_methodVector.next() )
@@ -576,7 +576,7 @@ bool CodeClassField::fieldIsSingleValue ( )
 {
     // For the time being, all attributes ARE single values (yes,
     // I know this isnt always true, but we have to start somewhere.)
-    if(tqparentIsAttribute())
+    if(parentIsAttribute())
         return true;
 
     UMLRole * role = dynamic_cast<UMLRole*>(getParentObject());
diff --git a/umbrello/umbrello/codeclassfield.h b/umbrello/umbrello/codeclassfield.h
index 10efbbae..a1674318 100644
--- a/umbrello/umbrello/codeclassfield.h
+++ b/umbrello/umbrello/codeclassfield.h
@@ -51,8 +51,8 @@ public:
     /**
      * Constructors
      */
-    CodeClassField ( ClassifierCodeDocument * tqparentDoc , UMLAttribute * attrib );
-    CodeClassField ( ClassifierCodeDocument * tqparentDoc , UMLRole * role);
+    CodeClassField ( ClassifierCodeDocument * parentDoc , UMLAttribute * attrib );
+    CodeClassField ( ClassifierCodeDocument * parentDoc , UMLRole * role);
 
     /**
      * Finish off initializations of the object.
@@ -115,7 +115,7 @@ public:
     ClassFieldType getClassFieldType();
 
     // quick utility call to figure out if tqparent is an attribute or not
-    bool tqparentIsAttribute ( );
+    bool parentIsAttribute ( );
 
     // get the type of object that will be added/removed from lists
     // of objects (as per specification of associations)
diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.cpp b/umbrello/umbrello/codeclassfielddeclarationblock.cpp
index 5283cb38..7c4f5af6 100644
--- a/umbrello/umbrello/codeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codeclassfielddeclarationblock.cpp
@@ -14,7 +14,7 @@
  */
 
 /** basicially a class to allow for syncronization of the contents based on the
- *  values of the tqparentClassField's tqparentObject
+ *  values of the parentClassField's parentObject
  */
 #include "codeclassfielddeclarationblock.h"
 
@@ -24,11 +24,11 @@
 // Constructors/Destructors
 //
 
-CodeClassFieldDeclarationBlock::CodeClassFieldDeclarationBlock ( CodeClassField * tqparentCF )
-        : CodeBlockWithComments ( (CodeDocument*) tqparentCF->getParentDocument() ),
-        OwnedCodeBlock ((UMLObject*) tqparentCF->getParentObject())
+CodeClassFieldDeclarationBlock::CodeClassFieldDeclarationBlock ( CodeClassField * parentCF )
+        : CodeBlockWithComments ( (CodeDocument*) parentCF->getParentDocument() ),
+        OwnedCodeBlock ((UMLObject*) parentCF->getParentObject())
 {
-    init(tqparentCF);
+    init(parentCF);
 }
 
 CodeClassFieldDeclarationBlock::~CodeClassFieldDeclarationBlock ( ) {
@@ -51,7 +51,7 @@ CodeClassField * CodeClassFieldDeclarationBlock::getParentClassField ( ) {
     return m_parentclassfield;
 }
 
-/** Get the tqparent object of the tqparentCodeClassfield
+/** Get the tqparent object of the parentCodeClassfield
  */
 UMLObject * CodeClassFieldDeclarationBlock::getParentObject ( ) {
     return m_parentclassfield->getParentObject();
@@ -141,7 +141,7 @@ void CodeClassFieldDeclarationBlock::syncToParent () {
 
     // for role-based accessors, we DONT write ourselves out when
     // the name of the role is not defined.
-    if(!(getParentClassField()->tqparentIsAttribute()))
+    if(!(getParentClassField()->parentIsAttribute()))
     {
         UMLRole * tqparent = dynamic_cast<UMLRole*>(getParentObject());
         if (tqparent == NULL)
@@ -164,9 +164,9 @@ void CodeClassFieldDeclarationBlock::syncToParent () {
 
 }
 
-void CodeClassFieldDeclarationBlock::init (CodeClassField * tqparentCF)
+void CodeClassFieldDeclarationBlock::init (CodeClassField * parentCF)
 {
-    m_parentclassfield = tqparentCF;
+    m_parentclassfield = parentCF;
     m_canDelete = false;
     connect(m_parentclassfield,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent()));
 }
diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.h b/umbrello/umbrello/codeclassfielddeclarationblock.h
index 285416e3..add38fa8 100644
--- a/umbrello/umbrello/codeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codeclassfielddeclarationblock.h
@@ -57,7 +57,7 @@ public:
      */
     CodeClassField * getParentClassField ( );
 
-    /** A Utility method to get the tqparent object of the tqparentCodeClassfield
+    /** A Utility method to get the tqparent object of the parentCodeClassfield
      */
     UMLObject * getParentObject ( );
 
diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp
index 475be180..d081ce0e 100644
--- a/umbrello/umbrello/codegenerators/adawriter.cpp
+++ b/umbrello/umbrello/codegenerators/adawriter.cpp
@@ -483,9 +483,9 @@ void AdaWriter::writeOperation(UMLOperation *op, TQTextStream &ada, bool is_comm
     ada << cleanName(op->getName()) << " ";
     if (! (op->getStatic() && atl.count() == 0))
         ada << "(";
-    UMLClassifier *tqparentClassifier = static_cast<UMLClassifier*>(op->getUMLPackage());
+    UMLClassifier *parentClassifier = static_cast<UMLClassifier*>(op->getUMLPackage());
     if (! op->getStatic()) {
-        ada << "Self : access " << className(tqparentClassifier);
+        ada << "Self : access " << className(parentClassifier);
         if (atl.count())
             ada << ";" << m_endl;
     }
diff --git a/umbrello/umbrello/codegenerators/aswriter.cpp b/umbrello/umbrello/codegenerators/aswriter.cpp
index e99559f2..20f9a4a4 100644
--- a/umbrello/umbrello/codegenerators/aswriter.cpp
+++ b/umbrello/umbrello/codegenerators/aswriter.cpp
@@ -602,7 +602,7 @@ const TQStringList ASWriter::reservedKeywords() const {
         << "or"
         << "ord"
         << "_parent"
-        << "tqparentNode"
+        << "parentNode"
         << "parseFloat"
         << "parseInt"
         << "parseXML"
diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
index 7c8f0ff3..1e0bf353 100644
--- a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
@@ -33,14 +33,14 @@
 // Constructors/Destructors
 //
 
-CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role)
-        : CodeClassField(tqparentDoc, role)
+CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role)
+        : CodeClassField(parentDoc, role)
 {
 
 }
 
-CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib)
-        : CodeClassField(tqparentDoc, attrib)
+CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib)
+        : CodeClassField(parentDoc, attrib)
 {
 
 }
@@ -55,7 +55,7 @@ CPPCodeClassField::~CPPCodeClassField ( ) { }
 //
 
 TQString CPPCodeClassField::getFieldName() {
-    if (tqparentIsAttribute())
+    if (parentIsAttribute())
     {
         UMLAttribute * at = (UMLAttribute*) getParentObject();
         return cleanName(at->getName());
@@ -80,7 +80,7 @@ TQString CPPCodeClassField::getListFieldClassName () {
 
 TQString CPPCodeClassField::getInitialValue() {
 
-    if (tqparentIsAttribute())
+    if (parentIsAttribute())
     {
         UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() );
         if (at) {
diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.h b/umbrello/umbrello/codegenerators/cppcodeclassfield.h
index 0b714b16..7a76c7cc 100644
--- a/umbrello/umbrello/codegenerators/cppcodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.h
@@ -37,8 +37,8 @@ public:
     /**
      * Constructors
      */
-    CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role);
-    CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib);
+    CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role);
+    CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib);
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
index f2bef81e..6ca8377b 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
@@ -473,7 +473,7 @@
 <Q_SLOTS>
     <slot>browseClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp
index 57ae0172..868dea41 100644
--- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp
@@ -25,10 +25,10 @@
 //
 
 CPPHeaderClassDeclarationBlock::CPPHeaderClassDeclarationBlock
-  ( CPPHeaderCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
-        : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment)
+  ( CPPHeaderCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
+        : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment)
 {
-    init(tqparentDoc, comment);
+    init(parentDoc, comment);
 }
 
 CPPHeaderClassDeclarationBlock::~CPPHeaderClassDeclarationBlock ( ) { }
@@ -75,10 +75,10 @@ void CPPHeaderClassDeclarationBlock::saveToXMI ( TQDomDocument & doc, TQDomEleme
 void CPPHeaderClassDeclarationBlock::updateContent ( )
 {
 
-    CPPHeaderCodeDocument *tqparentDoc = dynamic_cast<CPPHeaderCodeDocument*>(getParentDocument());
-    UMLClassifier *c = tqparentDoc->getParentClassifier();
+    CPPHeaderCodeDocument *parentDoc = dynamic_cast<CPPHeaderCodeDocument*>(getParentDocument());
+    UMLClassifier *c = parentDoc->getParentClassifier();
     TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars();
-    bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut
+    bool isInterface = parentDoc->parentIsInterface(); // a little shortcut
     TQString CPPHeaderClassName = CodeGenerator::cleanName(c->getName());
     bool forceDoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments();
 
@@ -112,7 +112,7 @@ void CPPHeaderClassDeclarationBlock::updateContent ( )
     */
 
     /*
-        if(tqparentDoc->tqparentIsInterface())
+        if(parentDoc->parentIsInterface())
                 startText.append("interface ");
         else
     */
@@ -144,10 +144,10 @@ void CPPHeaderClassDeclarationBlock::updateContent ( )
 
 }
 
-void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *tqparentDoc, const TQString &comment)
+void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *parentDoc, const TQString &comment)
 {
 
-    setComment(new CPPCodeDocumentation(tqparentDoc));
+    setComment(new CPPCodeDocumentation(parentDoc));
     getComment()->setText(comment);
 
     setEndText("};");
diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
index b6eb68c7..84fc128a 100644
--- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
@@ -34,7 +34,7 @@ public:
     /**
      * Empty Constructor
      */
-    explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = "");
+    explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = "");
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp
index 2c983a15..d96ad398 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp
@@ -56,12 +56,12 @@ CPPHeaderCodeAccessorMethod::~CPPHeaderCodeAccessorMethod ( ) { }
 // we basically want to update the body of this method
 void CPPHeaderCodeAccessorMethod::updateContent( )
 {
-    CodeClassField * tqparentField = getParentClassField();
-    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField);
+    CodeClassField * parentField = getParentClassField();
+    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField);
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
     bool isInlineMethod = policy->getAccessorsAreInline( );
-    Uml::Visibility scope = tqparentField->getVisibility();
+    Uml::Visibility scope = parentField->getVisibility();
     TQString variableName = cppfield->getFieldName();
     TQString itemClassName = cppfield->getTypeName();
     TQString text;
@@ -92,11 +92,11 @@ void CPPHeaderCodeAccessorMethod::updateContent( )
 void CPPHeaderCodeAccessorMethod::updateMethodDeclaration()
 {
 
-    CodeClassField * tqparentField = getParentClassField();
-    ClassifierCodeDocument * doc = tqparentField->getParentDocument();
+    CodeClassField * parentField = getParentClassField();
+    ClassifierCodeDocument * doc = parentField->getParentDocument();
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
-    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField);
+    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField);
 
     bool isInlineMethod = policy->getAccessorsAreInline( );
 
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
index d2dba95d..55edd167 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
@@ -64,7 +64,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
     TQString fieldName = hcppcf->getFieldName();
 
     // Ugh. Sloppy exception.
-    if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue())
+    if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue())
         typeName = hcppcf->getListFieldClassName();
 
     TQString body = staticValue + ' ' + typeName + ' ' + fieldName + ';';
diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
index 92bafba1..1e1bab84 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
@@ -185,7 +185,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root)
                                     } else
                                         if( name == "codeoperation" ) {
                                             // find the code operation by id
-                                            TQString id = element.attribute("tqparent_id","-1");
+                                            TQString id = element.attribute("parent_id","-1");
                                             UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id));
                                             UMLOperation * op = dynamic_cast<UMLOperation*>(obj);
                                             if(op) {
@@ -370,7 +370,7 @@ void CPPHeaderCodeDocument::updateContent( )
     bool hasOperationMethods = c->getOpList().last() ? true : false;
     bool hasNamespace = false;
     bool isEnumeration = false;
-    bool isInterface = tqparentIsInterface();
+    bool isInterface = parentIsInterface();
     bool hasclassFields = hasClassFields();
     bool forcedoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments();
     TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars();
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
index c4ec5145..37951553 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
@@ -68,7 +68,7 @@ void CPPHeaderCodeOperation::updateContent( )
 void CPPHeaderCodeOperation::updateMethodDeclaration()
 {
     ClassifierCodeDocument *ccd = dynamic_cast<ClassifierCodeDocument*>(getParentDocument());
-    bool isInterface = ccd->tqparentIsInterface();
+    bool isInterface = ccd->parentIsInterface();
     UMLOperation * o = getParentOperation();
 
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
@@ -134,7 +134,7 @@ void CPPHeaderCodeOperation::updateMethodDeclaration()
 int CPPHeaderCodeOperation::lastEditableLine() {
     ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument());
     UMLOperation * o = getParentOperation();
-    if(doc->tqparentIsInterface() || o->getAbstract())
+    if(doc->parentIsInterface() || o->getAbstract())
         return -1; // very last line is NOT editable as its a one-line declaration w/ no body in
     // an interface.
     return 0;
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp
index 2ff19637..c71f6d2a 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp
@@ -56,8 +56,8 @@ CPPSourceCodeAccessorMethod::~CPPSourceCodeAccessorMethod ( ) { }
 // we basically want to update the body of this method
 void CPPSourceCodeAccessorMethod::updateContent( )
 {
-    CodeClassField * tqparentField = getParentClassField();
-    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField);
+    CodeClassField * parentField = getParentClassField();
+    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField);
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
     bool isInlineMethod = policy->getAccessorsAreInline( );
@@ -92,11 +92,11 @@ void CPPSourceCodeAccessorMethod::updateContent( )
 void CPPSourceCodeAccessorMethod::updateMethodDeclaration()
 {
 
-    CodeClassField * tqparentField = getParentClassField();
-    ClassifierCodeDocument * doc = tqparentField->getParentDocument();
+    CodeClassField * parentField = getParentClassField();
+    ClassifierCodeDocument * doc = parentField->getParentDocument();
     CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
-    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField);
+    CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField);
     UMLClassifier * c = doc->getParentClassifier();
 
     bool isInlineMethod = policy->getAccessorsAreInline( );
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
index 5c3d0a74..9409b207 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
@@ -41,7 +41,7 @@ CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UM
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
     UMLClassifier * c = doc->getParentClassifier();
     UMLOperation * o = getParentOperation();
-    bool isInterface = doc->tqparentIsInterface();
+    bool isInterface = doc->parentIsInterface();
     bool isInlineMethod = policy->getOperationsAreInline( );
 
     // first, the comment on the operation
@@ -131,7 +131,7 @@ void CPPSourceCodeOperation::updateMethodDeclaration()
     CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
     UMLClassifier * c = doc->getParentClassifier();
     UMLOperation * o = getParentOperation();
-    bool isInterface = doc->tqparentIsInterface();
+    bool isInterface = doc->parentIsInterface();
     bool isInlineMethod = policy->getOperationsAreInline( );
 
     // first, the comment on the operation
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp
index a6c64db4..601ca84b 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp
@@ -434,9 +434,9 @@ void CSharpWriter::writeRealizationsRecursive(UMLClassifier *currentClass, UMLAs
         cs << m_container_indent << m_indentation << "#endregion" << m_endl << m_endl;
 
         // Recurse to tqparent realizations
-        UMLAssociationList tqparentReal = real->getRealizations();
-        if (!tqparentReal.isEmpty()) {
-            writeRealizationsRecursive(real, &tqparentReal, cs);
+        UMLAssociationList parentReal = real->getRealizations();
+        if (!parentReal.isEmpty()) {
+            writeRealizationsRecursive(real, &parentReal, cs);
         }
     }
 }
diff --git a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp
index 1fd6fd69..99f0d862 100644
--- a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp
@@ -146,7 +146,7 @@ void JavaANTCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root)
                                     } else
                                         if( name == "codeoperation" ) {
                                             // find the code operation by id
-                                            TQString id = element.attribute("tqparent_id","-1");
+                                            TQString id = element.attribute("parent_id","-1");
                                             UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id));
                                             UMLOperation * op = dynamic_cast<UMLOperation*>(obj);
                                             if(op) {
diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp
index babc04a9..e1966001 100644
--- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp
@@ -23,10 +23,10 @@
 //
 
 JavaClassDeclarationBlock::JavaClassDeclarationBlock
- ( JavaClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
-        : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment)
+ ( JavaClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
+        : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment)
 {
-    init(tqparentDoc, comment);
+    init(parentDoc, comment);
 }
 
 JavaClassDeclarationBlock::~JavaClassDeclarationBlock ( ) { }
@@ -66,12 +66,12 @@ void JavaClassDeclarationBlock::loadFromXMI ( TQDomElement & root )
 void JavaClassDeclarationBlock::updateContent ( )
 {
 
-    JavaClassifierCodeDocument *tqparentDoc = dynamic_cast<JavaClassifierCodeDocument*>(getParentDocument());
-    UMLClassifier *c = tqparentDoc->getParentClassifier();
+    JavaClassifierCodeDocument *parentDoc = dynamic_cast<JavaClassifierCodeDocument*>(getParentDocument());
+    UMLClassifier *c = parentDoc->getParentClassifier();
     CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy();
     TQString endLine = commonPolicy->getNewLineEndingChars();
-    bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut
-    TQString JavaClassName = tqparentDoc->getJavaClassName(c->getName());
+    bool isInterface = parentDoc->parentIsInterface(); // a little shortcut
+    TQString JavaClassName = parentDoc->getJavaClassName(c->getName());
 
     // COMMENT
     if(isInterface)
@@ -101,7 +101,7 @@ void JavaClassDeclarationBlock::updateContent ( )
     } else
         startText.append("public ");
 
-    if(tqparentDoc->tqparentIsInterface())
+    if(parentDoc->parentIsInterface())
         startText.append("interface ");
     else
         startText.append("class ");
@@ -122,7 +122,7 @@ void JavaClassDeclarationBlock::updateContent ( )
         startText.append(" extends ");
     for (UMLClassifier * concept= superclasses.first(); concept; concept = superclasses.next())
     {
-        startText.append(tqparentDoc->cleanName(concept->getName()));
+        startText.append(parentDoc->cleanName(concept->getName()));
         if(i != (nrof_superclasses-1))
             startText.append(", ");
         i++;
@@ -140,7 +140,7 @@ void JavaClassDeclarationBlock::updateContent ( )
     }
     for (UMLClassifier * concept= superinterfaces.first(); concept; concept = superinterfaces.next())
     {
-        startText.append(tqparentDoc->cleanName(concept->getName()));
+        startText.append(parentDoc->cleanName(concept->getName()));
         if(i != (nrof_superinterfaces-1))
             startText.append(", ");
         i++;
@@ -153,10 +153,10 @@ void JavaClassDeclarationBlock::updateContent ( )
 
 }
 
-void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *tqparentDoc, const TQString &comment)
+void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *parentDoc, const TQString &comment)
 {
 
-    setComment(new JavaCodeDocumentation(tqparentDoc));
+    setComment(new JavaCodeDocumentation(parentDoc));
     getComment()->setText(comment);
 
     setEndText("}");
diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
index caa07074..0c1709ba 100644
--- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
@@ -34,7 +34,7 @@ public:
     /**
      * Empty Constructor
      */
-    explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = "");
+    explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = "");
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
index bcf46bb6..e386d01d 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
@@ -222,7 +222,7 @@ void JavaClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro
                                     } else
                                         if( name == "codeoperation" ) {
                                             // find the code operation by id
-                                            TQString id = element.attribute("tqparent_id","-1");
+                                            TQString id = element.attribute("parent_id","-1");
                                             UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id));
                                             UMLOperation * op = dynamic_cast<UMLOperation*>(obj);
                                             if(op) {
@@ -344,7 +344,7 @@ void JavaClassifierCodeDocument::updateContent( )
     // This depends on whether or not we have attribute/association classes
     CodeClassFieldList * cfList = getCodeClassFieldList();
     for(CodeClassField * field = cfList->first(); field; field = cfList->next())
-        if(field->tqparentIsAttribute())
+        if(field->parentIsAttribute())
             field->setWriteOutMethods(policy->getAutoGenerateAttribAccessors());
         else
             field->setWriteOutMethods(policy->getAutoGenerateAssocAccessors());
@@ -359,7 +359,7 @@ void JavaClassifierCodeDocument::updateContent( )
     CodeClassFieldList aggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation );
     CodeClassFieldList compositionClassFields = getSpecificClassFields ( CodeClassField::Composition );
 
-    bool isInterface = tqparentIsInterface();
+    bool isInterface = parentIsInterface();
     bool hasOperationMethods = c->getOpList().last() ? true : false;
     TQString endLine = commonPolicy->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time
 
@@ -532,7 +532,7 @@ void JavaClassifierCodeDocument::updateContent( )
         constBlock->addOrUpdateTaggedCodeBlockWithComments("emptyconstructor", emptyConstStatement, "Empty Constructor", 1, false);
     // Now, as an additional condition we only show the empty constructor block
     // IF it was desired to be shown
-    if(tqparentIsClass() && pol->getAutoGenerateConstructors())
+    if(parentIsClass() && pol->getAutoGenerateConstructors())
         emptyConstBlock->setWriteOutText(true);
     else
         emptyConstBlock->setWriteOutText(false);
diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
index dde0ca31..c0b08396 100644
--- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
@@ -74,8 +74,8 @@ void JavaCodeAccessorMethod::setAttributesFromNode( TQDomElement & root)
 void JavaCodeAccessorMethod::updateContent( )
 {
 
-    CodeClassField * tqparentField = getParentClassField();
-    JavaCodeClassField * javafield = dynamic_cast<JavaCodeClassField*>(tqparentField);
+    CodeClassField * parentField = getParentClassField();
+    JavaCodeClassField * javafield = dynamic_cast<JavaCodeClassField*>(parentField);
     TQString fieldName = javafield->getFieldName();
 
     TQString text = "";
@@ -150,7 +150,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration()
 
     // set scope of this accessor appropriately..if its an attribute,
     // we need to be more sophisticated
-    if(javafield->tqparentIsAttribute())
+    if(javafield->parentIsAttribute())
         switch (scopePolicy) {
         case CodeGenerationPolicy::Public:
         case CodeGenerationPolicy::Private:
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
index c168ac35..200594e9 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
@@ -36,14 +36,14 @@
 // Constructors/Destructors
 //
 
-JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role)
-        : CodeClassField(tqparentDoc, role)
+JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role)
+        : CodeClassField(parentDoc, role)
 {
 
 }
 
-JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib)
-        : CodeClassField(tqparentDoc, attrib)
+JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib)
+        : CodeClassField(parentDoc, attrib)
 {
 
 }
@@ -58,7 +58,7 @@ JavaCodeClassField::~JavaCodeClassField ( ) { }
 //
 
 TQString JavaCodeClassField::getFieldName() {
-    if (tqparentIsAttribute())
+    if (parentIsAttribute())
     {
         UMLAttribute * at = (UMLAttribute*) getParentObject();
         return cleanName(at->getName());
@@ -78,7 +78,7 @@ TQString JavaCodeClassField::getFieldName() {
 
 TQString JavaCodeClassField::getInitialValue() {
 
-    if (tqparentIsAttribute())
+    if (parentIsAttribute())
     {
         UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() );
         if (at) {
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.h b/umbrello/umbrello/codegenerators/javacodeclassfield.h
index 0cad977b..325d0b3a 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/javacodeclassfield.h
@@ -36,8 +36,8 @@ public:
     /**
      * Constructors
      */
-    JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role);
-    JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib);
+    JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role);
+    JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib);
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
index 6f6eb5ec..520f5611 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
@@ -67,7 +67,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
     TQString scopeStr = jdoc->scopeToJavaDecl(getParentObject()->getVisibility());
 
     // IF this is from an association, then scope taken as appropriate to policy
-    if(!jcf->tqparentIsAttribute())
+    if(!jcf->parentIsAttribute())
     {
         switch (scopePolicy) {
         case CodeGenerationPolicy::Public:
@@ -86,13 +86,13 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
     TQString fieldName = jcf->getFieldName();
     TQString initialV = jcf->getInitialValue();
 
-    if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue())
+    if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue())
         typeName = "List";
 
     TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName;
     if (!initialV.isEmpty())
         body.append(" = " + initialV);
-    else if (!cf->tqparentIsAttribute())
+    else if (!cf->parentIsAttribute())
     {
         UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject());
         if (role->getObject()->getBaseType() == Uml::ot_Interface)
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
index 5e0bbe29..a9ba6a89 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
@@ -273,5 +273,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.cpp b/umbrello/umbrello/codegenerators/javacodeoperation.cpp
index a788b215..54b34f46 100644
--- a/umbrello/umbrello/codegenerators/javacodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeoperation.cpp
@@ -123,7 +123,7 @@ void JavaCodeOperation::updateMethodDeclaration()
 
 int JavaCodeOperation::lastEditableLine() {
     ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument());
-    if(doc->tqparentIsInterface())
+    if(doc->parentIsInterface())
         return -1; // very last line is NOT editable as its a one-line declaration w/ no body in
     // an interface.
     return 0;
diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp
index d1eadb0b..c33ad3aa 100644
--- a/umbrello/umbrello/codegenerators/php5writer.cpp
+++ b/umbrello/umbrello/codegenerators/php5writer.cpp
@@ -2051,8 +2051,8 @@ static const char *php5words[] =
         "ovrimos_rollback",
         "owner_document",
         "pack",
-        "tqparent_node",
-        "tqparents",
+        "parent_node",
+        "parents",
         "parse_ini_file",
         "parse_str",
         "parse_url",
diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp
index 5536c2c9..b68417c7 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/phpwriter.cpp
@@ -2047,8 +2047,8 @@ static const char *words[] =
         "ovrimos_rollback",
         "owner_document",
         "pack",
-        "tqparent_node",
-        "tqparents",
+        "parent_node",
+        "parents",
         "parse_ini_file",
         "parse_str",
         "parse_url",
diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp
index 294175d5..89eb8bd2 100644
--- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp
@@ -26,10 +26,10 @@
 //
 
 RubyClassDeclarationBlock::RubyClassDeclarationBlock
- ( RubyClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
-        : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment)
+ ( RubyClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment)
+        : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment)
 {
-    init(tqparentDoc, comment);
+    init(parentDoc, comment);
 }
 
 RubyClassDeclarationBlock::~RubyClassDeclarationBlock ( ) { }
@@ -69,12 +69,12 @@ void RubyClassDeclarationBlock::loadFromXMI ( TQDomElement & root )
 void RubyClassDeclarationBlock::updateContent ( )
 {
 
-    RubyClassifierCodeDocument *tqparentDoc = dynamic_cast<RubyClassifierCodeDocument*>(getParentDocument());
-    UMLClassifier *c = tqparentDoc->getParentClassifier();
+    RubyClassifierCodeDocument *parentDoc = dynamic_cast<RubyClassifierCodeDocument*>(getParentDocument());
+    UMLClassifier *c = parentDoc->getParentClassifier();
     CodeGenerationPolicy * p = UMLApp::app()->getCommonPolicy();
     TQString endLine = p->getNewLineEndingChars();
-    bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut
-    TQString RubyClassName = tqparentDoc->getRubyClassName(c->getName());
+    bool isInterface = parentDoc->parentIsInterface(); // a little shortcut
+    TQString RubyClassName = parentDoc->getRubyClassName(c->getName());
     bool forceDoc = p->getCodeVerboseDocumentComments();
 
     // COMMENT
@@ -98,7 +98,7 @@ void RubyClassDeclarationBlock::updateContent ( )
     // Now set START/ENDING Text
     TQString startText = "";
 
-    if (tqparentDoc->tqparentIsInterface()) {
+    if (parentDoc->parentIsInterface()) {
         startText.append("module ");
     } else {
         startText.append("class ");
@@ -131,10 +131,10 @@ void RubyClassDeclarationBlock::updateContent ( )
     setStartText(startText);
 }
 
-void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *tqparentDoc, const TQString &comment)
+void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *parentDoc, const TQString &comment)
 {
 
-    setComment(new RubyCodeDocumentation(tqparentDoc));
+    setComment(new RubyCodeDocumentation(parentDoc));
     getComment()->setText(comment);
 
     setEndText("end");
diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
index 10b7f5bd..327516a3 100644
--- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
@@ -42,7 +42,7 @@ public:
     /**
      * Empty Constructor
      */
-    explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = "");
+    explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = "");
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
index ecd5523b..b1a60755 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
@@ -252,7 +252,7 @@ void RubyClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro
                                     } else
                                         if( name == "codeoperation" ) {
                                             // find the code operation by id
-                                            TQString id = element.attribute("tqparent_id","-1");
+                                            TQString id = element.attribute("parent_id","-1");
                                             UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id));
                                             UMLOperation * op = dynamic_cast<UMLOperation*>(obj);
                                             if(op) {
@@ -371,7 +371,7 @@ void RubyClassifierCodeDocument::updateContent( )
     // This depends on whether or not we have attribute/association classes
     CodeClassFieldList * cfList = getCodeClassFieldList();
     for(CodeClassField * field = cfList->first(); field; field = cfList->next())
-        if(field->tqparentIsAttribute())
+        if(field->parentIsAttribute())
             field->setWriteOutMethods(gen->getAutoGenerateAttribAccessors());
         else
             field->setWriteOutMethods(gen->getAutoGenerateAssocAccessors());
@@ -399,7 +399,7 @@ void RubyClassifierCodeDocument::updateContent( )
     CodeClassFieldList privAggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation, Uml::Visibility::Private);
     CodeClassFieldList privCompositionClassFields = getSpecificClassFields ( CodeClassField::Composition, Uml::Visibility::Private);
 
-    bool isInterface = tqparentIsInterface();
+    bool isInterface = parentIsInterface();
     bool hasOperationMethods = c->getOpList().last() ? true : false;
     CodeGenerationPolicy *pol = UMLApp::app()->getCommonPolicy();
     TQString endLine = pol->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time
diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
index 8a4fd7bd..14d7ce70 100644
--- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
@@ -78,8 +78,8 @@ void RubyCodeAccessorMethod::setAttributesFromNode( TQDomElement & root)
 void RubyCodeAccessorMethod::updateContent( )
 {
 
-    CodeClassField * tqparentField = getParentClassField();
-    RubyCodeClassField * rubyfield = dynamic_cast<RubyCodeClassField*>(tqparentField);
+    CodeClassField * parentField = getParentClassField();
+    RubyCodeClassField * rubyfield = dynamic_cast<RubyCodeClassField*>(parentField);
     TQString fieldName = rubyfield->getFieldName();
     TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars();
 
@@ -159,7 +159,7 @@ void RubyCodeAccessorMethod::updateMethodDeclaration()
 
     // set scope of this accessor appropriately..if its an attribute,
     // we need to be more sophisticated
-    if(rubyfield->tqparentIsAttribute())
+    if(rubyfield->parentIsAttribute())
         switch (scopePolicy) {
         case CodeGenerationPolicy::Public:
         case CodeGenerationPolicy::Private:
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
index e04d189a..4d24552a 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
@@ -38,14 +38,14 @@
 // Constructors/Destructors
 //
 
-RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role)
-        : CodeClassField(tqparentDoc, role)
+RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role)
+        : CodeClassField(parentDoc, role)
 {
 
 }
 
-RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib)
-        : CodeClassField(tqparentDoc, attrib)
+RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib)
+        : CodeClassField(parentDoc, attrib)
 {
 
 }
@@ -60,7 +60,7 @@ RubyCodeClassField::~RubyCodeClassField ( ) { }
 //
 
 TQString RubyCodeClassField::getFieldName() {
-    if (tqparentIsAttribute())
+    if (parentIsAttribute())
     {
         UMLAttribute * at = (UMLAttribute*) getParentObject();
         return cleanName(at->getName());
@@ -80,7 +80,7 @@ TQString RubyCodeClassField::getFieldName() {
 
 TQString RubyCodeClassField::getInitialValue() {
 
-    if (tqparentIsAttribute())
+    if (parentIsAttribute())
     {
         UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() );
         if (at) {
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.h b/umbrello/umbrello/codegenerators/rubycodeclassfield.h
index 28e96b74..f6cb27fe 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfield.h
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.h
@@ -38,8 +38,8 @@ public:
     /**
      * Constructors
      */
-    RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role);
-    RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib);
+    RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role);
+    RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib);
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
index 2171bb28..da8eb00e 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
@@ -61,7 +61,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
     TQString scopeStr = rdoc->scopeToRubyDecl(getParentObject()->getVisibility());
 
     // IF this is from an association, then scope taken as appropriate to policy
-    if(!rcf->tqparentIsAttribute())
+    if(!rcf->parentIsAttribute())
     {
         switch (scopePolicy) {
         case CodeGenerationPolicy::Public:
@@ -80,13 +80,13 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
     TQString fieldName = rcf->getFieldName();
     TQString initialV = rcf->getInitialValue();
 
-    if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue())
+    if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue())
         typeName = "Array";
 
     TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName;
     if (!initialV.isEmpty())
         body.append(" = " + initialV);
-    else if (!cf->tqparentIsAttribute())
+    else if (!cf->parentIsAttribute())
     {
         UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject());
         if (role->getObject()->getBaseType() == Uml::ot_Interface)
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
index fe4573c2..c47dc97f 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
@@ -244,5 +244,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
index bba8b462..caed59d8 100644
--- a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
@@ -217,7 +217,7 @@ void RubyCodeOperation::updateMethodDeclaration()
 
 int RubyCodeOperation::lastEditableLine() {
     ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument());
-    if(doc->tqparentIsInterface())
+    if(doc->parentIsInterface())
         return -1; // very last line is NOT editable as its a one-line declaration w/ no body in
     // an interface.
     return 0;
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
index d4f62cc3..ca118eb2 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
@@ -47,10 +47,10 @@
 SimpleCodeGenerator::SimpleCodeGenerator (bool createDirHierarchyForPackages /* =true */)
 {
     m_indentLevel = 0;
-    UMLDoc * tqparentDoc = UMLApp::app()->getDocument();
-    tqparentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all
+    UMLDoc * parentDoc = UMLApp::app()->getDocument();
+    parentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all
     m_createDirHierarchyForPackages = createDirHierarchyForPackages;
-    initFields(tqparentDoc);
+    initFields(parentDoc);
 }
 
 SimpleCodeGenerator::~SimpleCodeGenerator ( ) { }
@@ -256,14 +256,14 @@ void SimpleCodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) {
         this->writeClass(c); // call the writer for each class.
 }
 
-void SimpleCodeGenerator::initFields ( UMLDoc * tqparentDoc ) {
+void SimpleCodeGenerator::initFields ( UMLDoc * parentDoc ) {
 
     // load Classifier documents from tqparent document
     // initFromParentDocument();
 
     m_fileMap.clear();
     m_applyToAllRemaining = true;
-    m_doc = tqparentDoc;
+    m_doc = parentDoc;
 
     // this really is just being used to sync the internal params
     // to the codegenpolicy as there are no code documents to really sync.
diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp
index 21dd5230..6a068113 100644
--- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp
+++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp
@@ -29,10 +29,10 @@
 // Constructors/Destructors
 //
 
-XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment)
-        : HierarchicalCodeBlock(tqparentDoc)
+XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment)
+        : HierarchicalCodeBlock(parentDoc)
 {
-    init(tqparentDoc, nodeName, comment);
+    init(parentDoc, nodeName, comment);
 }
 
 XMLElementCodeBlock::~XMLElementCodeBlock ( ) { }
@@ -150,10 +150,10 @@ void XMLElementCodeBlock::updateContent ( )
 
 }
 
-void XMLElementCodeBlock::init (CodeDocument *tqparentDoc, const TQString &nodeName, const TQString &comment)
+void XMLElementCodeBlock::init (CodeDocument *parentDoc, const TQString &nodeName, const TQString &comment)
 {
 
-    setComment(new XMLCodeComment(tqparentDoc));
+    setComment(new XMLCodeComment(parentDoc));
     getComment()->setText(comment);
 
     m_nodeName = nodeName;
diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
index 21427df0..adbe39b7 100644
--- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
+++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
@@ -37,7 +37,7 @@ public:
     /**
      * Empty Constructor
      */
-    XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment = "");
+    XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment = "");
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.cpp b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
index 99bbbf58..47cd27d3 100644
--- a/umbrello/umbrello/codegenobjectwithtextblocks.cpp
+++ b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
@@ -87,10 +87,10 @@ bool CodeGenObjectWithTextBlocks::addTextBlock(TextBlock* add_object ) {
 
         // 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
-        CodeDocument * tqparentDoc = add_object->getParentDocument();
-        if(tqparentDoc) {
+        CodeDocument * parentDoc = add_object->getParentDocument();
+        if(parentDoc) {
 
-            CodeGenObjectWithTextBlocks * oldParent = tqparentDoc->findParentObjectForTaggedTextBlock (tag);
+            CodeGenObjectWithTextBlocks * oldParent = parentDoc->findParentObjectForTaggedTextBlock (tag);
             if(oldParent && oldParent != this)
                 oldParent->removeTextBlock(add_object);
         }
@@ -460,7 +460,7 @@ void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & r
                                     } else
                                         if( name == "codeoperation" ) {
                                             // find the code operation by id
-                                            TQString id = element.attribute("tqparent_id","-1");
+                                            TQString id = element.attribute("parent_id","-1");
                                             UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id));
                                             UMLOperation * op = dynamic_cast<UMLOperation*>(obj);
                                             if(op) {
diff --git a/umbrello/umbrello/codeimport/adaimport.cpp b/umbrello/umbrello/codeimport/adaimport.cpp
index c9325b36..05dc2f68 100644
--- a/umbrello/umbrello/codeimport/adaimport.cpp
+++ b/umbrello/umbrello/codeimport/adaimport.cpp
@@ -198,9 +198,9 @@ bool AdaImport::parseStmt() {
     }
     if (keyword == "package") {
         const TQString& name = advance();
-        TQStringList tqparentPkgs = TQStringList::split(".", name.lower());
-        tqparentPkgs.pop_back();  // exclude the current package
-        parseStems(tqparentPkgs);
+        TQStringList parentPkgs = TQStringList::split(".", name.lower());
+        parentPkgs.pop_back();  // exclude the current package
+        parseStems(parentPkgs);
         UMLObject *ns = NULL;
         if (advance() == "is") {
             ns = Import_Utils::createUMLObject(Uml::ot_Package, name,
diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp
index 249ed865..44c8f380 100644
--- a/umbrello/umbrello/codeimport/import_utils.cpp
+++ b/umbrello/umbrello/codeimport/import_utils.cpp
@@ -126,19 +126,19 @@ UMLObject* findUMLObject(TQString name,
 
 UMLObject *createUMLObject(Uml::Object_Type type,
                            const TQString& inName,
-                           UMLPackage *tqparentPkg,
+                           UMLPackage *parentPkg,
                            const TQString& comment,
                            const TQString& stereotype) {
     TQString name = inName;
     UMLDoc *umldoc = UMLApp::app()->getDocument();
     UMLFolder *logicalView = umldoc->getRootFolder(Uml::mt_Logical);
     const Uml::Programming_Language pl = UMLApp::app()->getActiveLanguage();
-    if (tqparentPkg == NULL) {
+    if (parentPkg == NULL) {
         // kDebug() << "Import_Utils::createUMLObject(" << name
-        //     << "): tqparentPkg is NULL, assuming Logical View" << endl;
-        tqparentPkg = logicalView;
+        //     << "): parentPkg is NULL, assuming Logical View" << endl;
+        parentPkg = logicalView;
     }
-    UMLObject * o = umldoc->findUMLObject(name, type, tqparentPkg);
+    UMLObject * o = umldoc->findUMLObject(name, type, parentPkg);
     bNewUMLObjectWasCreated = false;
     if (o == NULL) {
         // Strip possible adornments and look again.
@@ -150,11 +150,11 @@ UMLObject *createUMLObject(Uml::Object_Type type,
         const int isRef = typeName.tqcontains('&');
         typeName.remove(TQRegExp("[^\\w:\\. ].*$"));
         typeName = typeName.simplifyWhiteSpace();
-        UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, tqparentPkg);
+        UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, parentPkg);
         if (origType == NULL) {
             // Still not found. Create the stripped down type.
             if (bPutAtGlobalScope)
-                tqparentPkg = logicalView;
+                parentPkg = logicalView;
             // Find, or create, the scopes.
             TQStringList components;
             if (typeName.tqcontains("::")) {
@@ -168,9 +168,9 @@ UMLObject *createUMLObject(Uml::Object_Type type,
                 while ( components.count() ) {
                     TQString scopeName = components.front();
                     components.pop_front();
-                    o = umldoc->findUMLObject(scopeName, Uml::ot_UMLObject, tqparentPkg);
+                    o = umldoc->findUMLObject(scopeName, Uml::ot_UMLObject, parentPkg);
                     if (o) {
-                        tqparentPkg = static_cast<UMLPackage*>(o);
+                        parentPkg = static_cast<UMLPackage*>(o);
                         continue;
                     }
                     int wantNamespace = KMessageBox::Yes;
@@ -184,8 +184,8 @@ UMLObject *createUMLObject(Uml::Object_Type type,
                         }
                     }
                     Uml::Object_Type ot = (wantNamespace == KMessageBox::Yes ? Uml::ot_Package : Uml::ot_Class);
-                    o = Object_Factory::createUMLObject(ot, scopeName, tqparentPkg);
-                    tqparentPkg = static_cast<UMLPackage*>(o);
+                    o = Object_Factory::createUMLObject(ot, scopeName, parentPkg);
+                    parentPkg = static_cast<UMLPackage*>(o);
                     UMLListView *listView = UMLApp::app()->getListView();
                     UMLListViewItem *lvitem = listView->findUMLObject(o);
                     listView->setCurrentItem(lvitem);
@@ -196,7 +196,7 @@ UMLObject *createUMLObject(Uml::Object_Type type,
             Uml::Object_Type t = type;
             if (type == Uml::ot_UMLObject || isAdorned)
                 t = Uml::ot_Class;
-            origType = Object_Factory::createUMLObject(t, typeName, tqparentPkg, false);
+            origType = Object_Factory::createUMLObject(t, typeName, parentPkg, false);
             bNewUMLObjectWasCreated = true;
             bPutAtGlobalScope = false;
         }
@@ -228,7 +228,7 @@ UMLObject *createUMLObject(Uml::Object_Type type,
         } else {
             o = origType;
         }
-    } else if (tqparentPkg && !bPutAtGlobalScope) {
+    } else if (parentPkg && !bPutAtGlobalScope) {
         UMLPackage *existingPkg = o->getUMLPackage();
         if (existingPkg != umldoc->getDatatypeFolder()) {
             if (existingPkg)
@@ -236,8 +236,8 @@ UMLObject *createUMLObject(Uml::Object_Type type,
             else
                 kError() << "createUMLObject(" << name << "): "
                     << "o->getUMLPackage() was NULL" << endl;
-            o->setUMLPackage(tqparentPkg);
-            tqparentPkg->addObject(o);
+            o->setUMLPackage(parentPkg);
+            parentPkg->addObject(o);
         }
     }
     TQString strippedComment = formatComment(comment);
@@ -260,7 +260,7 @@ UMLObject *createUMLObject(Uml::Object_Type type,
         return o;
     TQStringList::Iterator end(params.end());
     for (TQStringList::Iterator it(params.begin()); it != end; ++it) {
-        UMLObject *p = umldoc->findUMLObject(*it, Uml::ot_UMLObject, tqparentPkg);
+        UMLObject *p = umldoc->findUMLObject(*it, Uml::ot_UMLObject, parentPkg);
         if (p == NULL || p->getBaseType() == Uml::ot_Datatype)
             continue;
         const Uml::Association_Type at = Uml::at_Dependency;
@@ -433,9 +433,9 @@ void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent) {
     umldoc->addAssociation(assoc);
 }
 
-void createGeneralization(UMLClassifier *child, const TQString &tqparentName) {
-    UMLObject *tqparentObj = createUMLObject( Uml::ot_Class, tqparentName );
-    UMLClassifier *tqparent = static_cast<UMLClassifier*>(tqparentObj);
+void createGeneralization(UMLClassifier *child, const TQString &parentName) {
+    UMLObject *parentObj = createUMLObject( Uml::ot_Class, parentName );
+    UMLClassifier *tqparent = static_cast<UMLClassifier*>(parentObj);
     createGeneralization(child, tqparent);
 }
 
@@ -454,9 +454,9 @@ void addIncludePath(const TQString& path) {
 }
 
 
-bool isDatatype(const TQString& name, UMLPackage *tqparentPkg) {
+bool isDatatype(const TQString& name, UMLPackage *parentPkg) {
     UMLDoc *umldoc = UMLApp::app()->getDocument();
-    UMLObject * o = umldoc->findUMLObject(name, Uml::ot_Datatype, tqparentPkg);
+    UMLObject * o = umldoc->findUMLObject(name, Uml::ot_Datatype, parentPkg);
     return (o!=NULL);
 }
 
diff --git a/umbrello/umbrello/codeimport/import_utils.h b/umbrello/umbrello/codeimport/import_utils.h
index 965361f6..bec9e0ff 100644
--- a/umbrello/umbrello/codeimport/import_utils.h
+++ b/umbrello/umbrello/codeimport/import_utils.h
@@ -35,7 +35,7 @@ namespace Import_Utils {
      */
     UMLObject* createUMLObject(Uml::Object_Type type,
                                const TQString& name,
-                               UMLPackage *tqparentPkg = NULL,
+                               UMLPackage *parentPkg = NULL,
                                const TQString& comment = TQString(),
                                const TQString& stereotype = TQString());
     /**
@@ -43,7 +43,7 @@ namespace Import_Utils {
      * is put at the global scope.
      *
      * @param yesno  When set to false, the object is created at the scope
-     *               given by the tqparentPkg argument of createUMLObject().
+     *               given by the parentPkg argument of createUMLObject().
      */
     void putAtGlobalScope(bool yesno);
 
@@ -116,7 +116,7 @@ namespace Import_Utils {
 
     /**
      * Add an argument to a UMLOperation.
-     * The tqparentPkg arg is only used for resolving possible scope
+     * The parentPkg arg is only used for resolving possible scope
      * prefixes in the `type'.
      */
     UMLAttribute* addMethodParameter(UMLOperation *method,
@@ -139,7 +139,7 @@ namespace Import_Utils {
      * Create a generalization from the existing child UMLObject to the given
      * tqparent class name.
      */
-    void createGeneralization(UMLClassifier *child, const TQString &tqparentName);
+    void createGeneralization(UMLClassifier *child, const TQString &parentName);
 
     /**
      * Strip comment lines of leading whitespace and stars.
@@ -168,7 +168,7 @@ namespace Import_Utils {
     /**
      * Returns true if a type is an actual Datatype
      */
-    bool isDatatype(const TQString& name, UMLPackage *tqparentPkg = NULL);
+    bool isDatatype(const TQString& name, UMLPackage *parentPkg = NULL);
 
 } // end namespace Import_Utils
 
diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp
index f73f5586..ac37e066 100644
--- a/umbrello/umbrello/codeimport/javaimport.cpp
+++ b/umbrello/umbrello/codeimport/javaimport.cpp
@@ -100,9 +100,9 @@ void JavaImport::spawnImport( TQString file ) {
 
 
 ///returns the UML Object if found, or null otherwise
-UMLObject* findObject( TQString name,   UMLPackage *tqparentPkg ) {
+UMLObject* findObject( TQString name,   UMLPackage *parentPkg ) {
     UMLDoc *umldoc = UMLApp::app()->getDocument();
-    UMLObject * o = umldoc->findUMLObject(name, Uml::ot_UMLObject , tqparentPkg);
+    UMLObject * o = umldoc->findUMLObject(name, Uml::ot_UMLObject , parentPkg);
     return o;
 }
 
@@ -296,7 +296,7 @@ bool JavaImport::parseStmt() {
             if ( tqparent ) {
                 Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(tqparent));
             } else {
-                kDebug() << "importJava tqparentClass " << baseName
+                kDebug() << "importJava parentClass " << baseName
                     << " is not resolveable. Creating placeholder" << endl;
                 Import_Utils::createGeneralization(m_klass, baseName);
             }
diff --git a/umbrello/umbrello/codemethodblock.cpp b/umbrello/umbrello/codemethodblock.cpp
index d4a3acc3..5a6bbc97 100644
--- a/umbrello/umbrello/codemethodblock.cpp
+++ b/umbrello/umbrello/codemethodblock.cpp
@@ -22,8 +22,8 @@
 // Constructors/Destructors
 //
 
-CodeMethodBlock::CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * tqparentObj, const TQString & body, const TQString & comment)
-        : CodeBlockWithComments ((CodeDocument*)doc, body, comment), OwnedCodeBlock (tqparentObj)
+CodeMethodBlock::CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * parentObj, const TQString & body, const TQString & comment)
+        : CodeBlockWithComments ((CodeDocument*)doc, body, comment), OwnedCodeBlock (parentObj)
 {
     initFields();
 }
diff --git a/umbrello/umbrello/codemethodblock.h b/umbrello/umbrello/codemethodblock.h
index a10a676c..1e7f7ea0 100644
--- a/umbrello/umbrello/codemethodblock.h
+++ b/umbrello/umbrello/codemethodblock.h
@@ -45,7 +45,7 @@ public:
     /**
      * Constructors
      */
-    CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * tqparentObj,
+    CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * parentObj,
                       const TQString & body = "", const TQString & comment = "");
 
     /**
diff --git a/umbrello/umbrello/codeoperation.cpp b/umbrello/umbrello/codeoperation.cpp
index 5c8228d5..3fa716dc 100644
--- a/umbrello/umbrello/codeoperation.cpp
+++ b/umbrello/umbrello/codeoperation.cpp
@@ -32,10 +32,10 @@
 // Constructors/Destructors
 //
 
-CodeOperation::CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * tqparentOp, const TQString & body, const TQString & comment)
-        : CodeMethodBlock ( doc, tqparentOp, body, comment)
+CodeOperation::CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * parentOp, const TQString & body, const TQString & comment)
+        : CodeMethodBlock ( doc, parentOp, body, comment)
 {
-    init(tqparentOp);
+    init(parentOp);
 }
 
 CodeOperation::~CodeOperation ( ) { }
@@ -133,7 +133,7 @@ void CodeOperation::setAttributesFromNode ( TQDomElement & element)
     // we simply need to record the tqparent operation here
     // m_parentOperation->disconnect(this); // always disconnect from current tqparent
 
-    TQString idStr = element.attribute("tqparent_id","-1");
+    TQString idStr = element.attribute("parent_id","-1");
     Uml::IDType id = STR2ID(idStr);
     UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(id);
     UMLOperation * op = dynamic_cast<UMLOperation*>(obj);
@@ -156,14 +156,14 @@ void CodeOperation::setAttributesFromObject(TextBlock * obj)
 
 }
 
-void CodeOperation::init (UMLOperation * tqparentOp)
+void CodeOperation::init (UMLOperation * parentOp)
 {
 
     m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead.
-    setTag(CodeOperation::findTag(tqparentOp));
+    setTag(CodeOperation::findTag(parentOp));
 
     // not needed.. done by tqparent "ownedcodeblock" class
-    //  connect(tqparentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent()));
+    //  connect(parentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent()));
 
 }
 
diff --git a/umbrello/umbrello/codeoperation.h b/umbrello/umbrello/codeoperation.h
index a0d8b693..5709f31a 100644
--- a/umbrello/umbrello/codeoperation.h
+++ b/umbrello/umbrello/codeoperation.h
@@ -88,7 +88,7 @@ protected:
 private:
 
     UMLOperation * m_parentOperation;
-    void init (UMLOperation * tqparentOp);
+    void init (UMLOperation * parentOp);
 
 };
 
diff --git a/umbrello/umbrello/codeparameter.cpp b/umbrello/umbrello/codeparameter.cpp
index 1ca714fc..60f5d098 100644
--- a/umbrello/umbrello/codeparameter.cpp
+++ b/umbrello/umbrello/codeparameter.cpp
@@ -33,10 +33,10 @@
 // Constructors/Destructors
 //
 
-CodeParameter::CodeParameter ( ClassifierCodeDocument * tqparentDoc, UMLObject * tqparentObject )
-        : TQObject ( (TQObject*) tqparentObject, "ACodeParam")
+CodeParameter::CodeParameter ( ClassifierCodeDocument * parentDoc, UMLObject * parentObject )
+        : TQObject ( (TQObject*) parentObject, "ACodeParam")
 {
-    initFields( tqparentDoc, tqparentObject );
+    initFields( parentDoc, parentObject );
 }
 
 CodeParameter::~CodeParameter ( ) { }
@@ -162,7 +162,7 @@ void CodeParameter::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & bl
 
 
     // set local attributes
-    blockElement.setAttribute("tqparent_id",getID());
+    blockElement.setAttribute("parent_id",getID());
 
     // setting ID's takes special treatment
     // as UMLRoles arent properly stored in the XMI right now.
@@ -188,7 +188,7 @@ void CodeParameter::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & bl
 void CodeParameter::setAttributesFromNode ( TQDomElement & root) {
 
     // set local attributes, tqparent object first
-    TQString idStr = root.attribute("tqparent_id","-1");
+    TQString idStr = root.attribute("parent_id","-1");
     Uml::IDType id = STR2ID(idStr);
 
     // always disconnect
@@ -230,7 +230,7 @@ void CodeParameter::setAttributesFromNode ( TQDomElement & root) {
             initFields ( m_parentDocument, obj); // just the regular approach
 
     } else
-        kError() << "Cant load CodeParam: tqparentUMLObject w/id:"
+        kError() << "Cant load CodeParam: parentUMLObject w/id:"
         << ID2STR(id) << " not found, corrupt save file?" << endl;
 
     // other attribs now
diff --git a/umbrello/umbrello/codeparameter.h b/umbrello/umbrello/codeparameter.h
index 8b3f8ef6..dd86d05c 100644
--- a/umbrello/umbrello/codeparameter.h
+++ b/umbrello/umbrello/codeparameter.h
@@ -43,7 +43,7 @@ public:
     /**
      * Empty Constructor
      */
-    CodeParameter ( ClassifierCodeDocument * doc, UMLObject * tqparentObj );
+    CodeParameter ( ClassifierCodeDocument * doc, UMLObject * parentObj );
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp
index b4533d83..934fc628 100644
--- a/umbrello/umbrello/dialogs/codeeditor.cpp
+++ b/umbrello/umbrello/dialogs/codeeditor.cpp
@@ -409,28 +409,28 @@ void CodeEditor::appendText (CodeClassFieldDeclarationBlock * db ) {
     TQString indent = db->getIndentationString();
     TQString body = db->formatMultiLineText (db->getText(), indent, "\n");
 
-    UMLObject * tqparentObj = db->getParentClassField()->getParentObject();
+    UMLObject * parentObj = db->getParentClassField()->getParentObject();
 
     TQColor bgcolor = getState().editBlockColor;
     TQString componentName = TQString("");
-    if(tqparentObj)
+    if(parentObj)
     {
-        if(db->getParentClassField()->tqparentIsAttribute()) {
-            componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ')';
+        if(db->getParentClassField()->parentIsAttribute()) {
+            componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ')';
         } else {
-            UMLRole * role = dynamic_cast<UMLRole*>(tqparentObj);
-            componentName = tqparentDocName + "::association_field(" + role->getName() + ')';
+            UMLRole * role = dynamic_cast<UMLRole*>(parentObj);
+            componentName = parentDocName + "::association_field(" + role->getName() + ')';
         }
         bgcolor = getState().umlObjectColor;
     }
 
-    appendText(db->getComment(), db, tqparentObj,componentName);
+    appendText(db->getComment(), db, parentObj,componentName);
 
     if(!db->getWriteOutText() && m_showHiddenBlocks)
         bgcolor = getState().hiddenColor;
 
     if(!StringIsBlank(body))
-        insert(body,db,false,getState().fontColor,bgcolor,tqparentObj);
+        insert(body,db,false,getState().fontColor,bgcolor,parentObj);
 
 
 }
@@ -460,42 +460,42 @@ void CodeEditor::appendText (CodeMethodBlock * mb) {
         bgcolor = getState().hiddenColor;
     }
 
-    TQString componentName = TQString("<b>tqparentless method\?</b>");
+    TQString componentName = TQString("<b>parentless method\?</b>");
 
     // ugly, but we need to know if there is a tqparent object here.
     CodeOperation * op = dynamic_cast<CodeOperation*>(mb);
     CodeAccessorMethod * accessor = dynamic_cast<CodeAccessorMethod*>(mb);
-    UMLObject * tqparentObj = 0;
+    UMLObject * parentObj = 0;
     if(op)
     {
-        tqparentObj = op->getParentOperation();
-        if(((UMLOperation*)tqparentObj)->isConstructorOperation())
-            componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") constructor method";
+        parentObj = op->getParentOperation();
+        if(((UMLOperation*)parentObj)->isConstructorOperation())
+            componentName = parentDocName + "::operation("+ parentObj->getName()+") constructor method";
         else
-            componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") method";
+            componentName = parentDocName + "::operation("+ parentObj->getName()+") method";
     }
     if(accessor)
     {
-        tqparentObj = accessor->getParentObject();
-        if(accessor->getParentClassField()->tqparentIsAttribute()) {
-            componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ") accessor method";
+        parentObj = accessor->getParentObject();
+        if(accessor->getParentClassField()->parentIsAttribute()) {
+            componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ") accessor method";
         } else {
-            UMLRole * role = dynamic_cast<UMLRole*>(tqparentObj);
-            componentName = tqparentDocName + "::association_field(" + role->getName() + ") accessor method";
+            UMLRole * role = dynamic_cast<UMLRole*>(parentObj);
+            componentName = parentDocName + "::association_field(" + role->getName() + ") accessor method";
         }
 
     }
 
-    //appendText(mb->getComment(), mb, tqparentObj, componentName);
-    appendText(mb->getComment(), mb->getComment(), tqparentObj, componentName);
+    //appendText(mb->getComment(), mb, parentObj, componentName);
+    appendText(mb->getComment(), mb->getComment(), parentObj, componentName);
 
     if(!StringIsBlank(startText))
-        insert(startText,mb,false,getState().fontColor,bgcolor,tqparentObj);
+        insert(startText,mb,false,getState().fontColor,bgcolor,parentObj);
     // always insert body for methods..IF we don't, we create a
     // situation where the user cant edit the body (!)
-    insert(body,mb,true,getState().fontColor,bgcolor,tqparentObj);
+    insert(body,mb,true,getState().fontColor,bgcolor,parentObj);
     if(!StringIsBlank(endText))
-        insert(endText,mb,false,getState().fontColor,bgcolor,tqparentObj);
+        insert(endText,mb,false,getState().fontColor,bgcolor,parentObj);
 
 }
 
@@ -520,22 +520,22 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock)
         return;
 
     OwnedHierarchicalCodeBlock * test = dynamic_cast<OwnedHierarchicalCodeBlock *>(hblock);
-    UMLObject * tqparentObj = 0;
+    UMLObject * parentObj = 0;
     TQString componentName = TQString("");
     TQColor paperColor = getState().nonEditBlockColor;
     if(test)
     {
-        tqparentObj = test->getParentObject();
-        UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparentObj);
+        parentObj = test->getParentObject();
+        UMLClassifier *c = dynamic_cast<UMLClassifier*>(parentObj);
         if (c) {
             TQString typeStr;
             if (c->isInterface())
                 typeStr = "Interface";
             else
                 typeStr = "Class";
-            componentName = tqparentDocName + "::" + typeStr + '(' + tqparentObj->getName() + ')';
+            componentName = parentDocName + "::" + typeStr + '(' + parentObj->getName() + ')';
         } else {
-            componentName = tqparentDocName + "::UNKNOWN(" + tqparentObj->getName() + ')';
+            componentName = parentDocName + "::UNKNOWN(" + parentObj->getName() + ')';
         }
 
         paperColor = getState().umlObjectColor;
@@ -549,10 +549,10 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock)
     TQString startText = hblock->formatMultiLineText ( hblock->getStartText(), indent, "\n");
     TQString endText = hblock->formatMultiLineText( hblock->getEndText(), indent, "\n");
 
-    appendText(hblock->getComment(), hblock, tqparentObj, componentName);
+    appendText(hblock->getComment(), hblock, parentObj, componentName);
 
     if(!StringIsBlank(startText))
-        insert(startText,hblock,false,getState().fontColor,paperColor, tqparentObj);
+        insert(startText,hblock,false,getState().fontColor,paperColor, parentObj);
     appendText(items);
     if(!StringIsBlank(endText))
         insert(endText,hblock,false,getState().fontColor,paperColor);
@@ -774,13 +774,13 @@ void CodeEditor::slotRedrawText() {
     rebuildView(m_lastPara);
 }
 
-void CodeEditor::init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc ) {
+void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) {
 
     // safety to insure that we are up to date
-    tqparentDoc->synchronize();
+    parentDoc->synchronize();
 
-    m_parentDlg = tqparentDlg;
-    m_parentDoc = tqparentDoc;
+    m_parentDlg = parentDlg;
+    m_parentDoc = parentDoc;
 
     setUndoRedoEnabled( false );
     setCursor( TQCursor( 0 ) );
@@ -801,9 +801,9 @@ void CodeEditor::init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentD
     // set name of tqparent doc
     ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(m_parentDoc);
     if(cdoc)
-        tqparentDocName = cdoc->getParentClassifier()->getName();
+        parentDocName = cdoc->getParentClassifier()->getName();
     else
-        tqparentDocName = "";
+        parentDocName = "";
 
     // set some viewability parameters
     //int margin = fontMetrics().height();
@@ -832,7 +832,7 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) {
         TQString baseIndent = block->getIndentationString(block->getIndentationLevel()+(cmb ? 1 : 0));
 
         TextBlockInfo *info = (*m_tbInfoMap)[block];
-        UMLObject * tqparentObj = info->getParent();
+        UMLObject * parentObj = info->getParent();
         int pstart = m_textBlockList.tqfindRef(block);
         TQString content = "";
 
@@ -862,8 +862,8 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) {
 
         // if a tqparent for the block, try to set its documentation
         // as long as its NOT an accessor codeblock.
-        if(tqparentObj && !info->isCodeAccessorMethod)
-            tqparentObj->setDoc(content);
+        if(parentObj && !info->isCodeAccessorMethod)
+            parentObj->setDoc(content);
 
         // make note that its now user generated
         if(cmb)
diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h
index b430b27d..5f72fc7a 100644
--- a/umbrello/umbrello/dialogs/codeeditor.h
+++ b/umbrello/umbrello/dialogs/codeeditor.h
@@ -91,7 +91,7 @@ protected:
 
 private:
 
-    TQString tqparentDocName;
+    TQString parentDocName;
     CodeDocument * m_parentDoc;
     CodeViewerDialog * m_parentDlg;
 
@@ -124,7 +124,7 @@ private:
     void updateTextBlockFromText (TextBlock * block);
 
     void initText ( CodeDocument * doc );
-    void init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc );
+    void init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc );
 
     void changeTextBlockHighlighting(TextBlock * tb, bool selected);
     bool isParaEditable (int para);
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
index d58bf99f..601b5385 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
@@ -525,7 +525,7 @@ is empty</string>
     <slot access="protected">browseClicked()</slot>
     <slot access="protected">activeLanguageChanged(int id)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui
index 31476a8b..620af610 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui
@@ -35,5 +35,5 @@
 <Q_SLOTS>
     <slot access="protected">apply()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
index 32773a59..517df16e 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
@@ -305,5 +305,5 @@ for in the right hand side list</string>
     <slot access="protected">deselectClass()</slot>
     <slot>classGenerated( UMLClassifier * /* c */ )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h
index 0f447d3a..2228dfae 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.h
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -52,7 +52,7 @@ public:
     /** return the code viewer state */
     Settings::CodeViewerState getState( );
 
-    TQString tqparentDocName;
+    TQString parentDocName;
 
     /**
      *  Adds a code document to the tabbed output
diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
index d29b21a8..665d6ccf 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
+++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
@@ -109,5 +109,5 @@
 <Q_SLOTS>
     <slot>changeHighlighting(int)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
index 57a43309..ed75ea9d 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
@@ -362,7 +362,7 @@
         <data format="XPM.GZ" length="4462">789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
index bfb00529..8dc7f029 100644
--- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui
+++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
@@ -406,5 +406,5 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
index 503181e4..e795d2c9 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
+++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
@@ -207,7 +207,7 @@ Only the folders made by the user are created in the base directory (Logical vie
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index f051925a..a227572d 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -343,7 +343,7 @@ void SettingsDlg::slotDefault() {
         break;
 
     case Settings::page_font:
-        m_FontWidgets.chooser -> setFont( tqparentWidget() -> font() );
+        m_FontWidgets.chooser -> setFont( parentWidget() -> font() );
         break;
 
     case Settings::page_UI:
diff --git a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
index 22a24023..ecaa98ae 100644
--- a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
+++ b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
@@ -199,5 +199,5 @@
         </grid>
     </widget>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp
index 2ba73694..7a4d11ab 100644
--- a/umbrello/umbrello/folder.cpp
+++ b/umbrello/umbrello/folder.cpp
@@ -248,7 +248,7 @@ void UMLFolder::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) {
     folderRoot.setAttribute("name", m_Name);
     folderRoot.setAttribute("filename", m_folderFile);
     folderRoot.setAttribute("mainModel", umldoc->URL().fileName());
-    folderRoot.setAttribute("tqparentId", ID2STR(m_pUMLPackage->getID()));
+    folderRoot.setAttribute("parentId", ID2STR(m_pUMLPackage->getID()));
     folderRoot.setAttribute("tqparent", m_pUMLPackage->getFullyQualifiedName("::", true));
     saveContents(folderDoc, folderRoot);
     folderDoc.appendChild(folderRoot);
diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp
index a04dfc43..54201a06 100644
--- a/umbrello/umbrello/import_rose.cpp
+++ b/umbrello/umbrello/import_rose.cpp
@@ -31,12 +31,12 @@ namespace Import_Rose {
 
 typedef TQPtrList<PetalNode> PetalNodeList;
 
-uint nClosures; // Multiple closing tqparentheses may appear on a single
+uint nClosures; // Multiple closing parentheses may appear on a single
                 // line. The parsing is done line-by-line and using
                 // recursive descent. This means that we can only handle
-                // _one_ closing tqparenthesis at a time, i.e. the closing
+                // _one_ closing parenthesis at a time, i.e. the closing
                 // of the currently parsed node. Since we may see more
-                // closing tqparentheses than we can handle, we need a
+                // closing parentheses than we can handle, we need a
                 // counter indicating how many additional node closings
                 // have been seen.
 
@@ -106,8 +106,8 @@ bool checkClosing(TQStringList& tokens) {
     if (tokens.count() == 0)
         return false;
     if (tokens.last() == ")") {
-        // For a single closing tqparenthesis, we just return true.
-        // But if there are more closing tqparentheses, we need to increment
+        // For a single closing parenthesis, we just return true.
+        // But if there are more closing parentheses, we need to increment
         // nClosures for each scope.
         tokens.pop_back();
         while (tokens.count() && tokens.last() == ")") {
@@ -133,7 +133,7 @@ bool isImmediateValue(TQString s) {
  * Examples of immediate value lists:
  *   number list:     ( 123 , 456 )
  *   string list:     ( "SomeText" 888 )
- * Any enclosing tqparentheses are removed.
+ * Any enclosing parentheses are removed.
  * All extracted items are also removed from `l'.
  * For the example given above the following is returned:
  *   "123 456"
@@ -236,7 +236,7 @@ TQString extractValue(TQStringList& l, TQTextStream& stream) {
     } else {
         result = shift(l);
         if (l.first() != ")") {
-            kError() << loc() << "expecting closing tqparenthesis" << endl;
+            kError() << loc() << "expecting closing parenthesis" << endl;
             return result;
         }
         l.pop_front();
@@ -301,7 +301,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) {
                     // Decrement nClosures exactly once, namely for the own scope.
                     // Each recursion of readAttributes() is only responsible for
                     // its own scope. I.e. each further scope closing is handled by
-                    // an outer recursion in case of multiple closing tqparentheses.
+                    // an outer recursion in case of multiple closing parentheses.
                     nClosures--;
                     break;
                 }
@@ -339,7 +339,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) {
                 // Decrement nClosures exactly once, namely for the own scope.
                 // Each recursion of readAttributes() is only responsible for
                 // its own scope. I.e. each further scope closing is handled by
-                // an outer recursion in case of multiple closing tqparentheses.
+                // an outer recursion in case of multiple closing parentheses.
                 nClosures--;
                 break;
             }
@@ -376,7 +376,7 @@ bool loadFromMDL(TQIODevice& file) {
             if (line.tqcontains(objectRx)) {
                 nClosures = 0;
                 TQStringList initialArgs = scan(line);
-                initialArgs.pop_front();  // remove opening tqparenthesis
+                initialArgs.pop_front();  // remove opening parenthesis
                 root = readAttributes(initialArgs, stream);
             }
         }
diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp
index e7614daf..a4969b4b 100644
--- a/umbrello/umbrello/kplayerslideraction.cpp
+++ b/umbrello/umbrello/kplayerslideraction.cpp
@@ -201,8 +201,8 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index)
     orientationChanged (toolbar -> orientation());
     connect (toolbar, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation)));
     //connect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed()));
-    //if ( tqparentCollection() )
-    //  tqparentCollection() -> connectHighlight (toolbar, this);
+    //if ( parentCollection() )
+    //  parentCollection() -> connectHighlight (toolbar, this);
     //return containerCount() - 1;
     return result;
 }
diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h
index 9ffd1a3a..ea4d290d 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -144,9 +144,9 @@ public:
     KPlayerSlider* slider (void)
     { return m_slider; }
 
-    /** Plugs the action into the toolbar. Retqparents the slider into the toolbar. */
+    /** Plugs the action into the toolbar. Reparents the slider into the toolbar. */
     //virtual int plug (TQWidget*, int = -1);
-    /** Unplugs the action from the toolbar. Retqparents the slider out of the toolbar. */
+    /** Unplugs the action from the toolbar. Reparents the slider out of the toolbar. */
     //virtual void unplug (TQWidget*);
 
 protected slots:
diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp
index 95a93f6b..9c6cfbc2 100644
--- a/umbrello/umbrello/model_utils.cpp
+++ b/umbrello/umbrello/model_utils.cpp
@@ -235,7 +235,7 @@ UMLObject* findUMLObject(const UMLObjectList& inList,
     return NULL;
 }
 
-TQString uniqObjectName(Uml::Object_Type type, UMLPackage *tqparentPkg, TQString prefix) {
+TQString uniqObjectName(Uml::Object_Type type, UMLPackage *parentPkg, TQString prefix) {
     TQString currentName = prefix;
     if (currentName.isEmpty()) {
         if(type == Uml::ot_Class)
@@ -271,7 +271,7 @@ TQString uniqObjectName(Uml::Object_Type type, UMLPackage *tqparentPkg, TQString
     }
     UMLDoc *doc = UMLApp::app()->getDocument();
     TQString name = currentName;
-    for (int number = 1; !doc->isUnique(name, tqparentPkg); number++)  {
+    for (int number = 1; !doc->isUnique(name, parentPkg); number++)  {
         name = currentName + '_' + TQString::number(number);
     }
     return name;
@@ -501,12 +501,12 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own
     if (m.isEmpty())
         return PS_Empty;
     if (m.tqcontains(TQRegExp("operator *()"))) {
-        // C++ special case: two sets of tqparentheses
+        // C++ special case: two sets of parentheses
         desc.m_name = "operator()";
         m.remove(TQRegExp("operator *()"));
     } else {
         /**
-         * The search pattern includes everything up to the opening tqparenthesis
+         * The search pattern includes everything up to the opening parenthesis
          * because UML also permits non programming-language oriented designs
          * using narrative names, for example "check water temperature".
          */
@@ -532,7 +532,7 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own
             desc.m_pReturnType = pRetType;
         }
     }
-    // Remove possible empty tqparentheses ()
+    // Remove possible empty parentheses ()
     m.remove( TQRegExp("\\s*\\(\\s*\\)") );
     desc.m_args.clear();
     pat = TQRegExp( "\\((.*)\\)" );
diff --git a/umbrello/umbrello/model_utils.h b/umbrello/umbrello/model_utils.h
index 771d6f86..600e841c 100644
--- a/umbrello/umbrello/model_utils.h
+++ b/umbrello/umbrello/model_utils.h
@@ -75,13 +75,13 @@ UMLObject* findUMLObject( const UMLObjectList& inList,
  * if the default name is taken e.g. new_actor, new_actor_1
  * etc.
  * @param type              The object type.
- * @param tqparentPkg The package in which to compare the name.
+ * @param parentPkg The package in which to compare the name.
  * @param prefix    The prefix to use (optional.)
  *                  If no prefix is given then a type related
  *                  prefix will be chosen internally.
  */
 TQString uniqObjectName(Uml::Object_Type type,
-                       UMLPackage *tqparentPkg,
+                       UMLPackage *parentPkg,
                        TQString prefix = TQString());
 
 /**
diff --git a/umbrello/umbrello/object_factory.cpp b/umbrello/umbrello/object_factory.cpp
index a87ff2c3..cf49a1e1 100644
--- a/umbrello/umbrello/object_factory.cpp
+++ b/umbrello/umbrello/object_factory.cpp
@@ -60,10 +60,10 @@ bool assignUniqueIdOnCreation() {
 }
 
 UMLObject* createNewUMLObject(Uml::Object_Type type, const TQString &name,
-                              UMLPackage *tqparentPkg) {
-    if (tqparentPkg == NULL) {
+                              UMLPackage *parentPkg) {
+    if (parentPkg == NULL) {
         kError() << "Object_Factory::createNewUMLObject(" << name
-            << "): tqparentPkg is NULL" << endl;
+            << "): parentPkg is NULL" << endl;
         return NULL;
     }
     UMLObject *o = NULL;
@@ -114,40 +114,40 @@ UMLObject* createNewUMLObject(Uml::Object_Type type, const TQString &name,
             kWarning() << "createNewUMLObject error unknown type: " << type << endl;
             return NULL;
     }
-    o->setUMLPackage(tqparentPkg);
+    o->setUMLPackage(parentPkg);
     UMLDoc *doc = UMLApp::app()->getDocument();
-    tqparentPkg->addObject(o);
+    parentPkg->addObject(o);
     doc->signalUMLObjectCreated(o);
     kapp->processEvents();
     return o;
 }
 
 UMLObject* createUMLObject(Uml::Object_Type type, const TQString &n,
-                           UMLPackage *tqparentPkg /* = NULL */,
+                           UMLPackage *parentPkg /* = NULL */,
                            bool solicitNewName /* = true */) {
     UMLDoc *doc = UMLApp::app()->getDocument();
-    if (tqparentPkg == NULL) {
+    if (parentPkg == NULL) {
         if (type == Uml::ot_Datatype) {
-            tqparentPkg = doc->getDatatypeFolder();
+            parentPkg = doc->getDatatypeFolder();
         } else {
             Uml::Model_Type mt = Model_Utils::convert_OT_MT(type);
             kDebug() << "Object_Factory::createUMLObject(" << n << "): "
-                << "tqparentPkg is not set, assuming Model_Type " << mt << endl;
-            tqparentPkg = doc->getRootFolder(mt);
+                << "parentPkg is not set, assuming Model_Type " << mt << endl;
+            parentPkg = doc->getRootFolder(mt);
         }
     }
     if (!n.isEmpty()) {
-        UMLObject *o = doc->findUMLObject(n, type, tqparentPkg);
+        UMLObject *o = doc->findUMLObject(n, type, parentPkg);
         if (o) {
             if (!solicitNewName)
                 return o;
         } else {
-            o = createNewUMLObject(type, n, tqparentPkg);
+            o = createNewUMLObject(type, n, parentPkg);
             return o;
         }
     }
     bool ok = false;
-    TQString name = Model_Utils::uniqObjectName(type, tqparentPkg, n);
+    TQString name = Model_Utils::uniqObjectName(type, parentPkg, n);
     bool bValidNameEntered = false;
     do {
         name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), name, &ok, (TQWidget*)UMLApp::app());
@@ -165,14 +165,14 @@ UMLObject* createUMLObject(Uml::Object_Type type, const TQString &n,
                                i18n("Reserved Keyword"));
             continue;
         }
-        if (! doc->isUnique(name, tqparentPkg)) {
+        if (! doc->isUnique(name, parentPkg)) {
             KMessageBox::error(0, i18n("That name is already being used."),
                                i18n("Not a Unique Name"));
             continue;
         }
         bValidNameEntered = true;
     } while (bValidNameEntered == false);
-    UMLObject *o = createNewUMLObject(type, name, tqparentPkg);
+    UMLObject *o = createNewUMLObject(type, name, parentPkg);
     return o;
 }
 
diff --git a/umbrello/umbrello/object_factory.h b/umbrello/umbrello/object_factory.h
index 541975c0..69338203 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 tqparentPkg The object's tqparent package.
+ * @param parentPkg The object's tqparent 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
@@ -40,7 +40,7 @@ namespace Object_Factory {
  */
 UMLObject* createUMLObject(Uml::Object_Type type,
                            const TQString &n = TQString(),
-                           UMLPackage *tqparentPkg = 0,
+                           UMLPackage *parentPkg = 0,
                            bool solicitNewName = true);
 
 /**
diff --git a/umbrello/umbrello/ownedcodeblock.cpp b/umbrello/umbrello/ownedcodeblock.cpp
index 22ceeed1..3b141500 100644
--- a/umbrello/umbrello/ownedcodeblock.cpp
+++ b/umbrello/umbrello/ownedcodeblock.cpp
@@ -90,7 +90,7 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e
     UMLRole * role = dynamic_cast<UMLRole*>(m_parentObject);
     if(role)
     {
-        elem.setAttribute("tqparent_id",ID2STR(role->getParentAssociation()->getID()));
+        elem.setAttribute("parent_id",ID2STR(role->getParentAssociation()->getID()));
         // CAUTION: role_id here is numerically inverted wrt Uml::Role_Type,
         //          i.e. role A is 1 and role B is 0.
         //          I'll resist the temptation to change this -
@@ -99,7 +99,7 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e
     }
     else
     {
-        elem.setAttribute("tqparent_id",ID2STR(m_parentObject->getID()));
+        elem.setAttribute("parent_id",ID2STR(m_parentObject->getID()));
         //elem.setAttribute("role_id","-1");
     }
 
@@ -111,7 +111,7 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e
 void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) {
 
     // set local attributes, tqparent object first
-    TQString idStr = elem.attribute("tqparent_id","-1");
+    TQString idStr = elem.attribute("parent_id","-1");
     Uml::IDType id = STR2ID(idStr);
 
     // always disconnect from current tqparent
@@ -154,7 +154,7 @@ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) {
 
     }
     else
-        kError() << "ERROR: can't load ownedcodeblock: tqparentUMLObject w/id:"
+        kError() << "ERROR: can't load ownedcodeblock: parentUMLObject w/id:"
         << ID2STR(id) << " not found, corrupt save file?" << endl;
 
 }
diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp
index 45e41875..bb2e4990 100644
--- a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp
+++ b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp
@@ -68,7 +68,7 @@ void OwnedHierarchicalCodeBlock::setAttributesOnNode (TQDomDocument & doc, TQDom
     OwnedCodeBlock::setAttributesOnNode(doc, elem);
 
     // set local class attributes
-    elem.setAttribute("tqparent_id",ID2STR(getParentObject()->getID()));
+    elem.setAttribute("parent_id",ID2STR(getParentObject()->getID()));
 
     // setting ID's takes special treatment
     // as UMLRoles arent properly stored in the XMI right now.
diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.h b/umbrello/umbrello/ownedhierarchicalcodeblock.h
index 7a99fe65..0999b02f 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 * tqparentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" );
+    OwnedHierarchicalCodeBlock ( UMLObject * tqparent, CodeDocument * parentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" );
 
     /**
      * Empty Destructor
diff --git a/umbrello/umbrello/petaltree2uml.cpp b/umbrello/umbrello/petaltree2uml.cpp
index dc650a5d..42fa038d 100644
--- a/umbrello/umbrello/petaltree2uml.cpp
+++ b/umbrello/umbrello/petaltree2uml.cpp
@@ -310,10 +310,10 @@ 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 tqparentPkg  Pointer to the current tqparent UMLPackage.
+ * @param parentPkg  Pointer to the current tqparent UMLPackage.
  * @return      True if the node actually contained a controlled unit.
  */
-bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, UMLPackage *tqparentPkg) {
+bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, UMLPackage *parentPkg) {
     if (node->findAttribute("is_unit").string != "TRUE")
         return false;
     bool is_loaded = (node->findAttribute("is_loaded").string != "FALSE");
@@ -335,7 +335,7 @@ bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id,
  *           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, UMLPackage *tqparentPkg = NULL) {
+bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) {
     if (node == NULL) {
         kError() << "umbrellify: node is NULL" << endl;
         return false;
@@ -346,7 +346,7 @@ bool umbrellify(PetalNode *node, UMLPackage *tqparentPkg = NULL) {
     Uml::IDType id = quid(node);
 
     if (objType == "Class_Category") {
-        UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Package, name, tqparentPkg);
+        UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Package, name, parentPkg);
         o->setID(id);
         PetalNode *logical_models = node->findAttribute("logical_models").node;
         if (logical_models) {
@@ -355,13 +355,13 @@ bool umbrellify(PetalNode *node, UMLPackage *tqparentPkg = NULL) {
             for (uint i = 0; i < atts.count(); i++) {
                 umbrellify(atts[i].second.node, localParent);
             }
-        } else if (!handleControlledUnit(node, name, id, tqparentPkg)) {
+        } else if (!handleControlledUnit(node, name, id, parentPkg)) {
             kDebug() << "umbrellify: handling of " << objType << " " << name
                << " is not yet implemented" << endl;
         }
 
     } else if (objType == "Class") {
-        UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Class, name, tqparentPkg);
+        UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Class, name, parentPkg);
         o->setID(id);
         UMLClassifier *c = static_cast<UMLClassifier*>(o);
         // set stereotype
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp
index ef96f5b3..3c0cb32c 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.cpp
+++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp
@@ -505,7 +505,7 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI
         operationAdded( op );
     }
 
-    //if add tqparents
+    //if add parents
     if(addSuper)
     {
         TQListViewItem *superFolder = new KListViewItem( classifierItem, i18n("Base Classifiers") );
@@ -558,14 +558,14 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const
     RefactoringAssistant *me = const_cast<RefactoringAssistant*>(this);
 
     //ok, check if the move is valid
-    TQListViewItem *movingItem = 0, *afterme = 0, *tqparentItem = 0;
-    me->findDrop(event->pos(), tqparentItem, afterme);
+    TQListViewItem *movingItem = 0, *afterme = 0, *parentItem = 0;
+    me->findDrop(event->pos(), parentItem, afterme);
     for( movingItem = firstChild(); movingItem != 0; movingItem = movingItem->itemBelow() )
     {
         if( movingItem->isSelected() )
             break;
     }
-    if(!movingItem || !tqparentItem)
+    if(!movingItem || !parentItem)
     {   kDebug()<<"moving/tqparent items not found - can't accept drag!"<<endl;
         return false;
     }
@@ -583,26 +583,26 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const
         return false;
     }
 
-    kDebug()<<"tqparent item is "<<tqparentItem->text(0)<<endl;
-    UMLObject *tqparentObject = me->findUMLObject(tqparentItem);
-    if( tqparentObject && dynamic_cast<UMLClassifier*>(tqparentObject) )
+    kDebug()<<"tqparent 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
-        if( (tqparentItem->text(1) == "operations" && t == Uml::ot_Operation)
-                || (tqparentItem->text(1) == "attributes" && t == Uml::ot_Attribute))
+        if( (parentItem->text(1) == "operations" && t == Uml::ot_Operation)
+                || (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute))
         {
-            tqparentObject = me->findUMLObject( tqparentItem->tqparent() );
+            parentObject = me->findUMLObject( parentItem->tqparent() );
         }
         else
         {
-            kDebug()<<"moving to item "<<tqparentItem->text(0)<<" -- "<<tqparentItem->text(1)<<" not valid"<<endl;
+            kDebug()<<"moving to item "<<parentItem->text(0)<<" -- "<<parentItem->text(1)<<" not valid"<<endl;
             return false;
         }
     }
-    if (dynamic_cast<UMLClassifier*>(tqparentObject) &&
+    if (dynamic_cast<UMLClassifier*>(parentObject) &&
             (t == Uml::ot_Attribute || t == Uml::ot_Operation))
     {
         return true;
@@ -613,7 +613,7 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const
 }
 
 
-void RefactoringAssistant::movableDropEvent (TQListViewItem* tqparentItem, TQListViewItem* afterme)
+void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListViewItem* afterme)
 {
     //when dropping on a class, we have to put the item in the appropriate folder!
     UMLObject *movingObject;
@@ -631,13 +631,13 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* tqparentItem, TQLis
         return;
     }
     Uml::Object_Type t = movingObject->getBaseType();
-    newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( tqparentItem ) );
+    newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( parentItem ) );
     if(!newClassifier)
     {
-        if ((tqparentItem->text(1) == "operations" && t == Uml::ot_Operation)
-                || (tqparentItem->text(1) == "attributes" && t == Uml::ot_Attribute))
+        if ((parentItem->text(1) == "operations" && t == Uml::ot_Operation)
+                || (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute))
         {
-            newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( tqparentItem->tqparent() ) );
+            newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( parentItem->tqparent() ) );
         }
         if(!newClassifier)
         {
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 13608f3c..6f4d65f5 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -55,7 +55,7 @@
 #include "umlviewlist.h"
 #include "worktoolbar.h"
 #ifdef HAVE_DOT
-# include "autotqlayout/autotqlayoutdlg.h" //dimitri
+# include "autotqlayout/autolayoutdlg.h" //dimitri
 #endif
 #include "model_utils.h"
 #include "clipboard/umlclipboard.h"
@@ -1682,7 +1682,7 @@ void UMLApp::slotMoveTabRight() {
 void UMLApp::slotAutotqlayout(){
 #ifdef HAVE_DOT
 /*
-    TQDialog* d = new AutotqlayoutDlg(getCurrentView());
+    TQDialog* d = new AutolayoutDlg(getCurrentView());
     d->show();
  */
 #endif
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index 13cbce16..93cd981e 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -533,7 +533,7 @@ public slots:
     void slotViewStatusBar();
 
     /**
-     * Autotqlayouts the current class diagram
+     * Autolayouts the current class diagram
      */
     void slotAutotqlayout();
 
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index acc77eee..de6fc9af 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -769,7 +769,7 @@ bool UMLDoc::isUnique(const TQString &name)
 {
     UMLListView *listView = UMLApp::app()->getListView();
     UMLListViewItem *currentItem = (UMLListViewItem*)listView->currentItem();
-    UMLListViewItem *tqparentItem = 0;
+    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
@@ -780,13 +780,13 @@ bool UMLDoc::isUnique(const TQString &name)
         // do check now
         if (Model_Utils::typeIsContainer(currentItem->getType()))
             return isUnique (name, (UMLPackage*) currentItem->getUMLObject());
-        tqparentItem = (UMLListViewItem*)currentItem->tqparent();
+        parentItem = (UMLListViewItem*)currentItem->tqparent();
     }
 
     // item is in a package so do check only in that
-    if (tqparentItem != NULL && Model_Utils::typeIsContainer(tqparentItem->getType())) {
-        UMLPackage *tqparentPkg = static_cast<UMLPackage*>(tqparentItem->getUMLObject());
-        return isUnique(name, tqparentPkg);
+    if (parentItem != NULL && Model_Utils::typeIsContainer(parentItem->getType())) {
+        UMLPackage *parentPkg = static_cast<UMLPackage*>(parentItem->getUMLObject());
+        return isUnique(name, parentPkg);
     }
 
     kError() << "UMLDoc::isUnique(" << name << "): Not currently in a package"
@@ -1524,8 +1524,8 @@ bool UMLDoc::loadFromXMI( TQIODevice & file, short encode )
                        tagEq(tag, "Interface")) {
                 // These tests are only for foreign XMI files that
                 // are missing the <Model> tag (e.g. NSUML)
-                TQDomElement tqparentElem = node.toElement();
-                if( !loadUMLObjectsFromXMI( tqparentElem ) ) {
+                TQDomElement parentElem = node.toElement();
+                if( !loadUMLObjectsFromXMI( parentElem ) ) {
                     kWarning() << "failed load on model objects" << endl;
                     return false;
                 }
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index b9644aa9..7b570eab 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -573,7 +573,7 @@ void UMLListView::slotDiagramCreated( Uml::IDType id ) {
 }
 
 UMLListViewItem* UMLListView::determineParentItem(UMLObject* object) const {
-    UMLListViewItem* tqparentItem = NULL;
+    UMLListViewItem* parentItem = NULL;
     UMLListViewItem* current = (UMLListViewItem*) currentItem();
     Uml::ListView_Type lvt = Uml::lvt_Unknown;
     if (current)
@@ -603,23 +603,23 @@ UMLListViewItem* UMLListView::determineParentItem(UMLObject* object) const {
                     kError() << "UMLListView::determineParentItem: could not tqfind "
                         << "tqparent package " << pkg->getName() << endl;
                 else
-                    tqparentItem = pkgItem;
+                    parentItem = pkgItem;
             } else if ((lvt == Uml::lvt_UseCase_Folder &&
                            (t == Uml::ot_Actor || t == Uml::ot_UseCase))
                     || (lvt == Uml::lvt_Component_Folder && t == Uml::ot_Component)
                     || (lvt == Uml::lvt_Deployment_Folder && t == Uml::ot_Node)
                     || (lvt == Uml::lvt_EntityRelationship_Folder && t == Uml::ot_Entity)) {
-                tqparentItem = current;
+                parentItem = current;
             } else if (t == Uml::ot_Datatype) {
-                tqparentItem = m_datatypeFolder;
+                parentItem = m_datatypeFolder;
             } else {
                 Uml::Model_Type guess = Model_Utils::guessContainer(object);
-                tqparentItem = m_lv[guess];
+                parentItem = m_lv[guess];
             }
         }
         break;
     }
-    return tqparentItem;
+    return parentItem;
 }
 
 bool UMLListView::mayHaveChildItems(Uml::Object_Type type) {
@@ -653,8 +653,8 @@ void UMLListView::slotObjectCreated(UMLObject* object) {
         newItem->setIcon(icon);
         return;
     }
-    UMLListViewItem* tqparentItem = determineParentItem(object);
-    if (tqparentItem == NULL)
+    UMLListViewItem* parentItem = determineParentItem(object);
+    if (parentItem == NULL)
         return;
     Uml::Object_Type type = object->getBaseType();
 
@@ -667,7 +667,7 @@ void UMLListView::slotObjectCreated(UMLObject* object) {
         if (!folderFile.isEmpty())
             name.append(" (" + folderFile + ')');
     }
-    newItem = new UMLListViewItem(tqparentItem, name, lvt, object);
+    newItem = new UMLListViewItem(parentItem, name, lvt, object);
     if (mayHaveChildItems(type)) {
         UMLClassifier *c = static_cast<UMLClassifier*>(object);
         UMLClassifierListItemList cListItems = c->getFilteredList(Uml::ot_UMLObject);
@@ -773,21 +773,21 @@ void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier*
         return;
     const TQString text = child->toString(Uml::st_SigNoVis);
     UMLListViewItem *childItem = NULL;
-    UMLListViewItem *tqparentItem = findUMLObject(tqparent);
-    if (tqparentItem == NULL) {
+    UMLListViewItem *parentItem = findUMLObject(tqparent);
+    if (parentItem == NULL) {
         kDebug() << "UMLListView::childObjectAdded(" << child->getName()
             << "): tqparent " << tqparent->getName()
             << " does not yet exist, creating it now." << endl;
         const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(tqparent);
-        tqparentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], tqparent->getName(), lvt, tqparent);
+        parentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], tqparent->getName(), lvt, tqparent);
     } else {
-        childItem = tqparentItem->findChildObject(child);
+        childItem = parentItem->findChildObject(child);
     }
     if (childItem) {
         childItem->setText(text);
     } else {
         const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(child);
-        childItem = new UMLListViewItem(tqparentItem, text, lvt, child);
+        childItem = new UMLListViewItem(parentItem, text, lvt, child);
         if (! m_doc->loading()) {
             ensureItemVisible(childItem);
             clearSelection();
@@ -799,13 +799,13 @@ void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier*
 
 void UMLListView::childObjectRemoved(UMLClassifierListItem* obj) {
     UMLClassifier *tqparent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender()));
-    UMLListViewItem *tqparentItem = findUMLObject(tqparent);
-    if (tqparentItem == NULL) {
+    UMLListViewItem *parentItem = findUMLObject(tqparent);
+    if (parentItem == NULL) {
         kError() << "UMLListView::childObjectRemoved(" << obj->getName()
             << "): cannot find tqparent UMLListViewItem" << endl;
         return;
     }
-    tqparentItem->deleteChildItem(obj);
+    parentItem->deleteChildItem(obj);
 }
 
 void UMLListView::slotDiagramRenamed(Uml::IDType id) {
@@ -1842,13 +1842,13 @@ void UMLListView::slotCutSuccessful() {
     }
 }
 
-void UMLListView::addNewItem(UMLListViewItem *tqparentItem, Uml::ListView_Type type) {
+void UMLListView::addNewItem(UMLListViewItem *parentItem, Uml::ListView_Type type) {
      if (type == Uml::lvt_Datatype) {
-         tqparentItem = m_datatypeFolder;
+         parentItem = m_datatypeFolder;
      }
 
     UMLListViewItem * newItem = NULL;
-    tqparentItem->setOpen( true );
+    parentItem->setOpen( true );
 
     Uml::Icon_Type icon = Model_Utils::convert_LVT_IT(type);
 
@@ -1856,7 +1856,7 @@ void UMLListView::addNewItem(UMLListViewItem *tqparentItem, Uml::ListView_Type t
     if (Model_Utils::typeIsDiagram(type)) {
         Uml::Diagram_Type dt = Model_Utils::convert_LVT_DT(type);
         name = getUniqueDiagramName(dt);
-        newItem = new UMLListViewItem(tqparentItem, name, type, Uml::id_None);
+        newItem = new UMLListViewItem(parentItem, name, type, Uml::id_None);
     } else {
         Uml::Object_Type ot = Model_Utils::convert_LVT_OT(type);
         if (ot == Uml::ot_UMLObject) {
@@ -1864,20 +1864,20 @@ void UMLListView::addNewItem(UMLListViewItem *tqparentItem, Uml::ListView_Type t
                 << type << endl;
             return;
         }
-        UMLPackage *tqparentPkg =
-            dynamic_cast<UMLPackage*>(tqparentItem->getUMLObject());
-        if (tqparentPkg == NULL) {
+        UMLPackage *parentPkg =
+            dynamic_cast<UMLPackage*>(parentItem->getUMLObject());
+        if (parentPkg == NULL) {
             kError() << "UMLListView::addNewItem(type " << type
-                << "): tqparentPkg is NULL" << endl;
+                << "): parentPkg is NULL" << endl;
             return;
         }
         if (Model_Utils::typeIsClassifierList(type)) {
-            UMLClassifier *tqparent = static_cast<UMLClassifier*>(tqparentPkg);
+            UMLClassifier *tqparent = static_cast<UMLClassifier*>(parentPkg);
             name = tqparent->uniqChildName(ot);
         } else {
-            name = Model_Utils::uniqObjectName(ot, tqparentPkg);
+            name = Model_Utils::uniqObjectName(ot, parentPkg);
         }
-        newItem = new UMLListViewItem(tqparentItem, name, type, (UMLObject*)0);
+        newItem = new UMLListViewItem(parentItem, name, type, (UMLObject*)0);
     }
     m_bIgnoreCancelRename = false;
     newItem->setIcon( icon );
@@ -2073,15 +2073,15 @@ UMLObject *UMLListView::createUMLObject( UMLListViewItem * item, Uml::Object_Typ
         return NULL;
     }
 
-    UMLListViewItem * tqparentItem = static_cast<UMLListViewItem *>(item->tqparent());
-    const Uml::ListView_Type lvt = tqparentItem->getType();
+    UMLListViewItem * parentItem = static_cast<UMLListViewItem *>(item->tqparent());
+    const Uml::ListView_Type lvt = parentItem->getType();
     if (! Model_Utils::typeIsContainer(lvt)) {
         kError() << "UMLListView::createUMLObject(" << object->getName()
-            << "): tqparentItem (" << lvt << " is not a container" << endl;
+            << "): parentItem (" << lvt << " is not a container" << endl;
         delete object;
         return NULL;
     }
-    UMLPackage *pkg = static_cast<UMLPackage*>(tqparentItem->getUMLObject());
+    UMLPackage *pkg = static_cast<UMLPackage*>(parentItem->getUMLObject());
     object->setUMLPackage(pkg);
     pkg->addObject(object);
     connectNewObjectsSlots(object);
@@ -2198,15 +2198,15 @@ void UMLListView::createDiagram( UMLListViewItem * item, Uml::Diagram_Type type
         delete item;
         return;
     }
-    UMLListViewItem *tqparentItem = static_cast<UMLListViewItem*>(item->tqparent());
-    UMLFolder *tqparentFolder = dynamic_cast<UMLFolder*>(tqparentItem->getUMLObject());
-    if (tqparentFolder == NULL) {
+    UMLListViewItem *parentItem = static_cast<UMLListViewItem*>(item->tqparent());
+    UMLFolder *parentFolder = dynamic_cast<UMLFolder*>(parentItem->getUMLObject());
+    if (parentFolder == NULL) {
         kError() << "UMLListView::createDiagram(" << name
             << "): tqparent UMLObject is not a UMLFolder" << endl;
         delete item;
         return;
     }
-    view = new UMLView(tqparentFolder);
+    view = new UMLView(parentFolder);
     view->setName( name );
     view->setType( type );
     view->setID( UniqueID::gen() );
@@ -2223,7 +2223,7 @@ TQString UMLListView::getUniqueDiagramName(Uml::Diagram_Type type) {
 }
 
 bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) {
-    UMLListViewItem * tqparentItem = static_cast<UMLListViewItem *>( item -> tqparent() );
+    UMLListViewItem * parentItem = static_cast<UMLListViewItem *>( item -> tqparent() );
     Uml::ListView_Type type = item -> getType();
     switch( type ) {
     case Uml::lvt_Class_Diagram:
@@ -2283,10 +2283,10 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) {
     case Uml::lvt_Deployment_Folder:
     case Uml::lvt_EntityRelationship_Folder:
         {
-            Uml::ListView_Type lvt = tqparentItem->getType();
+            Uml::ListView_Type lvt = parentItem->getType();
             if (!Model_Utils::typeIsContainer(lvt))
                 return (m_doc->findUMLObject(name) == NULL);
-            UMLPackage *pkg = static_cast<UMLPackage*>(tqparentItem->getUMLObject());
+            UMLPackage *pkg = static_cast<UMLPackage*>(parentItem->getUMLObject());
             if (pkg == NULL) {
                 kError() << "UMLListView::isUnique: internal error - "
                     << "tqparent listviewitem is package but has no UMLObject" << endl;
@@ -2302,7 +2302,7 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) {
     case Uml::lvt_Operation:
     case Uml::lvt_EnumLiteral:
         {
-            UMLClassifier *tqparent = static_cast<UMLClassifier*>(tqparentItem->getUMLObject());
+            UMLClassifier *tqparent = static_cast<UMLClassifier*>(parentItem->getUMLObject());
             return (tqparent->findChildObject(name) == NULL);
             break;
         }
@@ -2401,16 +2401,16 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
             } else if (Model_Utils::typeIsFolder(lvType)) {
                 // Synthesize the UMLFolder here
                 UMLObject *umlParent = tqparent->getUMLObject();
-                UMLPackage *tqparentPkg = dynamic_cast<UMLPackage*>(umlParent);
-                if (tqparentPkg == NULL) {
+                UMLPackage *parentPkg = dynamic_cast<UMLPackage*>(umlParent);
+                if (parentPkg == NULL) {
                     kError() << pfx << "umlParent(" << umlParent << ") is not a UMLPackage"
                         << endl;
                     domElement = node.toElement();
                     continue;
                 }
                 UMLFolder *f = new UMLFolder(label, nID);
-                f->setUMLPackage(tqparentPkg);
-                tqparentPkg->addObject(f);
+                f->setUMLPackage(parentPkg);
+                parentPkg->addObject(f);
                 pObject = f;
                 item = new UMLListViewItem(tqparent, label, lvType, pObject);
                 // Moving all relevant UMLObjects to the new UMLFolder is done below,
@@ -2490,7 +2490,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
                     << tqparent->getText() << " (" << tqparent << ") != "
                     << itmParent->getText() << " (" << itmParent << ")" << endl;
                 if (item == m_datatypeFolder && itmParent == m_lv[Uml::mt_Logical]) {
-                    kDebug() << pfx << "Retqparenting the Datatypes folder is prohibited" << endl;
+                    kDebug() << pfx << "Reparenting the Datatypes folder is prohibited" << endl;
                 } else {
                     UMLListViewItem *newItem = moveObject(nID, lvType, tqparent);
                     item = newItem;
diff --git a/umbrello/umbrello/umlobject.cpp b/umbrello/umbrello/umlobject.cpp
index 776847d4..a1896839 100644
--- a/umbrello/umbrello/umlobject.cpp
+++ b/umbrello/umbrello/umlobject.cpp
@@ -723,13 +723,13 @@ bool UMLObject::loadFromXMI( TQDomElement & element) {
         if (m_bInPaste) {
             m_pUMLPackage = NULL;  // forget any old tqparent
             UMLListView *listView = UMLApp::app()->getListView();
-            UMLListViewItem *tqparentItem = (UMLListViewItem*)listView->currentItem();
-            if (tqparentItem) {
-                Uml::ListView_Type lvt = tqparentItem->getType();
+            UMLListViewItem *parentItem = (UMLListViewItem*)listView->currentItem();
+            if (parentItem) {
+                Uml::ListView_Type lvt = parentItem->getType();
                 if (Model_Utils::typeIsContainer(lvt) ||
                         lvt == Uml::lvt_Class ||
                         lvt == Uml::lvt_Interface) {
-                    UMLObject *o = tqparentItem->getUMLObject();
+                    UMLObject *o = parentItem->getUMLObject();
                     m_pUMLPackage = static_cast<UMLPackage*>( o );
                 }
             }
diff --git a/umbrello/umbrello/umlrole.cpp b/umbrello/umbrello/umlrole.cpp
index 5543415f..939b7167 100644
--- a/umbrello/umbrello/umlrole.cpp
+++ b/umbrello/umbrello/umlrole.cpp
@@ -23,10 +23,10 @@
 
 
 // constructor
-UMLRole::UMLRole(UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type role)
+UMLRole::UMLRole(UMLAssociation * tqparent, UMLObject * parentObj, Uml::Role_Type role)
         : UMLObject(const_cast<UMLAssociation*>(tqparent))
 {
-    init(tqparent, tqparentObj, role);
+    init(tqparent, parentObj, role);
 }
 
 UMLRole::~UMLRole() { }
@@ -88,11 +88,11 @@ Uml::Role_Type UMLRole::getRole() {
     return m_role;
 }
 
-void UMLRole::init(UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type r) {
+void UMLRole::init(UMLAssociation * tqparent, UMLObject * parentObj, Uml::Role_Type r) {
     m_BaseType = Uml::ot_Role;
     m_role = r;
     m_pAssoc = tqparent;
-    m_pSecondary = tqparentObj;
+    m_pSecondary = parentObj;
     m_Multi = "";
     m_Name = "";
     m_Changeability = Uml::chg_Changeable;
diff --git a/umbrello/umbrello/umlrole.h b/umbrello/umbrello/umlrole.h
index 4d750751..464e264e 100644
--- a/umbrello/umbrello/umlrole.h
+++ b/umbrello/umbrello/umlrole.h
@@ -31,10 +31,10 @@ public:
      * Sets up an association.
      *
      * @param tqparent    The tqparent (association) of this UMLRole.
-     * @param tqparentUMLObject The Parent UML Object 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 * tqparentUMLObject, Uml::Role_Type role);
+    UMLRole (UMLAssociation * tqparent, UMLObject * parentUMLObject, Uml::Role_Type role);
 
     /**
      * Overloaded '==' operator
@@ -118,7 +118,7 @@ protected:
 private:
 
     /** do some initialization at construction time */
-    void init (UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type r);
+    void init (UMLAssociation * tqparent, 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 c7b76087..17c3bb27 100644
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@@ -107,10 +107,10 @@ using namespace Uml;
 
 
 // constructor
-UMLView::UMLView(UMLFolder *tqparentFolder) : TQCanvasView(UMLApp::app()->getMainViewWidget()) {
+UMLView::UMLView(UMLFolder *parentFolder) : TQCanvasView(UMLApp::app()->getMainViewWidget()) {
     init();
     m_pDoc = UMLApp::app()->getDocument();
-    m_pFolder = tqparentFolder;
+    m_pFolder = parentFolder;
 }
 
 void UMLView::init() {
@@ -1149,16 +1149,16 @@ bool UMLView::isSavedInSeparateFile() {
                   << "listView->findUMLObject(this) returns false" << endl;
         return false;
     }
-    UMLListViewItem *tqparentItem = dynamic_cast<UMLListViewItem*>( lvItem->tqparent() );
-    if (tqparentItem == NULL) {
+    UMLListViewItem *parentItem = dynamic_cast<UMLListViewItem*>( lvItem->tqparent() );
+    if (parentItem == NULL) {
         kError() << msgPrefix
                   << "tqparent item in listview is not a UMLListViewItem (?)" << endl;
         return false;
     }
-    const Uml::ListView_Type lvt = tqparentItem->getType();
+    const Uml::ListView_Type lvt = parentItem->getType();
     if (! Model_Utils::typeIsFolder(lvt))
         return false;
-    UMLFolder *modelFolder = dynamic_cast<UMLFolder*>(tqparentItem->getUMLObject());
+    UMLFolder *modelFolder = dynamic_cast<UMLFolder*>(parentItem->getUMLObject());
     if (modelFolder == NULL) {
         kError() << msgPrefix
                   << "tqparent model object is not a UMLFolder (?)" << endl;
@@ -1955,8 +1955,8 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) {
     //       end if
     //     end loop
     //   end if
-    //   if the UMLCanvasObject has a tqparentPackage then
-    //     if the tqparentPackage has a widget representation on this view then
+    //   if the UMLCanvasObject has a parentPackage then
+    //     if the parentPackage has a widget representation on this view then
     //       create the containment AssocWidget
     //     end if
     //   end if
@@ -2072,11 +2072,11 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) {
             }
         }
     }
-    // if the UMLCanvasObject has a tqparentPackage then
+    // if the UMLCanvasObject has a parentPackage then
     UMLPackage *tqparent = umlObj->getUMLPackage();
     if (tqparent == NULL)
         return;
-    // if the tqparentPackage has a widget representation on this view then
+    // if the parentPackage has a widget representation on this view then
     Uml::IDType pkgID = tqparent->getID();
     UMLWidget *pWidget;
     UMLWidgetListIt wit(m_WidgetList);
diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h
index b6dad4fe..4cf51b7f 100644
--- a/umbrello/umbrello/umlview.h
+++ b/umbrello/umbrello/umlview.h
@@ -66,7 +66,7 @@ public:
     /**
      * Constructor
      */
-    UMLView(UMLFolder *tqparentFolder);
+    UMLView(UMLFolder *parentFolder);
 
     /**
      * Destructor
diff --git a/umbrello/umbrello/widget_factory.cpp b/umbrello/umbrello/widget_factory.cpp
index 5b068aa5..ea58e128 100644
--- a/umbrello/umbrello/widget_factory.cpp
+++ b/umbrello/umbrello/widget_factory.cpp
@@ -148,8 +148,8 @@ bool validateObjType(Uml::Object_Type expected, UMLObject* &o, Uml::IDType id) {
         if (o == NULL)
             return false;
         o->setID(id);
-        UMLPackage *tqparentPkg = o->getUMLPackage();
-        tqparentPkg->addObject(o);
+        UMLPackage *parentPkg = o->getUMLPackage();
+        parentPkg->addObject(o);
         return true;
     }
     Uml::Object_Type actual = o->getBaseType();
diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp
index a60c67de..4b64f575 100644
--- a/umbrello/umbrello/worktoolbar.cpp
+++ b/umbrello/umbrello/worktoolbar.cpp
@@ -26,8 +26,8 @@
 #include "worktoolbar.h"
 
 
-WorkToolBar::WorkToolBar(TQMainWindow *tqparentWindow, const char*name)
-        : KToolBar(tqparentWindow,TQt::DockRight,false,name) {
+WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name)
+        : KToolBar(parentWindow,TQt::DockRight,false,name) {
     m_CurrentButtonID = tbb_Undefined;
     loadPixmaps();
     m_Type = Uml::dt_Class; /* first time in just want it to load arrow,
diff --git a/umbrello/umbrello/worktoolbar.h b/umbrello/umbrello/worktoolbar.h
index 01b7c9a3..410644d2 100644
--- a/umbrello/umbrello/worktoolbar.h
+++ b/umbrello/umbrello/worktoolbar.h
@@ -47,9 +47,9 @@ public:
     /**
      * Creates a work tool bar.
      *
-     * @param tqparentWindow      The tqparent of the toolbar.
+     * @param parentWindow      The tqparent of the toolbar.
      */
-    WorkToolBar(TQMainWindow *tqparentWindow, const char *name);
+    WorkToolBar(TQMainWindow *parentWindow, const char *name);
 
     /**
      * Standard deconstructor.
-- 
cgit v1.2.1