TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

74 files changed, 469 insertions, 434 deletions

diff --git a/umbrello/umbrello/dialogs/activitydialog.h b/umbrello/umbrello/dialogs/activitydialog.h
index ccc746c3..f8dbe366 100644
--- a/umbrello/umbrello/dialogs/activitydialog.h
+++ b/umbrello/umbrello/dialogs/activitydialog.h
@@ -38,6 +38,7 @@ class ActivityWidget;
 
 class ActivityDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp
index 5a728576..10ccb04b 100644
--- a/umbrello/umbrello/dialogs/activitypage.cpp
+++ b/umbrello/umbrello/dialogs/activitypage.cpp
@@ -37,7 +37,7 @@ void ActivityPage::setupPage() {
 
     m_pActivityGB = new TQGroupBox(i18n("Activities"), this );
 
-    // vertical box layout for the activity lists, arrow buttons and the button box
+    // vertical box tqlayout for the activity lists, arrow buttons and the button box
     TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pActivityGB );
     listVBoxLayout -> setMargin(margin);
     listVBoxLayout -> setSpacing ( 10 );
@@ -69,10 +69,10 @@ void ActivityPage::setupPage() {
 
    
     KButtonBox* buttonBox = new KButtonBox(m_pActivityGB);
-    buttonBox->addButton( i18n("New Activity..."), this, TQT_SLOT(slotNewActivity()) );
+    buttonBox->addButton( i18n("New Activity..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewActivity()) );
     m_pDeleteActivityButton = buttonBox->addButton( i18n("Delete"),
-                              this, TQT_SLOT(slotDelete()) );
-    m_pRenameButton = buttonBox->addButton( i18n("Rename"), this, TQT_SLOT(slotRename()) );
+                              TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) );
+    m_pRenameButton = buttonBox->addButton( i18n("Rename"), TQT_TQOBJECT(this), TQT_SLOT(slotRename()) );
     listVBoxLayout->addWidget(buttonBox);
 
     mainLayout -> addWidget( m_pActivityGB );
diff --git a/umbrello/umbrello/dialogs/activitypage.h b/umbrello/umbrello/dialogs/activitypage.h
index 57a079e6..a6165a8a 100644
--- a/umbrello/umbrello/dialogs/activitypage.h
+++ b/umbrello/umbrello/dialogs/activitypage.h
@@ -28,6 +28,7 @@ class ListPopupMenu;
  */
 class ActivityPage : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      *  Constructor
diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp
index b093cae0..07c9e3af 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.cpp
+++ b/umbrello/umbrello/dialogs/assocgenpage.cpp
@@ -25,8 +25,8 @@
 #include "../association.h"
 #include "../dialog_utils.h"
 
-AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc)
-        : TQWidget(parent)
+AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc)
+        : TQWidget(tqparent)
 {
 
     m_pAssociationWidget = assoc;
diff --git a/umbrello/umbrello/dialogs/assocgenpage.h b/umbrello/umbrello/dialogs/assocgenpage.h
index 4cd34421..06c32c05 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.h
+++ b/umbrello/umbrello/dialogs/assocgenpage.h
@@ -42,16 +42,17 @@ class KComboBox;
  */
 class AssocGenPage : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
      *  Sets up the AssocGenPage.
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  parent  The parent to the AssocGenPage.
+     *  @param  tqparent  The tqparent to the AssocGenPage.
      *  @param  a       The AssociationWidget to display the properties of.
      */
-    AssocGenPage(UMLDoc *d, TQWidget *parent, AssociationWidget *a);
+    AssocGenPage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp
index feb193eb..425f01fe 100644
--- a/umbrello/umbrello/dialogs/assocpage.cpp
+++ b/umbrello/umbrello/dialogs/assocpage.cpp
@@ -14,7 +14,7 @@
 #include <klocale.h>
 #include "assocpropdlg.h"
 
-AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(parent) {
+AssocPage::AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o) : TQWidget(tqparent) {
     m_pObject = o;
     m_pView = v;
     int margin = fontMetrics().height();
@@ -25,12 +25,12 @@ AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(pa
     m_pAssocGB = new TQGroupBox(i18n("Associations"), this);
     mainLayout -> addWidget(m_pAssocGB);
 
-    TQHBoxLayout * layout = new TQHBoxLayout(m_pAssocGB);
-    layout -> setSpacing(10);
-    layout -> setMargin(margin);
+    TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pAssocGB);
+    tqlayout -> setSpacing(10);
+    tqlayout -> setMargin(margin);
 
     m_pAssocLB = new TQListBox(m_pAssocGB);
-    layout -> addWidget(m_pAssocLB);
+    tqlayout -> addWidget(m_pAssocLB);
     setMinimumSize(310, 330);
     fillListBox();
     m_pMenu = 0;
diff --git a/umbrello/umbrello/dialogs/assocpage.h b/umbrello/umbrello/dialogs/assocpage.h
index a38aa2ac..469dd35d 100644
--- a/umbrello/umbrello/dialogs/assocpage.h
+++ b/umbrello/umbrello/dialogs/assocpage.h
@@ -40,15 +40,16 @@
  */
 class AssocPage : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      *  Constructs an instance of AssocPage.
      *
-     *  @param  parent  The parent of the page
+     *  @param  tqparent  The tqparent of the page
      *  @param  v       The view the UMLObject being represented.
      *  @param  o       The UMLObject being represented
      */
-    AssocPage(TQWidget *parent, UMLView * v, UMLObject * o);
+    AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp
index 1d5b9c77..cf4f5b21 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp
@@ -35,14 +35,14 @@
 #include "../umlview.h"
 
 
-AssocPropDlg::AssocPropDlg (TQWidget *parent, AssociationWidget * assocWidget, int pageNum)
+AssocPropDlg::AssocPropDlg (TQWidget *tqparent, AssociationWidget * assocWidget, int pageNum)
         : KDialogBase(IconList, i18n("Association Properties"), Ok | Apply | Cancel | Help,
-                      Ok, parent, "_ASSOCPROPDLG_", true, true)
+                      Ok, tqparent, "_ASSOCPROPDLG_", true, true)
 {
     init();
     m_pAssoc = assocWidget;
 
-    m_pDoc = ((UMLApp *)parent) -> getDocument(); // needed?
+    m_pDoc = ((UMLApp *)tqparent) -> getDocument(); // needed?
 
     setupPages(assocWidget);
     showPage(pageNum);
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h
index 8fbbebe8..359add61 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.h
+++ b/umbrello/umbrello/dialogs/assocpropdlg.h
@@ -31,16 +31,17 @@ class UMLDoc;
  */
 class AssocPropDlg : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
      *  Sets up a Association Properties Dialog.
-     *  @param  parent  The parent of the AssocPropDlg
+     *  @param  tqparent  The tqparent of the AssocPropDlg
      *  @param  a       The Association Widget to display properties of.
      *  @param  pageNum The page to show first.
      */
 
-    AssocPropDlg(TQWidget *parent, AssociationWidget *a, int pageNum = 0);
+    AssocPropDlg(TQWidget *tqparent, AssociationWidget *a, int pageNum = 0);
 
     /**
      *  Standard deconstructor
diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp
index adb7dcc3..f603abee 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.cpp
+++ b/umbrello/umbrello/dialogs/assocrolepage.cpp
@@ -23,8 +23,8 @@
 // local includes
 #include "../dialog_utils.h"
 
-AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc)
-        : TQWidget(parent)
+AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc)
+        : TQWidget(tqparent)
 {
 
     m_pAssociationWidget = assoc;
@@ -228,7 +228,7 @@ void AssocRolePage::constructWidget() {
     // m_pDocB-> setEnabled(false);
     m_pDocB->setWordWrap(TQMultiLineEdit::WidgetWidth);
 
-    // add group boxes to main layout 
+    // add group boxes to main tqlayout 
     mainLayout -> addWidget( propsAGB, 0, 0);
     mainLayout -> addWidget( scopeABG, 1, 0);
     mainLayout -> addWidget(changeABG, 2, 0);
diff --git a/umbrello/umbrello/dialogs/assocrolepage.h b/umbrello/umbrello/dialogs/assocrolepage.h
index 440707cc..ada69b4f 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.h
+++ b/umbrello/umbrello/dialogs/assocrolepage.h
@@ -38,16 +38,17 @@
  */
 class AssocRolePage : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
      *  Sets up the AssocRolePage.
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  parent  The parent to the AssocRolePage.
+     *  @param  tqparent  The tqparent to the AssocRolePage.
      *  @param  a       The AssociationWidget to display the properties of.
      */
-    AssocRolePage(UMLDoc *d, TQWidget *parent, AssociationWidget *a);
+    AssocRolePage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp
index d633b6ae..7757b2d8 100644
--- a/umbrello/umbrello/dialogs/classgenpage.cpp
+++ b/umbrello/umbrello/dialogs/classgenpage.cpp
@@ -38,7 +38,7 @@
 #include "../umlview.h"
 #include "../stereotype.h"
 
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget(parent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLObject* o) : TQWidget(tqparent) {
     m_pWidget = 0;
     m_pObject = 0;
     m_pInstanceWidget = 0;
@@ -236,7 +236,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget
     //////////
 }
 
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWidget(parent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, ObjectWidget* o) : TQWidget(tqparent) {
     m_pObject = 0;
     m_pInstanceWidget = 0;
     m_pWidget = o;
@@ -301,7 +301,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWid
         connect( m_pDrawActorCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotActorToggled( bool ) ) );
 }
 
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget) : TQWidget(parent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget) : TQWidget(tqparent) {
     m_pWidget = 0;
     m_pObject = 0;
     m_pInstanceWidget = widget;
diff --git a/umbrello/umbrello/dialogs/classgenpage.h b/umbrello/umbrello/dialogs/classgenpage.h
index 4d661ae1..d6d06a50 100644
--- a/umbrello/umbrello/dialogs/classgenpage.h
+++ b/umbrello/umbrello/dialogs/classgenpage.h
@@ -38,35 +38,36 @@ class UMLDoc;
  */
 class ClassGenPage : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
      *  Sets up the ClassGenPage.
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  parent  The parent to the ClassGenPage.
+     *  @param  tqparent  The tqparent to the ClassGenPage.
      *  @param  o       The UMLObject to display the properties of.
      */
-    ClassGenPage(UMLDoc *d, TQWidget *parent, UMLObject * o);
+    ClassGenPage(UMLDoc *d, TQWidget *tqparent, UMLObject * o);
 
     /**
      *  Sets up the ClassGenPage for an ObjectWidget
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  parent  The parent to the ClassGenPage.
+     *  @param  tqparent  The tqparent to the ClassGenPage.
      *  @param  o       The ObjectWidget to display the properties of.
      */
-    ClassGenPage(UMLDoc *d, TQWidget *parent, ObjectWidget * o);
+    ClassGenPage(UMLDoc *d, TQWidget *tqparent, ObjectWidget * o);
 
     /**
      *  Sets up the ClassGenPage for a UMLWidget instance (used
      *  for component instances on deployment diagrams)
      *
      *  @param  d       The UMLDoc which controls controls object creation.
-     *  @param  parent  The parent to the ClassGenPage.
+     *  @param  tqparent  The tqparent to the ClassGenPage.
      *  @param  widget  The UMLWidget to display the properties of.
      */
-    ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget);
+    ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index e59956bc..df0efb41 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -29,8 +29,8 @@
 
 using namespace Uml;
 
-ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifier,
-                                       UMLDoc* doc, Uml::Object_Type type) : TQWidget(parent) {
+ClassifierListPage::ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier,
+                                       UMLDoc* doc, Uml::Object_Type type) : TQWidget(tqparent) {
     m_itemType = type;
     TQString typeName("");
     TQString newItemType("");
@@ -60,11 +60,11 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi
     int margin = fontMetrics().height();
     setMinimumSize(310,330);
 
-    //main layout contains our two group boxes, the list and the documentation
+    //main tqlayout contains our two group boxes, the list and the documentation
     TQVBoxLayout* mainLayout = new TQVBoxLayout( this );
     mainLayout->setSpacing(10);
 
-    //top group box, contains a vertical layout with list box above and buttons below
+    //top group box, contains a vertical tqlayout with list box above and buttons below
     m_pItemListGB = new TQGroupBox(typeName, this );
     TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pItemListGB );
     listVBoxLayout->setMargin(margin);
@@ -95,10 +95,10 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi
 
     //the action buttons
     KButtonBox* buttonBox = new KButtonBox(m_pItemListGB);
-    buttonBox->addButton( newItemType, this, TQT_SLOT(slotNewListItem()) );
+    buttonBox->addButton( newItemType, TQT_TQOBJECT(this), TQT_SLOT(slotNewListItem()) );
     m_pDeleteListItemButton = buttonBox->addButton( i18n("&Delete"),
-                              this, TQT_SLOT(slotDelete()) );
-    m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, TQT_SLOT(slotProperties()) );
+                              TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) );
+    m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()) );
     listVBoxLayout->addWidget(buttonBox);
 
     mainLayout->addWidget(m_pItemListGB);
@@ -201,7 +201,7 @@ void ClassifierListPage::slotClicked(TQListBoxItem*item) {
     // focus and so at least one item is always selected; this doesn't happen, if
     // there are no items of course;
     //
-    // for more information see Qt doc for void TQListBox::clearSelection()
+    // for more information see TQt doc for void TQListBox::clearSelection()
     UMLClassifierListItem* listItem;
     if (item == NULL) {
         if (m_pItemListLB->count() == 0) {
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h
index 1dba8297..7f0e298f 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.h
+++ b/umbrello/umbrello/dialogs/classifierlistpage.h
@@ -38,16 +38,17 @@ class UMLDoc;
  */
 class ClassifierListPage : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      *  Sets up the ClassifierListPage
      *
-     *  @param parent   The parent to the ClassAttPage.
+     *  @param tqparent   The tqparent to the ClassAttPage.
      *  @param classifier       The Concept to display the properties of.
      *      @param doc The UMLDoc document
      *      @param type The type of listItem this handles
      */
-    ClassifierListPage(TQWidget* parent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type);
+    ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classoptionspage.h b/umbrello/umbrello/dialogs/classoptionspage.h
index 718944cc..e9c81525 100644
--- a/umbrello/umbrello/dialogs/classoptionspage.h
+++ b/umbrello/umbrello/dialogs/classoptionspage.h
@@ -23,7 +23,7 @@ class ClassifierWidget;
 
 /**
  * A dialog page to display options for a @ref UMLWidget and its
- * children.  This is not normally called by you.  It is used by
+ * tqchildren.  This is not normally called by you.  It is used by
  * the @ref ClassPropDlg.
  *
  * @short A dialog page to display the options for a UMLWidget.
diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp
index 169de20e..1b744ca0 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/classpropdlg.cpp
@@ -33,9 +33,9 @@
 #include "../uml.h"
 #include "../umlview.h"
 
-ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLObject * c, int pageNum, bool assoc)
+ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLObject * c, int pageNum, bool assoc)
         : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
-              Ok, parent, "_CLASSDLG_", true, true) {
+              Ok, tqparent, "_CLASSDLG_", true, true) {
     m_pWidget = 0;
     m_pGenPage = 0;
     m_pAttPage = 0;
@@ -52,9 +52,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLObject * c, int pageNum, bool as
     showPage(pageNum);
 }
 
-ClassPropDlg::ClassPropDlg(TQWidget *parent, ObjectWidget * o)
+ClassPropDlg::ClassPropDlg(TQWidget *tqparent, ObjectWidget * o)
         : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
-              Ok, parent, "_CLASSDLG_", true, true) {
+              Ok, tqparent, "_CLASSDLG_", true, true) {
     m_pWidget = o;
     m_pGenPage = 0;
     m_pAttPage = 0;
@@ -82,9 +82,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *parent, ObjectWidget * o)
     setMinimumSize(340,420);
 }
 
-ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLWidget * w)
+ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLWidget * w)
         : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
-              Ok, parent, "_CLASSDLG_", true, true) {
+              Ok, tqparent, "_CLASSDLG_", true, true) {
     m_pWidget = w;
     m_pGenPage = 0;
     m_pAttPage = 0;
@@ -95,7 +95,7 @@ ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLWidget * w)
     m_pOptionsPage = 0;
     m_Type = pt_Widget;
     m_pObject = w -> getUMLObject();
-    m_pDoc = ((UMLApp *)parent) -> getDocument();
+    m_pDoc = ((UMLApp *)tqparent) -> getDocument();
 
     if (w->getBaseType() == Uml::wt_Class
             || w->getBaseType() == Uml::wt_Interface
diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h
index 6a107ad7..afb89f46 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.h
+++ b/umbrello/umbrello/dialogs/classpropdlg.h
@@ -40,32 +40,33 @@ class UMLWidget;
  */
 class ClassPropDlg : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      *  Sets up a ClassPropDlg.
      *
-     *  @param  parent  The parent of the ClassPropDlg
+     *  @param  tqparent  The tqparent of the ClassPropDlg
      *  @param  c       The UMLObject to display properties of.
      *  @param  pageNum The page to show first.
      *  @param assoc    Determines whether to display associations
      */
-    ClassPropDlg(TQWidget *parent, UMLObject *c, int pageNum = 0, bool assoc = false);
+    ClassPropDlg(TQWidget *tqparent, UMLObject *c, int pageNum = 0, bool assoc = false);
 
     /**
      *  Sets up a ClassPropDlg.
      *
-     *  @param  parent  The parent of the ClassPropDlg
+     *  @param  tqparent  The tqparent of the ClassPropDlg
      *  @param  o       The ObjectWidget to display properties of.
      */
-    ClassPropDlg(TQWidget *parent, ObjectWidget * o);
+    ClassPropDlg(TQWidget *tqparent, ObjectWidget * o);
 
     /**
      *  Sets up a ClassPropDlg.
      *
-     *  @param  parent  The parent of the ClassPropDlg
+     *  @param  tqparent  The tqparent of the ClassPropDlg
      *  @param  o       The UMLWidget to display properties of.
      */
-    ClassPropDlg(TQWidget *parent, UMLWidget * o);
+    ClassPropDlg(TQWidget *tqparent, UMLWidget * o);
 
 
     /**
diff --git a/umbrello/umbrello/dialogs/classwizard.cpp b/umbrello/umbrello/dialogs/classwizard.cpp
index c49e418f..1cabe1b2 100644
--- a/umbrello/umbrello/dialogs/classwizard.cpp
+++ b/umbrello/umbrello/dialogs/classwizard.cpp
@@ -26,7 +26,7 @@
 #include "../umlclassifierlistitemlist.h"
 #include "../classifierlistitem.h"
 
-ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> parent(), "_CLASSWIZARD_", true) {
+ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> tqparent(), "_CLASSWIZARD_", true) {
     m_pDoc = pDoc;
     //create a unique class to start with
     UMLObject * pTemp = 0;
diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp
index 9fe17afc..b4533d83 100644
--- a/umbrello/umbrello/dialogs/codeeditor.cpp
+++ b/umbrello/umbrello/dialogs/codeeditor.cpp
@@ -55,16 +55,16 @@
 #include "umlroledialog.h"
 #include "umloperationdialog.h"
 
-CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * parent, const char * name , CodeDocument * doc)
-        : TQTextEdit ( text, context, parent, name)
+CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * tqparent, const char * name , CodeDocument * doc)
+        : TQTextEdit ( text, context, tqparent, name)
 {
-    init(parent, doc);
+    init(tqparent, doc);
 }
 
-CodeEditor::CodeEditor ( CodeViewerDialog * parent, const char* name, CodeDocument * doc )
-        : TQTextEdit ( parent, name )
+CodeEditor::CodeEditor ( CodeViewerDialog * tqparent, const char* name, CodeDocument * doc )
+        : TQTextEdit ( tqparent, name )
 {
-    init(parent, doc);
+    init(tqparent, doc);
 }
 
 /*
@@ -129,7 +129,7 @@ void CodeEditor::doubleClicked(int para, int pos)
 
 }
 
-// allow us to edit, as appropriate, the parent UMLObject of the
+// allow us to edit, as appropriate, the tqparent UMLObject of the
 // given text block.
 void CodeEditor::editTextBlock(TextBlock * tBlock, int para) {
 
@@ -168,7 +168,7 @@ void CodeEditor::editTextBlock(TextBlock * tBlock, int para) {
                 }
                 else
                 {
-                    kError()<<" CodeViewerDlg ERROR: UNKNOWN parent for textBlock"<<endl;
+                    kError()<<" CodeViewerDlg ERROR: UNKNOWN tqparent for textBlock"<<endl;
                 }
 
             }
@@ -223,7 +223,7 @@ void CodeEditor::loadFromDocument ()
 
 }
 
-void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine)
+void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine)
 {
 
     // set some params
@@ -247,24 +247,24 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl
 
     // now do 'paragraph' background highlighting
     //        int endLine = paragraphs()-2;
-    int endLine = text.contains(TQRegExp("\n")) + startLine -1;
+    int endLine = text.tqcontains(TQRegExp("\n")) + startLine -1;
     if(m_isHighlighted)
         for(int para=startLine;para<=endLine;para++)
             setParagraphBackgroundColor(para,bgcolor);
 
     // record paragraph information
-    // Did we already start recording info for this parent object?
+    // Did we already start recording info for this tqparent object?
     TextBlockInfo * tbinfo;
-    if(m_tbInfoMap->contains(parent))
-        tbinfo = (*m_tbInfoMap)[parent];
+    if(m_tbInfoMap->tqcontains(tqparent))
+        tbinfo = (*m_tbInfoMap)[tqparent];
     else {
         tbinfo = new TextBlockInfo();
         tbinfo->displayName = displayName;
-        tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(parent) ? true : false;
-        m_tbInfoMap->insert(parent,tbinfo);
+        tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(tqparent) ? true : false;
+        m_tbInfoMap->insert(tqparent,tbinfo);
     }
 
-    // set a parent, if its not already set
+    // set a tqparent, if its not already set
     if(umlobj && !tbinfo->getParent())
     {
         tbinfo->displayName = displayName;
@@ -272,13 +272,13 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl
         tbinfo->isClickable = textBlockIsClickable(umlobj);
     }
 
-    // now mark all lines that we just inserted as belonging to the parent
+    // now mark all lines that we just inserted as belonging to the tqparent
     for(int para=startLine;para<=endLine;para++)
-        m_textBlockList.insert(para,parent);
+        m_textBlockList.insert(para,tqparent);
 
     // lastly, update the para info
-    // start position is relative to the FIRST parent position
-    int start = startLine - m_textBlockList.findRef(parent);
+    // start position is relative to the FIRST tqparent position
+    int start = startLine - m_textBlockList.tqfindRef(tqparent);
     int size = endLine-startLine;
 
     // create the object that records this particular "paragraph"
@@ -293,7 +293,7 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl
     {
         // now we have to fix the 'start' value for all the para
         // info blocks that coorspond to textblocks that we inserted
-        // inside of. This means parent tblock paragraph locations
+        // inside of. This means tqparent tblock paragraph locations
         // that are greater than zero in that type of textblock
 
         int increase = size + 1;
@@ -302,7 +302,7 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl
         {
             TextBlock * tblock = it.key();
             TextBlockInfo * thisTbInfo = it.data();
-            int firstLoc = m_textBlockList.findRef(tblock);
+            int firstLoc = m_textBlockList.tqfindRef(tblock);
             ParaInfo * lastPi = thisTbInfo->m_paraList.last();
 
             for(ParaInfo * pi = thisTbInfo->m_paraList.first(); pi; pi = thisTbInfo->m_paraList.next())
@@ -353,7 +353,7 @@ void CodeEditor::appendText(TextBlockList * items)
             appendText(cb);
         /*
                         // no! shouldn't be any 'naked' comments floating about. Always
-                        // are assocated with a parent code block
+                        // are assocated with a tqparent code block
                         else if ( (cm = dynamic_cast<CodeComment*>(tb)) )
                                 appendText(cm);
         */
@@ -363,7 +363,7 @@ void CodeEditor::appendText(TextBlockList * items)
 
 }
 
-void CodeEditor::appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj , const TQString & componentName)
+void CodeEditor::appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj , const TQString & componentName)
 {
 
     if(!comment->getWriteOutText() && !m_showHiddenBlocks)
@@ -376,7 +376,7 @@ void CodeEditor::appendText (CodeComment * comment, TextBlock * parent, UMLObjec
     TQString indent = comment->getIndentationString();
     TQString text = comment->toString(); // use comment formatting, NOT formatMultiLineText(comment->toString(), indent, "\n");
     if(!StringIsBlank(text))
-        insert(text,parent,true,getState().fontColor, bgcolor, umlObj, componentName);
+        insert(text,tqparent,true,getState().fontColor, bgcolor, umlObj, componentName);
 
 }
 
@@ -409,28 +409,28 @@ void CodeEditor::appendText (CodeClassFieldDeclarationBlock * db ) {
     TQString indent = db->getIndentationString();
     TQString body = db->formatMultiLineText (db->getText(), indent, "\n");
 
-    UMLObject * parentObj = db->getParentClassField()->getParentObject();
+    UMLObject * tqparentObj = db->getParentClassField()->getParentObject();
 
     TQColor bgcolor = getState().editBlockColor;
     TQString componentName = TQString("");
-    if(parentObj)
+    if(tqparentObj)
     {
-        if(db->getParentClassField()->parentIsAttribute()) {
-            componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ')';
+        if(db->getParentClassField()->tqparentIsAttribute()) {
+            componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ')';
         } else {
-            UMLRole * role = dynamic_cast<UMLRole*>(parentObj);
-            componentName = parentDocName + "::association_field(" + role->getName() + ')';
+            UMLRole * role = dynamic_cast<UMLRole*>(tqparentObj);
+            componentName = tqparentDocName + "::association_field(" + role->getName() + ')';
         }
         bgcolor = getState().umlObjectColor;
     }
 
-    appendText(db->getComment(), db, parentObj,componentName);
+    appendText(db->getComment(), db, tqparentObj,componentName);
 
     if(!db->getWriteOutText() && m_showHiddenBlocks)
         bgcolor = getState().hiddenColor;
 
     if(!StringIsBlank(body))
-        insert(body,db,false,getState().fontColor,bgcolor,parentObj);
+        insert(body,db,false,getState().fontColor,bgcolor,tqparentObj);
 
 
 }
@@ -460,42 +460,42 @@ void CodeEditor::appendText (CodeMethodBlock * mb) {
         bgcolor = getState().hiddenColor;
     }
 
-    TQString componentName = TQString("<b>parentless method\?</b>");
+    TQString componentName = TQString("<b>tqparentless method\?</b>");
 
-    // ugly, but we need to know if there is a parent object here.
+    // 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 * parentObj = 0;
+    UMLObject * tqparentObj = 0;
     if(op)
     {
-        parentObj = op->getParentOperation();
-        if(((UMLOperation*)parentObj)->isConstructorOperation())
-            componentName = parentDocName + "::operation("+ parentObj->getName()+") constructor method";
+        tqparentObj = op->getParentOperation();
+        if(((UMLOperation*)tqparentObj)->isConstructorOperation())
+            componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") constructor method";
         else
-            componentName = parentDocName + "::operation("+ parentObj->getName()+") method";
+            componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") method";
     }
     if(accessor)
     {
-        parentObj = accessor->getParentObject();
-        if(accessor->getParentClassField()->parentIsAttribute()) {
-            componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ") accessor method";
+        tqparentObj = accessor->getParentObject();
+        if(accessor->getParentClassField()->tqparentIsAttribute()) {
+            componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ") accessor method";
         } else {
-            UMLRole * role = dynamic_cast<UMLRole*>(parentObj);
-            componentName = parentDocName + "::association_field(" + role->getName() + ") accessor method";
+            UMLRole * role = dynamic_cast<UMLRole*>(tqparentObj);
+            componentName = tqparentDocName + "::association_field(" + role->getName() + ") accessor method";
         }
 
     }
 
-    //appendText(mb->getComment(), mb, parentObj, componentName);
-    appendText(mb->getComment(), mb->getComment(), parentObj, componentName);
+    //appendText(mb->getComment(), mb, tqparentObj, componentName);
+    appendText(mb->getComment(), mb->getComment(), tqparentObj, componentName);
 
     if(!StringIsBlank(startText))
-        insert(startText,mb,false,getState().fontColor,bgcolor,parentObj);
+        insert(startText,mb,false,getState().fontColor,bgcolor,tqparentObj);
     // 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,parentObj);
+    insert(body,mb,true,getState().fontColor,bgcolor,tqparentObj);
     if(!StringIsBlank(endText))
-        insert(endText,mb,false,getState().fontColor,bgcolor,parentObj);
+        insert(endText,mb,false,getState().fontColor,bgcolor,tqparentObj);
 
 }
 
@@ -520,22 +520,22 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock)
         return;
 
     OwnedHierarchicalCodeBlock * test = dynamic_cast<OwnedHierarchicalCodeBlock *>(hblock);
-    UMLObject * parentObj = 0;
+    UMLObject * tqparentObj = 0;
     TQString componentName = TQString("");
     TQColor paperColor = getState().nonEditBlockColor;
     if(test)
     {
-        parentObj = test->getParentObject();
-        UMLClassifier *c = dynamic_cast<UMLClassifier*>(parentObj);
+        tqparentObj = test->getParentObject();
+        UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparentObj);
         if (c) {
             TQString typeStr;
             if (c->isInterface())
                 typeStr = "Interface";
             else
                 typeStr = "Class";
-            componentName = parentDocName + "::" + typeStr + '(' + parentObj->getName() + ')';
+            componentName = tqparentDocName + "::" + typeStr + '(' + tqparentObj->getName() + ')';
         } else {
-            componentName = parentDocName + "::UNKNOWN(" + parentObj->getName() + ')';
+            componentName = tqparentDocName + "::UNKNOWN(" + tqparentObj->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, parentObj, componentName);
+    appendText(hblock->getComment(), hblock, tqparentObj, componentName);
 
     if(!StringIsBlank(startText))
-        insert(startText,hblock,false,getState().fontColor,paperColor, parentObj);
+        insert(startText,hblock,false,getState().fontColor,paperColor, tqparentObj);
     appendText(items);
     if(!StringIsBlank(endText))
         insert(endText,hblock,false,getState().fontColor,paperColor);
@@ -621,7 +621,7 @@ void CodeEditor::slotInsertCodeBlockBeforeSelected()
 
     m_parentDoc->insertTextBlock(newBlock, tb, false);
 
-    int location = m_textBlockList.findRef(m_selectedTextBlock); // find first para of selected block
+    int location = m_textBlockList.tqfindRef(m_selectedTextBlock); // find first para of selected block
 
     TQString body = newBlock->formatMultiLineText (newBlock->getText(), newBlock->getIndentationString(), "\n");
 
@@ -643,7 +643,7 @@ void CodeEditor::slotInsertCodeBlockAfterSelected()
     // find last para of selected block
     TextBlockInfo *tbinfo = (*m_tbInfoMap)[m_selectedTextBlock];
     ParaInfo * lastpi = tbinfo->m_paraList.last();
-    int location = m_textBlockList.findRef(m_selectedTextBlock) + lastpi->start + lastpi->size + 1;
+    int location = m_textBlockList.tqfindRef(m_selectedTextBlock) + lastpi->start + lastpi->size + 1;
 
     TQString body = newBlock->formatMultiLineText (newBlock->getText(), newBlock->getIndentationString(), "\n");
 
@@ -659,7 +659,7 @@ TQPopupMenu * CodeEditor::createPopupMenu ( const TQPoint & pos )
     m_lastPara = paragraphAt(pos);
 
     TQPopupMenu * menu = new TQPopupMenu(this);
-    // ugh. A bug in the Qt interaction between TQTextEdit and Menu
+    // ugh. A bug in the TQt interaction between TQTextEdit and Menu
     // can sometimes trigger a clear() call of the text area after
     // the popup menu is destroyed. The workaround is to disable
     // the behavior by blocking the destroy signal from the menu.
@@ -774,13 +774,13 @@ void CodeEditor::slotRedrawText() {
     rebuildView(m_lastPara);
 }
 
-void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) {
+void CodeEditor::init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc ) {
 
     // safety to insure that we are up to date
-    parentDoc->synchronize();
+    tqparentDoc->synchronize();
 
-    m_parentDlg = parentDlg;
-    m_parentDoc = parentDoc;
+    m_parentDlg = tqparentDlg;
+    m_parentDoc = tqparentDoc;
 
     setUndoRedoEnabled( false );
     setCursor( TQCursor( 0 ) );
@@ -798,12 +798,12 @@ void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc )
 
     setFont( getState().font );
 
-    // set name of parent doc
+    // set name of tqparent doc
     ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(m_parentDoc);
     if(cdoc)
-        parentDocName = cdoc->getParentClassifier()->getName();
+        tqparentDocName = cdoc->getParentClassifier()->getName();
     else
-        parentDocName = "";
+        tqparentDocName = "";
 
     // set some viewability parameters
     //int margin = fontMetrics().height();
@@ -832,8 +832,8 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) {
         TQString baseIndent = block->getIndentationString(block->getIndentationLevel()+(cmb ? 1 : 0));
 
         TextBlockInfo *info = (*m_tbInfoMap)[block];
-        UMLObject * parentObj = info->getParent();
-        int pstart = m_textBlockList.findRef(block);
+        UMLObject * tqparentObj = info->getParent();
+        int pstart = m_textBlockList.tqfindRef(block);
         TQString content = "";
 
         // Assemble content from editiable paras
@@ -860,10 +860,10 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) {
         //cerr<<"UPDATE GOT CONTENT:["<<content.latin1()<<"] to block:"<<block<<endl;
         block->setText(content);
 
-        // if a parent for the block, try to set its documentation
+        // if a tqparent for the block, try to set its documentation
         // as long as its NOT an accessor codeblock.
-        if(parentObj && !info->isCodeAccessorMethod)
-            parentObj->setDoc(content);
+        if(tqparentObj && !info->isCodeAccessorMethod)
+            tqparentObj->setDoc(content);
 
         // make note that its now user generated
         if(cmb)
@@ -913,7 +913,7 @@ void CodeEditor::cursorPositionChanged(int para, int pos)
         int minPos = baseIndent.length();
 
         // add indent chars to the current line, if missing
-        if(!m_backspacePressed && !currentParaText.contains(TQRegExp('^'+baseIndent)))
+        if(!m_backspacePressed && !currentParaText.tqcontains(TQRegExp('^'+baseIndent)))
         {
             insertAt(baseIndent,para,0);
             setCursorPosition(para,pos+minPos);
@@ -957,7 +957,7 @@ void CodeEditor::cursorPositionChanged(int para, int pos)
 
                     // furthermore, IF its nothing but indentation + whitespace
                     // we switch this back to Auto-Generated.
-                    if(cmb && contents.contains(TQRegExp('^'+baseIndent+"\\s$")))
+                    if(cmb && contents.tqcontains(TQRegExp('^'+baseIndent+"\\s$")))
                     {
                         cmb->setContentType(CodeBlock::AutoGenerated);
                         cmb->syncToParent();
@@ -1006,7 +1006,7 @@ bool CodeEditor::paraIsNotSingleLine (int para)
     TextBlock * tBlock = m_textBlockList.at(para);
     if(tBlock)
     {
-        int pstart = m_textBlockList.findRef(tBlock);
+        int pstart = m_textBlockList.tqfindRef(tBlock);
         TextBlockInfo *info = (*m_tbInfoMap)[tBlock];
         TQPtrList<ParaInfo> list = info->m_paraList;
 
@@ -1030,7 +1030,7 @@ bool CodeEditor::isParaEditable (int para) {
         int editEnd = tBlock->lastEditableLine();
         bool hasEditableRange = (editStart > 0 || editEnd < 0) ? true : false;
         TextBlockInfo *info = (*m_tbInfoMap)[tBlock];
-        int pstart = m_textBlockList.findRef(tBlock);
+        int pstart = m_textBlockList.tqfindRef(tBlock);
         int relativeLine = para - pstart;
         TQPtrList<ParaInfo> list = info->m_paraList;
         for(ParaInfo * item = list.first(); item; item=list.next())
@@ -1055,7 +1055,7 @@ void CodeEditor::changeTextBlockHighlighting(TextBlock * tBlock, bool selected)
     {
         TextBlockInfo *info = (*m_tbInfoMap)[tBlock];
         TQPtrList<ParaInfo> list = info->m_paraList;
-        int pstart = m_textBlockList.findRef(tBlock);
+        int pstart = m_textBlockList.tqfindRef(tBlock);
         for(ParaInfo * item = list.first(); item; item=list.next())
             for(int p=(item->start+pstart);p<=(item->start+pstart+item->size);p++)
                 if(selected)
@@ -1113,7 +1113,7 @@ void CodeEditor::contractSelectedParagraph( int paraToRemove ) {
     TextBlock * tBlock = m_textBlockList.at(paraToRemove);
     if(tBlock)
     {
-        int pstart = m_textBlockList.findRef(tBlock);
+        int pstart = m_textBlockList.tqfindRef(tBlock);
         TextBlockInfo *info = (*m_tbInfoMap)[tBlock];
         TQPtrList<ParaInfo> list = info->m_paraList;
 
@@ -1149,7 +1149,7 @@ void CodeEditor::expandSelectedParagraph( int priorPara ) {
         m_textBlockList.insert(priorPara,tBlock);
         TextBlockInfo *info = (*m_tbInfoMap)[tBlock];
         TQPtrList<ParaInfo> list = info->m_paraList;
-        int pstart = m_textBlockList.findRef(tBlock);
+        int pstart = m_textBlockList.tqfindRef(tBlock);
 
         // now update the paragraph information
         bool upStartPosition = false;
diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h
index 5956e3ab..b430b27d 100644
--- a/umbrello/umbrello/dialogs/codeeditor.h
+++ b/umbrello/umbrello/dialogs/codeeditor.h
@@ -40,13 +40,14 @@ class TextBlockInfo;
 class TextBlock;
 class ParaInfo;
 
-class CodeEditor : public QTextEdit
+class CodeEditor : public TQTextEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
-    explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * parent = 0, const char * name = 0 , CodeDocument * doc = 0);
-    explicit CodeEditor ( CodeViewerDialog * parent, const char* name = 0, CodeDocument * doc = 0);
+    explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * tqparent = 0, const char * name = 0 , CodeDocument * doc = 0);
+    explicit CodeEditor ( CodeViewerDialog * tqparent, const char* name = 0, CodeDocument * doc = 0);
     ~CodeEditor ();
 
     // return code viewer state
@@ -62,7 +63,7 @@ protected:
     void appendText (CodeClassFieldDeclarationBlock * db );
     void appendText (TextBlockList * items);
     void appendText (CodeMethodBlock * mb);
-    void appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj = 0, const TQString & compName="");
+    void appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj = 0, const TQString & compName="");
     void appendText (CodeBlockWithComments * cb );
 
     // Rebuild our view of the document. Happens whenever we change
@@ -82,7 +83,7 @@ protected:
     // and 'return' events.
     void keyPressEvent ( TQKeyEvent * e );
 
-    // (re) load the parent code document into the editor
+    // (re) load the tqparent code document into the editor
     void loadFromDocument();
 
     // specialized popup menu for our tool
@@ -90,7 +91,7 @@ protected:
 
 private:
 
-    TQString parentDocName;
+    TQString tqparentDocName;
     CodeDocument * m_parentDoc;
     CodeViewerDialog * m_parentDlg;
 
@@ -110,7 +111,7 @@ private:
     TextBlockList m_textBlockList;
 
     // main insert routine. Will append if startline is not supplied.
-    void insert (const TQString & text, TextBlock * parent, bool isEditable = false,
+    void insert (const TQString & text, TextBlock * tqparent, bool isEditable = false,
                  const TQColor & fgcolor = TQColor("black"), const TQColor & bgcolor = TQColor("white"),
                  UMLObject * umlobj = 0, const TQString & displayName = "", int startLine = -1);
 
@@ -123,7 +124,7 @@ private:
     void updateTextBlockFromText (TextBlock * block);
 
     void initText ( CodeDocument * doc );
-    void init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc );
+    void init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc );
 
     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 f0df1e17..24fea3fa 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>CodeGenerationOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CodeGenerationOptionsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -27,7 +27,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
@@ -42,7 +42,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -53,15 +53,15 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout1</cstring>
+                            <cstring>tqlayout1</cstring>
                         </property>
                         <vbox>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>m_SelectLanguageGroup</cstring>
                                 </property>
@@ -78,14 +78,14 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QComboBox">
+                                    <widget class="TQComboBox">
                                         <property name="name">
                                             <cstring>m_SelectLanguageBox</cstring>
                                         </property>
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>GroupBox1</cstring>
                                 </property>
@@ -102,7 +102,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                                    <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                                         <property name="name">
                                             <cstring>TextLabel2</cstring>
                                         </property>
@@ -110,7 +110,7 @@
                                             <string>Write all generated files to folder:</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton" row="1" column="2">
+                                    <widget class="TQPushButton" row="1" column="2">
                                         <property name="name">
                                             <cstring>m_browseOutput</cstring>
                                         </property>
@@ -118,7 +118,7 @@
                                             <string>Bro&amp;wse...</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton" row="3" column="2">
+                                    <widget class="TQPushButton" row="3" column="2">
                                         <property name="name">
                                             <cstring>m_browseHeadings</cstring>
                                         </property>
@@ -126,7 +126,7 @@
                                             <string>B&amp;rowse...</string>
                                         </property>
                                     </widget>
-                                    <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+                                    <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
                                         <property name="name">
                                             <cstring>m_includeHeadings</cstring>
                                         </property>
@@ -137,7 +137,7 @@
                                             <bool>true</bool>
                                         </property>
                                     </widget>
-                                    <widget class="QLineEdit" row="1" column="1">
+                                    <widget class="TQLineEdit" row="1" column="1">
                                         <property name="name">
                                             <cstring>m_outputDir</cstring>
                                         </property>
@@ -145,7 +145,7 @@
                                             <string>Files generated by Code Generator will be written to this folder</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLineEdit" row="3" column="1">
+                                    <widget class="TQLineEdit" row="3" column="1">
                                         <property name="name">
                                             <cstring>m_headingsDir</cstring>
                                         </property>
@@ -163,7 +163,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>30</width>
                                                 <height>20</height>
@@ -180,7 +180,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>30</width>
                                                 <height>20</height>
@@ -189,7 +189,7 @@
                                     </spacer>
                                 </grid>
                             </widget>
-                            <widget class="QButtonGroup">
+                            <widget class="TQButtonGroup">
                                 <property name="name">
                                     <cstring>m_overwriteGroup</cstring>
                                 </property>
@@ -206,7 +206,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>TextLabel1</cstring>
                                         </property>
@@ -215,7 +215,7 @@
 generator wants to use as output file already exists:</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>m_overwrite</cstring>
                                         </property>
@@ -226,7 +226,7 @@ generator wants to use as output file already exists:</string>
                                             <string>Overwrite existing files if they exist in the destination folder</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>m_ask</cstring>
                                         </property>
@@ -240,7 +240,7 @@ generator wants to use as output file already exists:</string>
                                             <string>If a file with the same name already exists, ask what to do</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton">
+                                    <widget class="TQRadioButton">
                                         <property name="name">
                                             <cstring>m_changeName</cstring>
                                         </property>
@@ -257,7 +257,7 @@ generator wants to use as output file already exists:</string>
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -268,15 +268,15 @@ generator wants to use as output file already exists:</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="0" column="0">
+                    <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout8</cstring>
+                            <cstring>tqlayout8</cstring>
                         </property>
                         <grid>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QGroupBox" row="1" column="0">
+                            <widget class="TQGroupBox" row="1" column="0">
                                 <property name="name">
                                     <cstring>groupBox5</cstring>
                                 </property>
@@ -297,7 +297,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
@@ -314,7 +314,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
@@ -331,14 +331,14 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QLabel" row="2" column="1">
+                                    <widget class="TQLabel" row="2" column="1">
                                         <property name="name">
                                             <cstring>textLabel3</cstring>
                                         </property>
@@ -346,7 +346,7 @@ generator wants to use as output file already exists:</string>
                                             <string>Line ending style:</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2">
+                                    <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="2">
                                         <property name="name">
                                             <cstring>textLabel1</cstring>
                                         </property>
@@ -354,7 +354,7 @@ generator wants to use as output file already exists:</string>
                                             <string>Indentation type:</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="1" column="1" rowspan="1" colspan="3">
+                                    <widget class="TQLabel" row="1" column="1" rowspan="1" colspan="3">
                                         <property name="name">
                                             <cstring>textLabel2</cstring>
                                         </property>
@@ -362,7 +362,7 @@ generator wants to use as output file already exists:</string>
                                             <string>Indentation amount:</string>
                                         </property>
                                     </widget>
-                                    <widget class="QComboBox" row="2" column="2" rowspan="1" colspan="3">
+                                    <widget class="TQComboBox" row="2" column="2" rowspan="1" colspan="3">
                                         <item>
                                             <property name="text">
                                                 <string>*NIX ("\n")</string>
@@ -382,7 +382,7 @@ generator wants to use as output file already exists:</string>
                                             <cstring>m_SelectEndLineCharsBox</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QComboBox" row="0" column="3" rowspan="1" colspan="2">
+                                    <widget class="TQComboBox" row="0" column="3" rowspan="1" colspan="2">
                                         <item>
                                             <property name="text">
                                                 <string>No Indentation</string>
@@ -409,18 +409,18 @@ generator wants to use as output file already exists:</string>
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget class="QGroupBox" row="0" column="0">
+                            <widget class="TQGroupBox" row="0" column="0">
                                 <property name="name">
                                     <cstring>GroupBox3</cstring>
                                 </property>
                                 <property name="title">
                                     <string>Comment Verbosity</string>
                                 </property>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>m_forceSections</cstring>
                                     </property>
-                                    <property name="geometry">
+                                    <property name="tqgeometry">
                                         <rect>
                                             <x>10</x>
                                             <y>60</y>
@@ -436,11 +436,11 @@ is empty</string>
                                         <string>Writes comments to indicate the different sections (public, private etc) in a class, even if the sections are empty</string>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>m_forceDoc</cstring>
                                     </property>
-                                    <property name="geometry">
+                                    <property name="tqgeometry">
                                         <rect>
                                             <x>11</x>
                                             <y>29</y>
@@ -460,7 +460,7 @@ is empty</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -471,7 +471,7 @@ is empty</string>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QFrame" row="0" column="0">
+                    <widget class="TQFrame" row="0" column="0">
                         <property name="name">
                             <cstring>languageOptionsFrame</cstring>
                         </property>
@@ -521,11 +521,11 @@ is empty</string>
         <slot>activeLanguageChanged(int)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected">browseClicked()</slot>
     <slot access="protected">activeLanguageChanged(int id)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
index 8fdb046c..ab54eb3d 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
@@ -37,8 +37,8 @@
 #include <tqlistview.h>
 #include <tqbuttongroup.h>
 
-CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *parent)
-  : CodeGenerationOptionsBase(parent)
+CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *tqparent)
+  : CodeGenerationOptionsBase(tqparent)
 {
     init();
 }
@@ -154,7 +154,7 @@ void CodeGenerationOptionsPage::apply() {
         m_parentPolicy->setIndentationAmount(m_SelectIndentationNumber->value());
 
         // emit in THIS order.. the first signal triggers any sub-class to do its apply
-        // slot, THEN, once we are all updated, we may sync the parent generator's code
+        // slot, THEN, once we are all updated, we may sync the tqparent generator's code
         // documents
         emit applyClicked();
         emit syncCodeDocumentsToParent();
@@ -171,7 +171,7 @@ void CodeGenerationOptionsPage::setDefaults() {
 
 void CodeGenerationOptionsPage::browseClicked() {
 
-    TQString button = sender()->name();
+    TQString button = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
     TQString dir = KFileDialog::getExistingDirectory();
     if(dir.isEmpty())
         return;
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.h b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
index 6cd7a2e7..f444254e 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.h
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
@@ -39,8 +39,9 @@ class CodeGenerationPolicyPage;
 
 class CodeGenerationOptionsPage : public CodeGenerationOptionsBase  {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CodeGenerationOptionsPage(TQWidget *parent=0);
+    CodeGenerationOptionsPage(TQWidget *tqparent=0);
     ~CodeGenerationOptionsPage();
     void setDefaults();
     TQString getCodeGenerationLanguage();
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui
index bbc739a7..bb48596d 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>CodeGenerationPolicyBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CodeGenerationPolicyBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,11 +12,11 @@
             <height>515</height>
         </rect>
     </property>
-    <widget class="QFrame">
+    <widget class="TQFrame">
         <property name="name">
             <cstring>policyFrame</cstring>
         </property>
-        <property name="geometry">
+        <property name="tqgeometry">
             <rect>
                 <x>30</x>
                 <y>20</y>
@@ -32,8 +32,8 @@
         </property>
     </widget>
 </widget>
-<slots>
+<Q_SLOTS>
     <slot access="protected">apply()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
index 0e488e75..0cdd5e08 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
@@ -29,8 +29,8 @@
 /** This is the page which comes up IF there is no special options for the
  * code generator.
  */
-CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *parent, const char *name, CodeGenPolicyExt * policy )
-        :CodeGenerationPolicyBase(parent,name)
+CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy )
+        :CodeGenerationPolicyBase(tqparent,name)
 {
     m_parentPolicy = policy;
 }
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.h b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
index 959e34aa..54723dd3 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicypage.h
+++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
@@ -31,8 +31,9 @@ class CodeGenPolicyExt;
 
 class CodeGenerationPolicyPage : public CodeGenerationPolicyBase  {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    explicit CodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CodeGenPolicyExt * policy = 0);
+    explicit CodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, CodeGenPolicyExt * policy = 0);
 
     virtual ~CodeGenerationPolicyPage();
 
diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
index b64e30dc..dbd47a94 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
@@ -125,7 +125,7 @@ void CodeGenerationWizard::generateCode() {
 }
 
 void CodeGenerationWizard::classGenerated(UMLClassifier* concept, bool generated) {
-    TQListViewItem* item = m_statusList->findItem( concept->getFullyQualifiedName(), 0 );
+    TQListViewItem* item = m_statusList->tqfindItem( concept->getFullyQualifiedName(), 0 );
     if( !item ) {
         kError()<<"GenerationStatusPage::Error finding class in list view"<<endl;
     } else if (generated) {
@@ -159,13 +159,13 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
         if(!info.exists())
         {
             if (KMessageBox::questionYesNo(this,
-                                           i18n("The folder %1 does not exist. Do you want to create it now?").arg(info.filePath()),
+                                           i18n("The folder %1 does not exist. Do you want to create it now?").tqarg(info.filePath()),
                                            i18n("Output Folder Does Not Exist"), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes)
             {
                 TQDir dir;
                 if(!dir.mkdir(info.filePath()))
                 {
-                    KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its parent folder or select another, valid, folder."),
+                    KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its tqparent folder or select another, valid, folder."),
                                        i18n("Error Creating Folder"));
                     return;
                 }
@@ -188,7 +188,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
             // it exits and we can write... make sure it is a directory
             if(!info.isDir())
             {
-                KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").arg(info.filePath()),
+                KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").tqarg(info.filePath()),
                                    i18n("Please Choose Valid Folder"));
                 return;
             }
@@ -232,7 +232,7 @@ void CodeGenerationWizard::moveSelectedItems(TQListView* fromList, TQListView* t
         TQListViewItem* selectedItem = it.current();
 
         TQString name = selectedItem->text(0);
-        if (!toList->findItem(name, 0)) {
+        if (!toList->tqfindItem(name, 0)) {
             new TQListViewItem(toList, name);
         }
 
diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.h b/umbrello/umbrello/dialogs/codegenerationwizard.h
index 2fec8046..13d36927 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.h
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.h
@@ -39,6 +39,7 @@ class CodeGenerationOptionsPage;
 
 class CodeGenerationWizard : public CodeGenerationWizardBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
     CodeGenerationWizard(UMLClassifierList *classList);
     ~CodeGenerationWizard();
diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
index 732aa0c7..be3de2e9 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>CodeGenerationWizardBase</class>
-<widget class="QWizard">
+<widget class="TQWizard">
     <property name="name">
         <cstring>CodeGenerationWizardBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -15,7 +15,7 @@
     <property name="caption">
         <string>Code Generation Wizard</string>
     </property>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>select</cstring>
         </property>
@@ -32,7 +32,7 @@
             <property name="spacing">
                 <number>10</number>
             </property>
-            <widget class="QLabel">
+            <widget class="TQLabel">
                 <property name="name">
                     <cstring>TextLabel1</cstring>
                 </property>
@@ -41,7 +41,7 @@
 for in the right hand side list</string>
                 </property>
             </widget>
-            <widget class="QFrame">
+            <widget class="TQFrame">
                 <property name="name">
                     <cstring>Frame4</cstring>
                 </property>
@@ -64,7 +64,7 @@ for in the right hand side list</string>
                     <property name="spacing">
                         <number>10</number>
                     </property>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>m_addButton</cstring>
                         </property>
@@ -88,14 +88,14 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QListView" row="0" column="2" rowspan="5" colspan="1">
+                    <widget class="TQListView" row="0" column="2" rowspan="5" colspan="1">
                         <column>
                             <property name="text">
                                 <string>Classes Selected</string>
@@ -122,7 +122,7 @@ for in the right hand side list</string>
                             <enum>Extended</enum>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="3" column="1">
+                    <widget class="TQPushButton" row="3" column="1">
                         <property name="name">
                             <cstring>m_removeButton</cstring>
                         </property>
@@ -146,14 +146,14 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QListView" row="0" column="0" rowspan="5" colspan="1">
+                    <widget class="TQListView" row="0" column="0" rowspan="5" colspan="1">
                         <column>
                             <property name="text">
                                 <string>Classes Available</string>
@@ -190,7 +190,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -201,12 +201,12 @@ for in the right hand side list</string>
             </widget>
         </vbox>
     </widget>
-    <widget class="QWidget">
+    <widget class="TQWidget">
         <property name="name">
             <cstring>status</cstring>
         </property>
         <attribute name="title">
-            <string>Code Generation Status</string>
+            <string>Code Generation tqStatus</string>
         </attribute>
         <vbox>
             <property name="name">
@@ -218,7 +218,7 @@ for in the right hand side list</string>
             <property name="spacing">
                 <number>10</number>
             </property>
-            <widget class="QLabel">
+            <widget class="TQLabel">
                 <property name="name">
                     <cstring>m_label</cstring>
                 </property>
@@ -226,12 +226,12 @@ for in the right hand side list</string>
                     <string>Press the Generation button to start the code generation</string>
                 </property>
             </widget>
-            <widget class="QGroupBox">
+            <widget class="TQGroupBox">
                 <property name="name">
                     <cstring>GroupBox2</cstring>
                 </property>
                 <property name="title">
-                    <string>Generation Status</string>
+                    <string>Generation tqStatus</string>
                 </property>
                 <vbox>
                     <property name="name">
@@ -243,7 +243,7 @@ for in the right hand side list</string>
                     <property name="spacing">
                         <number>10</number>
                     </property>
-                    <widget class="QListView">
+                    <widget class="TQListView">
                         <column>
                             <property name="text">
                                 <string>Class</string>
@@ -257,7 +257,7 @@ for in the right hand side list</string>
                         </column>
                         <column>
                             <property name="text">
-                                <string>Generation Status</string>
+                                <string>Generation tqStatus</string>
                             </property>
                             <property name="clickable">
                                 <bool>true</bool>
@@ -300,10 +300,10 @@ for in the right hand side list</string>
 <forwards>
     <forward>class UMLClassifier</forward>
 </forwards>
-<slots>
+<Q_SLOTS>
     <slot>selectClass()</slot>
     <slot access="protected">deselectClass()</slot>
     <slot>classGenerated( UMLClassifier * /* c */ )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
index 479fcb6b..ef0091fe 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
@@ -30,10 +30,10 @@
 #include "../classifiercodedocument.h"
 #include "codeeditor.h"
 
-CodeViewerDialog::CodeViewerDialog ( TQWidget* parent, CodeDocument * doc,
+CodeViewerDialog::CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc,
                                      Settings::CodeViewerState state,
                                      const char* name, bool modal, WFlags fl )
-        : CodeViewerDialogBase ( parent, name, modal, fl )
+        : CodeViewerDialogBase ( tqparent, name, modal, fl )
 
 {
     m_state = state;
@@ -49,7 +49,7 @@ CodeViewerDialog::CodeViewerDialog ( TQWidget* parent, CodeDocument * doc,
  */
 CodeViewerDialog::~CodeViewerDialog()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 void CodeViewerDialog::initGUI ( const char * name) {
@@ -69,7 +69,7 @@ void CodeViewerDialog::initGUI ( const char * name) {
 
     CodeViewerDialogBaseLayout->setMargin(margin);
 
-    resize( TQSize(width, height).expandedTo(minimumSizeHint()) );
+    resize( TQSize(width, height).expandedTo(tqminimumSizeHint()) );
 
 }
 
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h
index e27607bc..0f447d3a 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.h
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -42,16 +42,17 @@ class UMLObject;
 class CodeViewerDialog : public CodeViewerDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
-    CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, Settings::CodeViewerState state,
+    CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state,
                        const char* name = 0, bool modal = false, WFlags fl = 0 );
     ~CodeViewerDialog ();
 
     /** return the code viewer state */
     Settings::CodeViewerState getState( );
 
-    TQString parentDocName;
+    TQString tqparentDocName;
 
     /**
      *  Adds a code document to the tabbed output
diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
index 672aefdb..d8efcf93 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
+++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>CodeViewerDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CodeViewerDialogBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -27,15 +27,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="0" column="1">
+                <widget class="TQCheckBox" row="0" column="1">
                     <property name="name">
                         <cstring>m_showHiddenCodeCB</cstring>
                     </property>
@@ -43,7 +43,7 @@
                         <string>Show hidden blocks</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3">
+                <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>componentLabel</cstring>
                     </property>
@@ -62,7 +62,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="2">
+                <widget class="TQPushButton" row="0" column="2">
                     <property name="name">
                         <cstring>m_exitButton</cstring>
                     </property>
@@ -78,7 +78,7 @@
                         <string>Close</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>m_highlightCheckBox</cstring>
                     </property>
@@ -91,7 +91,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QTabWidget" row="1" column="0">
+        <widget class="TQTabWidget" row="1" column="0">
             <property name="name">
                 <cstring>m_tabWidget</cstring>
             </property>
@@ -106,8 +106,8 @@
         <slot>close()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>changeHighlighting(int)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
index 99fd198d..6845d23d 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>CodeViewerOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CodeViewerOptionsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -29,9 +29,9 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
-                <cstring>colorGroupBox</cstring>
+                <cstring>tqcolorGroupBox</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
@@ -48,7 +48,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
                         <cstring>colorLayout</cstring>
                     </property>
@@ -56,7 +56,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="0" column="2">
+                        <widget class="TQLabel" row="0" column="2">
                             <property name="name">
                                 <cstring>fontLabel</cstring>
                             </property>
@@ -87,7 +87,7 @@
                                 </color>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>paperLabel</cstring>
                             </property>
@@ -118,7 +118,7 @@
                                 </color>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="4">
+                        <widget class="TQLabel" row="0" column="4">
                             <property name="name">
                                 <cstring>selectedLabel</cstring>
                             </property>
@@ -159,9 +159,9 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -190,9 +190,9 @@
                                 </color>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="4">
+                        <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="4">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -244,7 +244,7 @@
                                         </color>
                                     </property>
                                 </widget>
-                                <widget class="QLabel" row="0" column="0">
+                                <widget class="TQLabel" row="0" column="0">
                                     <property name="name">
                                         <cstring>textLabel1</cstring>
                                     </property>
@@ -260,7 +260,7 @@
                                         <string>&lt;p align="right"&gt;UML object block:&lt;/p&gt;</string>
                                     </property>
                                 </widget>
-                                <widget class="QLabel" row="0" column="2">
+                                <widget class="TQLabel" row="0" column="2">
                                     <property name="name">
                                         <cstring>textLabel1_2</cstring>
                                     </property>
@@ -278,7 +278,7 @@
                                 </widget>
                             </grid>
                         </widget>
-                        <widget class="QLabel" row="1" column="2">
+                        <widget class="TQLabel" row="1" column="2">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -317,7 +317,7 @@
                                 </color>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>textLabel3</cstring>
                             </property>
@@ -362,7 +362,7 @@
         <data format="XPM.GZ" length="4462">789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495</data>
     </image>
 </images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
index f4715b0d..3950d682 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
@@ -26,8 +26,8 @@
 #include <kcolorbutton.h>
 
 
-CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *parent, const char *name )
-        :CodeViewerOptionsBase(parent,name)
+CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *tqparent, const char *name )
+        :CodeViewerOptionsBase(tqparent,name)
 {
     init (options);
 }
diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.h b/umbrello/umbrello/dialogs/codevieweroptionspage.h
index fae3cb05..f5a21736 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionspage.h
+++ b/umbrello/umbrello/dialogs/codevieweroptionspage.h
@@ -28,8 +28,9 @@
 
 class CodeViewerOptionsPage : public CodeViewerOptionsBase  {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *parent, const char *name=0);
+    CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *tqparent, const char *name=0);
     ~CodeViewerOptionsPage();
 
     Settings::CodeViewerState getOptions();
diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
index 3da163b7..9732bbaf 100644
--- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
+++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
@@ -29,10 +29,10 @@
 /** This is the page which comes up IF there is no special options for the
  * code generator.
  */
-DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *parent, const char *name, CodeGenPolicyExt * policy )
-        :CodeGenerationPolicyPage(parent,name,policy)
+DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy )
+        :CodeGenerationPolicyPage(tqparent,name,policy)
 {
-    textLabel = new TQLabel(parent,"textLabel");
+    textLabel = new TQLabel(tqparent,"textLabel");
     textLabel->setText(tr2i18n("<p align=\"center\">No Options Available.</p>"));
 }
 
diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
index 68f55066..2bbf169c 100644
--- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
+++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
@@ -24,10 +24,11 @@ class CodeGenePolicyExt;
 class DefaultCodeGenPolicyPage : public CodeGenerationPolicyPage
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    explicit DefaultCodeGenPolicyPage( TQWidget* parent = 0, const char* name = 0, CodeGenPolicyExt * policy =0);
+    explicit DefaultCodeGenPolicyPage( TQWidget* tqparent = 0, const char* name = 0, CodeGenPolicyExt * policy =0);
 
     ~DefaultCodeGenPolicyPage();
 
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp
index 8374def4..cff98397 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.cpp
+++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp
@@ -30,7 +30,7 @@
 #include "../umlnamespace.h"
 
 
-DiagramPrintPage::DiagramPrintPage(TQWidget * parent, UMLDoc * m_pDoc) : KPrintDialogPage(parent), m_pDoc(m_pDoc) {
+DiagramPrintPage::DiagramPrintPage(TQWidget * tqparent, UMLDoc * m_pDoc) : KPrintDialogPage(tqparent), m_pDoc(m_pDoc) {
     int margin = fontMetrics().height();
     setTitle(i18n("&Diagrams"));
     TQHBoxLayout * mainLayout = new TQHBoxLayout(this);
@@ -112,13 +112,13 @@ void DiagramPrintPage::getOptions( TQMap<TQString,TQString>& opts, bool /*inclde
     for(int     i=0;i<listCount;i++) {
         if(m_pSelectLB -> isSelected(i)) {
             UMLView *view = (UMLView *)m_pDoc -> findView(m_nIdList[i]);
-            TQString sCount = TQString("%1").arg(count);
-            TQString sID = TQString("%1").arg(ID2STR(view -> getID()));
+            TQString sCount = TQString("%1").tqarg(count);
+            TQString sID = TQString("%1").tqarg(ID2STR(view -> getID()));
             opts.insert(diagram + sCount, sID);
             count++;
         }
     }
-    opts.insert("kde-uml-count", TQString("%1").arg(count));
+    opts.insert("kde-uml-count", TQString("%1").tqarg(count));
 }
 
 void DiagramPrintPage::setOptions( const TQMap<TQString,TQString>& /*opts*/ ) {}
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.h b/umbrello/umbrello/dialogs/diagramprintpage.h
index d5f55933..94e1deb5 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.h
+++ b/umbrello/umbrello/dialogs/diagramprintpage.h
@@ -36,14 +36,15 @@ class TQGroupBox;
 
 class DiagramPrintPage : public KPrintDialogPage {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      *  Constructs the diagram print page.
      *
-     *  @param parent The parent to the page.
+     *  @param tqparent The tqparent to the page.
      *  @param doc      The @ref UMLDoc class instance being used.
      */
-    DiagramPrintPage(TQWidget * parent, UMLDoc *doc);
+    DiagramPrintPage(TQWidget * tqparent, UMLDoc *doc);
 
     /**
      *  Stnadard deconstructor.
diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
index 8a8d2826..bf07ce16 100644
--- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui
+++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>DiagramPropertiesPage</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DiagramPropertiesPage</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -39,7 +39,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout4</cstring>
                     </property>
@@ -53,7 +53,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel1</cstring>
                             </property>
@@ -61,30 +61,30 @@
                                 <string>Name:</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>diagramName</cstring>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout20</cstring>
+                        <cstring>tqlayout20</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout6</cstring>
+                                <cstring>tqlayout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabel4</cstring>
                                     </property>
@@ -92,7 +92,7 @@
                                         <string>Zoom:</string>
                                     </property>
                                 </widget>
-                                <widget class="QSpinBox">
+                                <widget class="TQSpinBox">
                                     <property name="name">
                                         <cstring>zoom</cstring>
                                     </property>
@@ -111,7 +111,7 @@
                                         <number>10</number>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel1</cstring>
                                     </property>
@@ -131,14 +131,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>showOpSigs</cstring>
                             </property>
@@ -162,23 +162,23 @@
                         <enum>Horizontal</enum>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout6</cstring>
+                                <cstring>tqlayout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>showGrid</cstring>
                                     </property>
@@ -186,7 +186,7 @@
                                         <string>Show &amp;grid</string>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>snapToGrid</cstring>
                                     </property>
@@ -194,7 +194,7 @@
                                         <string>Snap &amp;to grid</string>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>snapComponentSizeToGrid</cstring>
                                     </property>
@@ -218,7 +218,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -227,15 +227,15 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout1</cstring>
                             </property>
@@ -249,7 +249,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabel2</cstring>
                                     </property>
@@ -257,7 +257,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                                         <string>Grid spacing:  </string>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabelX</cstring>
                                     </property>
@@ -265,7 +265,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                                         <string>X</string>
                                     </property>
                                 </widget>
-                                <widget class="QSpinBox">
+                                <widget class="TQSpinBox">
                                     <property name="name">
                                         <cstring>gridSpaceX</cstring>
                                     </property>
@@ -276,7 +276,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                                         <number>5</number>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabel3</cstring>
                                     </property>
@@ -284,7 +284,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                                         <string>Y</string>
                                     </property>
                                 </widget>
-                                <widget class="QSpinBox">
+                                <widget class="TQSpinBox">
                                     <property name="name">
                                         <cstring>gridSpaceY</cstring>
                                     </property>
@@ -307,7 +307,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -316,15 +316,15 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout1</cstring>
                             </property>
@@ -338,7 +338,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabe15</cstring>
                                     </property>
@@ -346,7 +346,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                                         <string>Line width:  </string>
                                     </property>
                                 </widget>
-                                <widget class="QSpinBox">
+                                <widget class="TQSpinBox">
                                     <property name="name">
                                         <cstring>lineWidth</cstring>
                                     </property>
@@ -369,7 +369,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -380,7 +380,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -397,7 +397,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QTextEdit" row="0" column="0">
+                <widget class="TQTextEdit" row="0" column="0">
                     <property name="name">
                         <cstring>documentation</cstring>
                     </property>
@@ -406,5 +406,5 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
index b72901be..fa1e6d60 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@@ -12,7 +12,7 @@
 // own header
 #include "exportallviewsdialog.h"
 
-// include files for Qt
+// include files for TQt
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
@@ -25,15 +25,15 @@
 #include "../umlviewimageexportermodel.h"
 
 ExportAllViewsDialog::ExportAllViewsDialog(
-        TQWidget* parent /* = 0 */,
+        TQWidget* tqparent /* = 0 */,
         const char* name /* = 0 */,
         bool modal /* = false */,
         WFlags fl /* = 0*/,
         const TQString &defaultMimeType /*= "image/png"*/)
-  : ExportAllViewsDialogBase(parent,name, modal,fl) {
+  : ExportAllViewsDialogBase(tqparent,name, modal,fl) {
     // create and initialize m_imageType
     m_imageType = new KFileFilterCombo(this, "m_imageType");
-    m_imageType->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
+    m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
     m_imageType->setEditable(false);
 
     m_imageType->setMimeFilter(UMLViewImageExporterModel::supportedMimeTypes(), defaultMimeType);
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.h b/umbrello/umbrello/dialogs/exportallviewsdialog.h
index 793f69b9..3b28037c 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.h
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.h
@@ -28,22 +28,23 @@ class KFileFilterCombo;
  */
 class ExportAllViewsDialog : public ExportAllViewsDialogBase {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
     /**
      * Constructor for UMLViewImageExporterModel.
      *
-     * @param parent The parent of the dialog.
+     * @param tqparent The tqparent of the dialog.
      * @param name The internal name.
      * @param modal If modal is true the dialog will block input to other the windows
      *              in the application until it's closed.
      * @param fl Window flags.
      * @param defaultMimeType The default mime type that appears in the mime types list.
      *
-     * @see TQDialog::QDialog
+     * @see TQDialog::TQDialog
      */
-    explicit ExportAllViewsDialog(TQWidget* parent = 0, const char* name = 0,
+    explicit ExportAllViewsDialog(TQWidget* tqparent = 0, const char* name = 0,
                          bool modal = false, WFlags fl = 0,
                          const TQString& defaultMimeType = "image/png");
 
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
index c82820a3..a97e6ff0 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
+++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ExportAllViewsDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ExportAllViewsDialogBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>mainLayout</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <property name="spacing">
                     <number>15</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>kURLRequesterLayout</cstring>
                     </property>
@@ -41,7 +41,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>kURLRequesterLabel</cstring>
                             </property>
@@ -68,7 +68,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>imageTypeLayout</cstring>
                     </property>
@@ -76,7 +76,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>imageTypeLabel</cstring>
                             </property>
@@ -92,7 +92,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>m_useFolders</cstring>
                     </property>
@@ -120,14 +120,14 @@ Only the folders made by the user are created in the base directory (Logical vie
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>buttonsLayout</cstring>
             </property>
@@ -151,14 +151,14 @@ Only the folders made by the user are created in the base directory (Logical vie
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -175,7 +175,7 @@ Only the folders made by the user are created in the base directory (Logical vie
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -207,7 +207,7 @@ Only the folders made by the user are created in the base directory (Logical vie
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp
index effb585d..420b425e 100644
--- a/umbrello/umbrello/dialogs/notedialog.cpp
+++ b/umbrello/umbrello/dialogs/notedialog.cpp
@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 
 
-NoteDialog::NoteDialog( TQWidget * parent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, parent, "_NOTEDIALOG_", true, true) {
+NoteDialog::NoteDialog( TQWidget * tqparent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, tqparent, "_NOTEDIALOG_", true, true) {
     m_pNoteWidget = pNote;
     int margin = fontMetrics().height();
 
diff --git a/umbrello/umbrello/dialogs/notedialog.h b/umbrello/umbrello/dialogs/notedialog.h
index 22f41708..6f6e2fd2 100644
--- a/umbrello/umbrello/dialogs/notedialog.h
+++ b/umbrello/umbrello/dialogs/notedialog.h
@@ -27,12 +27,13 @@ class TQTextEdit;
 class NoteDialog : public KDialogBase {
 
    Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
      *  Constructs an NoteDialog.
      */
-    NoteDialog( TQWidget * parent, NoteWidget * pNote );
+    NoteDialog( TQWidget * tqparent, NoteWidget * pNote );
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp
index c9cb8b92..c7661ced 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.cpp
+++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp
@@ -23,17 +23,17 @@
 OverwriteDialogue::OverwriteDialogue(
         const TQString& fileName,
         const TQString& outputDirectory,
-        bool applyToAllRemaining, TQWidget* parent, const char* name) :
-KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) {
+        bool applyToAllRemaining, TQWidget* tqparent, const char* name) :
+KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, tqparent, name) {
 
-    TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
+    TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
 
-    TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() );
-    layout->addWidget(dialogueLabel);
+    TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").tqarg(fileName).tqarg(outputDirectory), plainPage() );
+    tqlayout->addWidget(dialogueLabel);
 
     m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() );
     m_applyToAllRemaining->setChecked(applyToAllRemaining);
-    layout->addWidget(m_applyToAllRemaining);
+    tqlayout->addWidget(m_applyToAllRemaining);
 
     setButtonText(KDialogBase::Ok, i18n("&Overwrite"));
     setButtonText(KDialogBase::Apply, i18n("&Generate Similar File Name"));
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.h b/umbrello/umbrello/dialogs/overwritedialogue.h
index 3c49cd34..f67d7673 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.h
+++ b/umbrello/umbrello/dialogs/overwritedialogue.h
@@ -29,13 +29,14 @@ class TQCheckBox;
  */
 class OverwriteDialogue: public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
      * constructor sets up the dialog, adding checkbox and label
      */
     OverwriteDialogue(const TQString& fileName, const TQString& outputDirectory,
-                      bool applyToAllRemaining, TQWidget* parent=0, const char* name=0);
+                      bool applyToAllRemaining, TQWidget* tqparent=0, const char* name=0);
 
     /**
      * destrictor doesn't do anything
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp
index 38a75292..ce5b5590 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp
@@ -31,8 +31,8 @@
 
 #include "parmpropdlg.moc"
 
-ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a)
-        : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, parent, "_PARMPROPDLG_", true, true)
+ParmPropDlg::ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a)
+        : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, tqparent, "_PARMPROPDLG_", true, true)
 {
     m_pUmldoc = doc;
     m_pAtt = a;
@@ -127,9 +127,9 @@ ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a)
 //    m_pTypeCB->setAutoCompletion(false);
 
     //add template parameters
-    UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
+    UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() );
     if (pConcept == NULL) {
-        kError() << "ParmPropDlg: grandparent of " << m_pAtt->getName()
+        kError() << "ParmPropDlg: grandtqparent of " << m_pAtt->getName()
         << " is not a UMLClassifier" << endl;
     } else {
         UMLTemplateList tmplParams( pConcept->getTemplateList() );
@@ -219,9 +219,9 @@ void ParmPropDlg::slotOk() {
         m_pAtt->setParmKind( getParmKind() );
         m_pAtt->setStereotype( m_pStereoTypeCB->currentText() );
         TQString typeName = m_pTypeCB->currentText();
-        UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
+        UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() );
         if (pConcept == NULL) {
-            kError() << "ParmPropDlg::slotOk: grandparent of " << m_pAtt->getName()
+            kError() << "ParmPropDlg::slotOk: grandtqparent of " << m_pAtt->getName()
             << " is not a UMLClassifier" << endl;
         } else {
             UMLTemplate *tmplParam = pConcept->findTemplate(typeName);
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h
index b8efd75b..8beca582 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.h
+++ b/umbrello/umbrello/dialogs/parmpropdlg.h
@@ -29,7 +29,7 @@ class UMLDoc;
 /**
  * Displays a dialog box that displays properties of a paramater.
  * You need to make sure that @ref UMLDoc is made to be the
- * parent.
+ * tqparent.
  *
  * @short A properties dialog box for a parameter.
  * @author Paul Hensgen <phensgen@techie.com>
@@ -37,14 +37,15 @@ class UMLDoc;
  */
 class ParmPropDlg : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Constructs a ParmPropDlg.
      *
-     * @param parent    The parent of the dialog.
+     * @param tqparent    The tqparent of the dialog.
      * @param a The parameter to represent.
      */
-    ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a);
+    ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a);
 
     /**
      * Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
index dce7c98b..6d9473c7 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
@@ -17,8 +17,8 @@
 #include "../umldoc.h"
 #include "classpropdlg.h"
 
-PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg)
-        : TQWidget(parent)
+PkgContentsPage::PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg)
+        : TQWidget(tqparent)
 {
     m_pPackage = pkg;
     int margin = fontMetrics().height();
@@ -29,12 +29,12 @@ PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg)
     m_pContentGB = new TQGroupBox(i18n("Contained Items"), this);
     mainLayout -> addWidget(m_pContentGB);
 
-    TQHBoxLayout * layout = new TQHBoxLayout(m_pContentGB);
-    layout -> setSpacing(10);
-    layout -> setMargin(margin);
+    TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pContentGB);
+    tqlayout -> setSpacing(10);
+    tqlayout -> setMargin(margin);
 
     m_pContentLB = new TQListBox(m_pContentGB);
-    layout -> addWidget(m_pContentLB);
+    tqlayout -> addWidget(m_pContentLB);
     setMinimumSize(310, 330);
     fillListBox();
     m_pMenu = 0;
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.h b/umbrello/umbrello/dialogs/pkgcontentspage.h
index b95e5348..ef6faff1 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.h
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.h
@@ -27,14 +27,15 @@
  */
 class PkgContentsPage : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Constructs an instance of PkgContentsPage.
      *
-     * @param parent    The parent of the page.
+     * @param tqparent    The tqparent of the page.
      * @param pkg               The UMLPackage being represented.
      */
-    PkgContentsPage(TQWidget *parent, UMLPackage *pkg);
+    PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg);
 
     /**
      * Standard destructor.
diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp
index 1c175752..e49ea6d9 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.cpp
+++ b/umbrello/umbrello/dialogs/selectopdlg.cpp
@@ -26,10 +26,10 @@
 #include "../umlview.h"
 #include "../dialog_utils.h"
 
-SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c)
-        : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, parent, "_SELOPDLG_", true, true)
+SelectOpDlg::SelectOpDlg(UMLView * tqparent, UMLClassifier * c)
+        : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, tqparent, "_SELOPDLG_", true, true)
 {
-    m_pView = parent;
+    m_pView = tqparent;
     TQVBoxLayout * topLayout = new TQVBoxLayout(plainPage());
 
     m_pOpGB = new TQGroupBox(i18n("Select Operation"), plainPage());
diff --git a/umbrello/umbrello/dialogs/selectopdlg.h b/umbrello/umbrello/dialogs/selectopdlg.h
index 4bbcf52b..3c12b1b1 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.h
+++ b/umbrello/umbrello/dialogs/selectopdlg.h
@@ -39,14 +39,15 @@ class UMLView;
 class SelectOpDlg : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      *  Constructs a SelectOpDlg instance.
      *
-     *  @param  parent  The parent to this instance.
+     *  @param  tqparent  The tqparent to this instance.
      *  @param  c       The concept to get the operations from.
      */
-    SelectOpDlg(UMLView * parent, UMLClassifier * c);
+    SelectOpDlg(UMLView * tqparent, UMLClassifier * c);
 
     /**
      *  Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index 59b9ff28..f051925a 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -26,12 +26,12 @@
 #include "codevieweroptionspage.h"
 #include "../dialog_utils.h"
 
-SettingsDlg::SettingsDlg( TQWidget * parent, Settings::OptionState *state )
+SettingsDlg::SettingsDlg( TQWidget * tqparent, Settings::OptionState *state )
         : KDialogBase( IconList, i18n("Umbrello Setup"),
-               Help | Default | Apply | Ok | Cancel, Ok, parent, 0, true, true ) {
+               Help | Default | Apply | Ok | Cancel, Ok, tqparent, 0, true, true ) {
     m_bChangesApplied = false;
     m_pOptionState = state;
-    setHelp( "umbrello/index.html", TQString::null );
+    setHelp( "umbrello/index.html", TQString() );
     setupGeneralPage();
     setupFontPage();
     setupUIPage();
@@ -343,13 +343,13 @@ void SettingsDlg::slotDefault() {
         break;
 
     case Settings::page_font:
-        m_FontWidgets.chooser -> setFont( parentWidget() -> font() );
+        m_FontWidgets.chooser -> setFont( tqparentWidget() -> font() );
         break;
 
     case Settings::page_UI:
         m_UiWidgets.useFillColorCB -> setChecked( true );
         m_UiWidgets.fillColorB -> setColor( TQColor( 255, 255, 192 ) );
-        m_UiWidgets.lineColorB -> setColor( Qt::red );
+        m_UiWidgets.lineColorB -> setColor( TQt::red );
         m_UiWidgets.lineWidthB -> setValue( 0 );
         break;
 
@@ -425,7 +425,7 @@ void SettingsDlg::applyPage( Settings::Page page ) {
 }
 
 void SettingsDlg::slotLineBClicked() {
-    m_UiWidgets.lineColorB -> setColor( Qt::red );
+    m_UiWidgets.lineColorB -> setColor( TQt::red );
 }
 
 void SettingsDlg::slotFillBClicked() {
diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h
index c00437b2..a01696c8 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.h
+++ b/umbrello/umbrello/dialogs/settingsdlg.h
@@ -43,9 +43,10 @@ class CodeGenerator;
 class SettingsDlg : public KDialogBase {
 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SettingsDlg(TQWidget * parent, Settings::OptionState *state);
+    SettingsDlg(TQWidget * tqparent, Settings::OptionState *state);
     ~SettingsDlg();
 
     //public methods
diff --git a/umbrello/umbrello/dialogs/statedialog.h b/umbrello/umbrello/dialogs/statedialog.h
index 9ed9b5ec..5e3c9300 100644
--- a/umbrello/umbrello/dialogs/statedialog.h
+++ b/umbrello/umbrello/dialogs/statedialog.h
@@ -37,6 +37,7 @@ class KFontChooser;
 
 class StateDialog : public KDialogBase {
     Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -51,7 +52,7 @@ public:
         return m_bChangesMade;
     }
 
-protected slots:
+protected:
 
     enum Page
     {
@@ -61,6 +62,8 @@ protected slots:
         FontPage
     };
 
+protected slots:
+
     /**
     *   Entered when OK button pressed.
     */
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp
index d6ea57ce..2568fd92 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp
@@ -157,7 +157,7 @@ bool UMLAttributeDialog::apply() {
         m_pNameLE->setText( m_pAttribute->getName() );
         return false;
     }
-    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->parent() );
+    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->tqparent() );
     UMLObject *o = pConcept->findChildObject(name);
     if (o && o != m_pAttribute) {
         KMessageBox::error(this, i18n("The attribute name you have chosen is already being used in this operation."),
@@ -204,7 +204,7 @@ bool UMLAttributeDialog::apply() {
         } else {
             // If it's obviously a pointer type (C++) then create a datatype.
             // Else we don't know what it is so as a compromise create a class.
-            Uml::Object_Type ot = (typeName.contains('*') ? Uml::ot_Datatype : Uml::ot_Class);
+            Uml::Object_Type ot = (typeName.tqcontains('*') ? Uml::ot_Datatype : Uml::ot_Class);
             obj = Object_Factory::createUMLObject(ot, typeName);
         }
         if (obj == NULL)
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.h b/umbrello/umbrello/dialogs/umlattributedialog.h
index 98d11511..d21d2834 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.h
+++ b/umbrello/umbrello/dialogs/umlattributedialog.h
@@ -29,6 +29,7 @@ class TQLineEdit;
 
 class UMLAttributeDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
     UMLAttributeDialog( TQWidget * pParent, UMLAttribute * pAttribute );
     ~UMLAttributeDialog();
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
index 55a47857..a84d302b 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
@@ -186,7 +186,7 @@ bool UMLEntityAttributeDialog::apply() {
         m_pNameLE->setText( m_pEntityAttribute->getName() );
         return false;
     }
-    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->parent() );
+    UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->tqparent() );
     UMLObject *o = pConcept->findChildObject(name);
     if (o && o != m_pEntityAttribute) {
         KMessageBox::error(this, i18n("The entity attribute name you have chosen is already being used in this operation."),
@@ -227,7 +227,7 @@ bool UMLEntityAttributeDialog::apply() {
     if (classifier == NULL) {
         // If it's obviously a pointer type (C++) then create a datatype.
         // Else we don't know what it is so as a compromise create a class.
-        Uml::Object_Type ot = (typeName.contains('*') ? Uml::ot_Datatype
+        Uml::Object_Type ot = (typeName.tqcontains('*') ? Uml::ot_Datatype
                                : Uml::ot_Class);
         obj = Object_Factory::createUMLObject(ot, typeName);
         if (obj == NULL)
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.h b/umbrello/umbrello/dialogs/umlentityattributedialog.h
index 7be7516f..1cd5c338 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.h
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.h
@@ -29,6 +29,7 @@ class TQLineEdit;
 
 class UMLEntityAttributeDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
     UMLEntityAttributeDialog( TQWidget* pParent, UMLEntityAttribute* pEntityAttribute );
     ~UMLEntityAttributeDialog();
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index 37e8f64c..7edb1e35 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -46,8 +46,8 @@
 #include "../stereotype.h"
 #include "../uniqueid.h"
 
-UMLOperationDialog::UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation )
-        : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, parent, "_UMLOPERATIONDLG_", true, true) {
+UMLOperationDialog::UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation )
+        : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLOPERATIONDLG_", true, true) {
     m_pOperation = pOperation;
     m_doc = UMLApp::app()->getDocument();
     m_pMenu = 0;
@@ -138,9 +138,9 @@ void UMLOperationDialog::setupDialog() {
     buttonLayout->addWidget( m_pDownButton );
 
     KButtonBox* buttonBox = new KButtonBox(m_pParmsGB);
-    buttonBox->addButton( i18n("Ne&w Parameter..."), this, TQT_SLOT(slotNewParameter()) );
-    m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), this, TQT_SLOT(slotDeleteParameter()) );
-    m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this,
+    buttonBox->addButton( i18n("Ne&w Parameter..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewParameter()) );
+    m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteParameter()) );
+    m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this),
                           TQT_SLOT(slotParameterProperties()) );
     parmsLayout->addWidget(buttonBox);
 
@@ -162,7 +162,7 @@ void UMLOperationDialog::setupDialog() {
     m_pRtypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
 
     // add template parameters
-    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->parent());
+    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->tqparent());
     if (classifier) {
         UMLClassifierListItemList tmplParams( classifier->getFilteredList(Uml::ot_Template) );
         for (UMLClassifierListItem *li = tmplParams.first(); li; li = tmplParams.next())
@@ -459,11 +459,11 @@ bool UMLOperationDialog::apply()
         return false;
     }
 
-    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->parent() );
+    UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->tqparent() );
     if( classifier != 0L &&
             classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) )
     {
-        TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(classifier->getName())
+        TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(classifier->getName())
                       +
                       TQString(i18n("Choose a different name or parameter list." ));
         KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.h b/umbrello/umbrello/dialogs/umloperationdialog.h
index 269f41ef..2f67bfe2 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.h
+++ b/umbrello/umbrello/dialogs/umloperationdialog.h
@@ -37,12 +37,13 @@ class KArrowButton;
 
 class UMLOperationDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
     *   Constructor
     */
-    UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation );
+    UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation );
 
     /**
     *   Deconstructor
diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp
index 255f4010..00f2bd1a 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.cpp
+++ b/umbrello/umbrello/dialogs/umlroledialog.cpp
@@ -21,8 +21,8 @@
 #include "../umlrole.h"
 #include "umlroleproperties.h"
 
-UMLRoleDialog::UMLRoleDialog( TQWidget * parent, UMLRole * pRole )
-        : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, parent, "_UMLROLEDLG_", true, true)
+UMLRoleDialog::UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole )
+        : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLROLEDLG_", true, true)
 {
     m_pRole = pRole;
     setupDialog();
@@ -35,7 +35,7 @@ void UMLRoleDialog::setupDialog() {
     m_pRoleProps = new UMLRoleProperties(this, m_pRole);
     setMainWidget( m_pRoleProps );
 
-    resize( TQSize(425, 620).expandedTo(minimumSizeHint()) );
+    resize( TQSize(425, 620).expandedTo(tqminimumSizeHint()) );
 
     //  topLayout -> addWidget( m_pParmsGB);
 
diff --git a/umbrello/umbrello/dialogs/umlroledialog.h b/umbrello/umbrello/dialogs/umlroledialog.h
index 9f1ab218..0b41060d 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.h
+++ b/umbrello/umbrello/dialogs/umlroledialog.h
@@ -25,11 +25,12 @@ class UMLRoleProperties;
 
 class UMLRoleDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
     *   Constructor
     */
-    UMLRoleDialog( TQWidget * parent, UMLRole * pRole );
+    UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole );
 
     /**
     *   Deconstructor
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp
index fe2e2f5f..481eafb3 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.cpp
+++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp
@@ -21,8 +21,8 @@
 #include <kdebug.h>
 
 
-UMLRoleProperties::UMLRoleProperties ( TQWidget *parent, UMLRole *role)
-        : UMLRolePropertiesBase (parent)
+UMLRoleProperties::UMLRoleProperties ( TQWidget *tqparent, UMLRole *role)
+        : UMLRolePropertiesBase (tqparent)
 {
 
     m_pRole = role;
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.h b/umbrello/umbrello/dialogs/umlroleproperties.h
index 61b7b8fe..cd3cb005 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.h
+++ b/umbrello/umbrello/dialogs/umlroleproperties.h
@@ -24,15 +24,16 @@
  */
 class UMLRoleProperties : public UMLRolePropertiesBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
      *  Sets up the UMLRoleProperties.
      *
-     *  @param  parent  The parent widget to the UMLRoleProperties.
+     *  @param  tqparent  The tqparent widget to the UMLRoleProperties.
      *  @param  role    The UMLRole to display the properties of.
      */
-    UMLRoleProperties( TQWidget *parent, UMLRole *role);
+    UMLRoleProperties( TQWidget *tqparent, UMLRole *role);
 
     /**
      *  Standard deconstructor.
@@ -47,7 +48,7 @@ public:
 
 protected:
 
-    // the parent role object
+    // the tqparent role object
     UMLRole * m_pRole;
 
 private:
diff --git a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
index 7c35a284..18501ded 100644
--- a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
+++ b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>UMLRolePropertiesBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>UMLRolePropertiesBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,11 +12,11 @@
             <height>545</height>
         </rect>
     </property>
-    <widget class="QLayoutWidget">
+    <widget class="TQLayoutWidget">
         <property name="name">
-            <cstring>layout6</cstring>
+            <cstring>tqlayout6</cstring>
         </property>
-        <property name="geometry">
+        <property name="tqgeometry">
             <rect>
                 <x>10</x>
                 <y>10</y>
@@ -28,18 +28,18 @@
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
-            <widget class="QGroupBox" row="0" column="0">
+            <widget class="TQGroupBox" row="0" column="0">
                 <property name="name">
                     <cstring>propsGroupBox</cstring>
                 </property>
                 <property name="title">
                     <string>Role Properties</string>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
-                    <property name="geometry">
+                    <property name="tqgeometry">
                         <rect>
                             <x>10</x>
                             <y>30</y>
@@ -51,7 +51,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>roleNameLabel</cstring>
                             </property>
@@ -59,17 +59,17 @@
                                 <string>Rolename:</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="1">
+                        <widget class="TQLineEdit" row="1" column="1">
                             <property name="name">
                                 <cstring>m_pMultiLE</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="0" column="1">
+                        <widget class="TQLineEdit" row="0" column="1">
                             <property name="name">
                                 <cstring>m_pRoleLE</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -80,7 +80,7 @@
                     </grid>
                 </widget>
             </widget>
-            <widget class="QGroupBox" row="3" column="0">
+            <widget class="TQGroupBox" row="3" column="0">
                 <property name="name">
                     <cstring>docGroupBox</cstring>
                 </property>
@@ -91,14 +91,14 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QTextEdit" row="0" column="0">
+                    <widget class="TQTextEdit" row="0" column="0">
                         <property name="name">
                             <cstring>m_pDocTE</cstring>
                         </property>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QButtonGroup" row="2" column="0">
+            <widget class="TQButtonGroup" row="2" column="0">
                 <property name="name">
                     <cstring>changeabilityButtonGroup</cstring>
                 </property>
@@ -109,15 +109,15 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="0" column="0">
+                    <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout2</cstring>
+                            <cstring>tqlayout2</cstring>
                         </property>
                         <grid>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QRadioButton" row="0" column="2">
+                            <widget class="TQRadioButton" row="0" column="2">
                                 <property name="name">
                                     <cstring>m_pAddOnlyRB</cstring>
                                 </property>
@@ -125,7 +125,7 @@
                                     <string>Add only</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="1">
+                            <widget class="TQRadioButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>m_pFrozenRB</cstring>
                                 </property>
@@ -133,7 +133,7 @@
                                     <string>Frozen</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="0">
+                            <widget class="TQRadioButton" row="0" column="0">
                                 <property name="name">
                                     <cstring>m_pChangeableRB</cstring>
                                 </property>
@@ -148,7 +148,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QButtonGroup" row="1" column="0">
+            <widget class="TQButtonGroup" row="1" column="0">
                 <property name="name">
                     <cstring>visibilityButtonGroup</cstring>
                 </property>
@@ -159,7 +159,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QRadioButton" row="0" column="0">
+                    <widget class="TQRadioButton" row="0" column="0">
                         <property name="name">
                             <cstring>m_pPublicRB</cstring>
                         </property>
@@ -170,7 +170,7 @@
                             <bool>true</bool>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="0" column="1">
+                    <widget class="TQRadioButton" row="0" column="1">
                         <property name="name">
                             <cstring>m_pPrivateRB</cstring>
                         </property>
@@ -178,7 +178,7 @@
                             <string>Private</string>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="0" column="2">
+                    <widget class="TQRadioButton" row="0" column="2">
                         <property name="name">
                             <cstring>m_pProtectedRB</cstring>
                         </property>
@@ -186,7 +186,7 @@
                             <string>Protected</string>
                         </property>
                     </widget>
-                    <widget class="QRadioButton" row="0" column="3">
+                    <widget class="TQRadioButton" row="0" column="3">
                         <property name="name">
                             <cstring>m_pImplementationRB</cstring>
                         </property>
@@ -199,5 +199,5 @@
         </grid>
     </widget>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
index 6075fbe4..20183e3a 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
@@ -131,7 +131,7 @@ bool UMLTemplateDialog::apply() {
         return false;
     }
 
-    UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->parent() );
+    UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->tqparent() );
     if (pClass) {
         UMLObject *o = pClass->findChildObject(name);
         if (o && o != m_pTemplate) {
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.h b/umbrello/umbrello/dialogs/umltemplatedialog.h
index 013eb51e..cdf8b3f1 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.h
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.h
@@ -31,6 +31,7 @@ class UMLTemplate;
 
 class UMLTemplateDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
     UMLTemplateDialog(TQWidget* pParent, UMLTemplate* pAttribute);
     ~UMLTemplateDialog();
diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp
index 76ef776d..33a6a21f 100644
--- a/umbrello/umbrello/dialogs/umlviewdialog.cpp
+++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp
@@ -135,7 +135,7 @@ void UMLViewDialog::applyPage( Page page ) {
 
     case Font:
         kDebug() << "UMLViewDialog::applyPage: setting font "
-        << m_pChooser->font().toString() << endl;
+        << TQString(m_pChooser->font().toString()) << endl;
         m_pView->setFont( m_pChooser->font(), true );
         break;
 
diff --git a/umbrello/umbrello/dialogs/umlviewdialog.h b/umbrello/umbrello/dialogs/umlviewdialog.h
index f81d9869..6484aab3 100644
--- a/umbrello/umbrello/dialogs/umlviewdialog.h
+++ b/umbrello/umbrello/dialogs/umlviewdialog.h
@@ -37,6 +37,7 @@ class DiagramPropertiesPage;
 
 class UMLViewDialog : public KDialogBase {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
     *   Constructor
diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
index 824d708f..a330ad30 100644
--- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
+++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
@@ -87,12 +87,12 @@ void UMLWidgetColorPage::init()
 UMLWidgetColorPage::~UMLWidgetColorPage() {}
 
 void UMLWidgetColorPage::slotLineButtonClicked() {
-    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
+    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() );
     m_pLineColorB -> setColor( Settings::getOptionState().uiState.lineColor );
 }
 
 void UMLWidgetColorPage::slotFillButtonClicked() {
-    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
+    //  UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() );
     m_pFillColorB -> setColor( Settings::getOptionState().uiState.fillColor );
 }
 
diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h
index bc03d5b6..b5c33e2c 100644
--- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h
+++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h
@@ -29,6 +29,7 @@ class TQGroupBox;
 
 class UMLWidgetColorPage : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**