Rename a number of old tq methods that are no longer tq specific

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:50:38 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:50:38 -0600
commit: d6331f1b56eb6dca7a1950658b2932f208015da0 (patch)
tree: f99bf8d1571f93304bdb4a46fb199a1bde60e6ee /umbrello
parent: e738fee8847c1f606df7b338a589cc8c0539a521 (diff)
download: tdesdk-d6331f1b56eb6dca7a1950658b2932f208015da0.tar.gz
tdesdk-d6331f1b56eb6dca7a1950658b2932f208015da0.zip
147 files changed, 465 insertions, 465 deletions
diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp
index 2ac38d4e..3aac8342 100644
--- a/umbrello/umbrello/aligntoolbar.cpp
+++ b/umbrello/umbrello/aligntoolbar.cpp
@@ -335,7 +335,7 @@ void AlignToolBar::slotButtonChanged(int btn) {
 
     // at least 2 widgets must be selected
     if (widgetList.count() > 1) {
-        // now perform tqalignment according to the clicked button
+        // now perform alignment according to the clicked button
         switch (btn) {
         case alac_align_left:
             alignLeft(widgetList);
@@ -380,7 +380,7 @@ void AlignToolBar::slotButtonChanged(int btn) {
         UMLApp::app()->getDocument()->setModified();
     } else {
         KMessageBox::messageBox(0, KMessageBox::Information,
-                                i18n("For tqalignment you have to select at least 2 objects like classes or actors. You can not align associations."),
+                                i18n("For alignment you have to select at least 2 objects like classes or actors. You can not align associations."),
                                 i18n("Information"), i18n("&OK"), TQString(""),
                                 "showAlignInformation");
     } // if (widgetList.count() > 1)
diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h
index 7e2170a5..7720b9b3 100644
--- a/umbrello/umbrello/aligntoolbar.h
+++ b/umbrello/umbrello/aligntoolbar.h
@@ -21,10 +21,10 @@ class TQMainWindow;
 class UMLWidget;
 
 /**
- * This toolbar provides tools for tqalignment. Widgets can only be aligned, when
+ * This toolbar provides tools for alignment. Widgets can only be aligned, when
  * there are at least 2 widgets (not associations) are selected
  *
- * @short Toolbar providing tqalignment tools.
+ * @short Toolbar providing alignment tools.
  * @author Sebastian Stein <seb.kde@hpfsc.de>
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org
  */
@@ -34,7 +34,7 @@ class AlignToolBar : public KToolBar {
 public:
 
     /**
-     * Creates a bar with tools for tqalignment.
+     * Creates a bar with tools for alignment.
      *
      * @param parentWindow      The parent of the toolbar.
      * @param name              The name of the toolbar.
@@ -215,7 +215,7 @@ private:
 private slots:
 
     /**
-     * Performs the tqalignment when a button was clicked.
+     * Performs the alignment when a button was clicked.
      *
      * @param btn The clicked button.
      */
diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index 6ded541d..81a1bb57 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -797,7 +797,7 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc)
         //    BTW, IMHO the concept of a widget being the parent of a UML object
         //    is fundamentally flawed. Widgets are pure presentation - they can
         //    come and go at a whim. If at all, the widgets could be considered
-        //    tqchildren of the corresponding UML object.
+        //    children of the corresponding UML object.
         //
         // ANSWER: This is the wrong treatment of cut and paste. Associations that
         // are being cut/n pasted should be serialized to XMI, then reconstituted
@@ -2101,7 +2101,7 @@ void AssociationWidget::createAssocClassLine() {
     computeAssocClassLine();
     TQPen pen(getLineColor(), getLineWidth(), TQt::DashLine);
     m_pAssocClassLine->setPen(pen);
-    m_pAssocClassLine->tqsetVisible(true);
+    m_pAssocClassLine->setVisible(true);
 }
 
 void AssociationWidget::createAssocClassLine(ClassifierWidget* classifier,
diff --git a/umbrello/umbrello/associationwidget.h b/umbrello/umbrello/associationwidget.h
index fbbdf214..175a64ec 100644
--- a/umbrello/umbrello/associationwidget.h
+++ b/umbrello/umbrello/associationwidget.h
@@ -1012,7 +1012,7 @@ public slots:
     /**
      * This slot is entered when an event has occurred on the views display,
      * most likely a mouse event.  Before it sends out that mouse event all
-     * tqchildren should make sure that they don't have a menu active or there
+     * children should make sure that they don't have a menu active or there
      * could be more than one popup menu displayed.
      */
     void slotRemovePopupMenu();
diff --git a/umbrello/umbrello/autolayout/_graph.h b/umbrello/umbrello/autolayout/_graph.h
index b3c42f30..179a9471 100644
--- a/umbrello/umbrello/autolayout/_graph.h
+++ b/umbrello/umbrello/autolayout/_graph.h
@@ -15,7 +15,7 @@
 #ifndef AUTOLAYOUTGRAPH_H
 #define AUTOLAYOUTGRAPH_H
 #include "baseinclude.h"
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index e47911e6..894dddbc 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -12,7 +12,7 @@
 #include "autolayoutdlg.h"
 #include "../associationwidget.h"
 #include "../umlwidget.h"
-#include "autotqlayout.h"
+#include "autolayout.h"
 #include "newautolayoutdialog.h"
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
@@ -84,7 +84,7 @@ void AutolayoutDlg::slotSetClusterizeHierarchies(bool b)
 
 void AutolayoutDlg::slotSetShapeSeparation(int i)
 {
-    tqshapeSeparation=i;
+    shapeSeparation=i;
 }
 
 void AutolayoutDlg::slotReloadSettings()
@@ -99,10 +99,10 @@ void AutolayoutDlg::slotSaveSettings()
 }
 
 
-void AutolayoutDlg::slotDoAutotqlayout()
+void AutolayoutDlg::slotDoAutolayout()
 {
 
-    Autotqlayout::Autolayouter* a=getAutolayouter();;
+    Autolayout::Autolayouter* a=getAutolayouter();;
 
     a->setAssociationAsEdges( associationAsEdges);
     a->setAssociationWeight( associationWeight );
@@ -115,8 +115,8 @@ void AutolayoutDlg::slotDoAutotqlayout()
     a->setGeneralizationWeight( generalizationWeight);
     a->setNoteConnectionWeight( 1);
     a->setNoteConnectionsAsEdges(true);
-    a->setShapeSeparation( tqshapeSeparation);
-    a->autotqlayout( view);
+    a->setShapeSeparation( shapeSeparation);
+    a->autolayout( view);
     delete a;
     a=0;
     accept();
@@ -134,7 +134,7 @@ void AutolayoutDlg::readConfig( KConfig * conf)
     generalizationCB->setChecked((bool)(conf->readBoolEntry( "genralizationAsEdges",true)));
     generalizationEdgessSL->setValue((int)(conf->readNumEntry( "generalizationWeight",1)));
     associationEdgesSL->setValue((int)(conf->readNumEntry( "associationWeight",0)));
-    tqshapeSeparationSB->setValue((int)(conf->readNumEntry( "tqshapeSeparation",0)));
+    shapeSeparationSB->setValue((int)(conf->readNumEntry( "shapeSeparation",0)));
     algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0)));
 }
 
@@ -151,7 +151,7 @@ void AutolayoutDlg::writeConfig( KConfig * conf)
 
     conf->writeEntry("generalizationWeight",generalizationEdgessSL->value());
     conf->writeEntry("associationWeight",associationEdgesSL->value());
-    conf->writeEntry("tqshapeSeparation",tqshapeSeparationSB->value());
+    conf->writeEntry("shapeSeparation",shapeSeparationSB->value());
     //conf->writeEntry("al
 
 
@@ -165,18 +165,18 @@ void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname)
 
 }
 
-Autotqlayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
+Autolayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
 {
     const TQString text = algorithmCOB->currentText();
-    kDebug() << "Autotqlayout Algorithm " << algname << " found " << text << endl;
+    kDebug() << "Autolayout Algorithm " << algname << " found " << text << endl;
     if (text == "dot")
-        return new Autotqlayout::DotAutolayouter();
+        return new Autolayout::DotAutolayouter();
     if (text == "circo")
-        return new Autotqlayout::CircoAutolayouter();
+        return new Autolayout::CircoAutolayouter();
     if (text ==  "neato")
-        return new Autotqlayout::NeatoAutolayouter();
-    kError() << "Autotqlayout Algorithm not found" << endl;
-    return new Autotqlayout::DotAutolayouter();
+        return new Autolayout::NeatoAutolayouter();
+    kError() << "Autolayout Algorithm not found" << endl;
+    return new Autolayout::DotAutolayouter();
 }
 
 
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index f2614d03..972fd83c 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -16,7 +16,7 @@
 #include "../umlview.h"
 #include <tqobject.h>
 #include <kconfig.h>
-#include "autotqlayout.h"
+#include "autolayout.h"
 
 class AutolayoutDlg : public MyDialog1
 {
@@ -37,7 +37,7 @@ class AutolayoutDlg : public MyDialog1
     virtual void slotSetShapeSeparation(int i);
     virtual void slotReloadSettings();
     virtual void slotSaveSettings();
-    virtual void slotDoAutotqlayout();
+    virtual void slotDoAutolayout();
     void readConfig(KConfig*);
     void writeConfig(KConfig*);
     virtual void slotSelectAlgorithm(const TQString&);
@@ -54,10 +54,10 @@ class AutolayoutDlg : public MyDialog1
     bool compressShapes;
     bool centerDiagram;
     bool clusterizeHierarchies;
-    int tqshapeSeparation;
+    int shapeSeparation;
     KConfig* config;
     TQString algname;
-    Autotqlayout::Autolayouter* getAutolayouter();
+    Autolayout::Autolayouter* getAutolayouter();
 
 };
 
diff --git a/umbrello/umbrello/autolayout/autolayouter.cpp b/umbrello/umbrello/autolayout/autolayouter.cpp
index 802bc438..f70fd195 100644
--- a/umbrello/umbrello/autolayout/autolayouter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouter.cpp
@@ -13,11 +13,11 @@
  ***************************************************************************/
 #include "autolayouter.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 
 
-void Autolayouter::autotqlayout( UMLView * v )
+void Autolayouter::autolayout( UMLView * v )
 {
     setCanvas(v);
     setGraph(v);
@@ -25,5 +25,5 @@ void Autolayouter::autotqlayout( UMLView * v )
     updateView(v);
 }
 
-}  // end namespace Autotqlayout
+}  // end namespace Autolayout
 
diff --git a/umbrello/umbrello/autolayout/autolayouter.h b/umbrello/umbrello/autolayout/autolayouter.h
index 5d4645f9..a56b1ce3 100644
--- a/umbrello/umbrello/autolayout/autolayouter.h
+++ b/umbrello/umbrello/autolayout/autolayouter.h
@@ -13,10 +13,10 @@
 #define AUTOLAYOUTAUTOLAYOUTER_H
 #include "baseinclude.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
-This is the super class of any class which encapsulate an autotqlayout algorithm
+This is the super class of any class which encapsulate an autolayout algorithm
 
 
 @author Dimitri Ognibene <ognibened @yahoo.it>
@@ -47,14 +47,14 @@ public:
 
     virtual void setShapeSeparation(int i)=0;
 
-    virtual void autotqlayout(UMLView* v);
+    virtual void autolayout(UMLView* v);
 protected:
     virtual void run()=0;
     virtual void updateView(UMLView*)=0;
-    virtual Autotqlayout::Canvas* getCanvas()=0;
-    virtual Autotqlayout::Graph* getGraph()=0;
-    virtual Autotqlayout::Graph* setGraph(UMLView* view)=0;
-    virtual Autotqlayout::Canvas* setCanvas(UMLView* view)=0;
+    virtual Autolayout::Canvas* getCanvas()=0;
+    virtual Autolayout::Graph* getGraph()=0;
+    virtual Autolayout::Graph* setGraph(UMLView* view)=0;
+    virtual Autolayout::Canvas* setCanvas(UMLView* view)=0;
 
 
 };
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
index 3a245cbc..0673fde1 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
@@ -12,18 +12,18 @@
 #include "autolayouteradapter.h"
 
 
-namespace Autotqlayout
+namespace Autolayout
   {
 
   AutolayouterAdapter::AutolayouterAdapter()
-      : Autotqlayout::Autolayouter()
+      : Autolayout::Autolayouter()
     {}
 
 
   AutolayouterAdapter::~AutolayouterAdapter()
   {}}
 
-void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
+void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
   {
   int weight;
   switch (a->getAssocType())
@@ -71,60 +71,60 @@ void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
   getGraph()->addEdge(a->getWidgetID(Uml::A).c_str(),a->getWidgetID(Uml::B).c_str(),weight);
   }
 
-void Autotqlayout::AutolayouterAdapter::setAssociationWeight( int i )
+void Autolayout::AutolayouterAdapter::setAssociationWeight( int i )
   {
   associationWeight=i;
   }
 
-void Autotqlayout::AutolayouterAdapter::setDependenciesWeight( int i )
+void Autolayout::AutolayouterAdapter::setDependenciesWeight( int i )
   {
   dependenciesWeight=i;
   }
 
-void Autotqlayout::AutolayouterAdapter::setGeneralizationWeight( int i )
+void Autolayout::AutolayouterAdapter::setGeneralizationWeight( int i )
   {
   generalizationWeight=i;
   }
 
-void Autotqlayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
   {
   genralizationAsEdges=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
   {
   dependenciesAsEdges=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
   {
   associationAsEdges=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setCompressShapes( bool b )
+void Autolayout::AutolayouterAdapter::setCompressShapes( bool b )
   {
   compressShapes=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setCenterDiagram( bool b )
+void Autolayout::AutolayouterAdapter::setCenterDiagram( bool b )
   {
   centerDiagram=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
+void Autolayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
   {
   clusterizeHierarchies=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i )
+void Autolayout::AutolayouterAdapter::setShapeSeparation( int i )
   {
-  tqshapeSeparation=i;
+  shapeSeparation=i;
   }
 
-Autotqlayout::Graph  * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view )
+Autolayout::Graph  * Autolayout::AutolayouterAdapter::setGraph( UMLView * view )
   {
   if (! view) return 0;
-  Autotqlayout::Graph * g=getGraph();
+  Autolayout::Graph * g=getGraph();
   if (g&&g->empty())
     {
     UMLWidgetList list = view->getWidgetList();
@@ -151,7 +151,7 @@ Autotqlayout::Graph  * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * vi
   return g;
   }
 
-void Autotqlayout::AutolayouterAdapter::updateView( UMLView* view )
+void Autolayout::AutolayouterAdapter::updateView( UMLView* view )
   {
 if (! view) return ;
 UMLWidgetList list = view->getWidgetList();
@@ -175,17 +175,17 @@ UMLWidgetList list = view->getWidgetList();
       }
   }
 
-Autotqlayout::Canvas * Autotqlayout::AutolayouterAdapter::setCanvas( UMLView* view )
+Autolayout::Canvas * Autolayout::AutolayouterAdapter::setCanvas( UMLView* view )
   {
-  return canvas=new Autotqlayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
+  return canvas=new Autolayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
   }
 
-void Autotqlayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
+void Autolayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
 {
 noteConnectionWeight=i;
 }
 
-void Autotqlayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
 {
 noteConnectionAsEdges=b;
 }
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h
index 1d05f0d2..7c52e742 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.h
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.h
@@ -11,19 +11,19 @@
 
 #ifndef AUTOLAYOUTAUTOLAYOUTERADAPTER_H
 #define AUTOLAYOUTAUTOLAYOUTERADAPTER_H
-//#include "autotqlayout.h"
+//#include "autolayout.h"
 #include "baseinclude.h"
 #include "autolayouter.h"
 #include "../umlnamespace.h"
 
 
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class AutolayouterAdapter : virtual public Autotqlayout::Autolayouter
+class AutolayouterAdapter : virtual public Autolayout::Autolayouter
 {
 public:
     AutolayouterAdapter();
@@ -70,7 +70,7 @@ protected:
     bool compressShapes;
     bool centerDiagram;
     bool clusterizeHierarchies;
-    int tqshapeSeparation;
+    int shapeSeparation;
     int noteConnectionWeight;
     bool noteConnectionAsEdges;
     bool anchorsAsEdges;
diff --git a/umbrello/umbrello/autolayout/canvas.h b/umbrello/umbrello/autolayout/canvas.h
index 210b1353..246df8a7 100644
--- a/umbrello/umbrello/autolayout/canvas.h
+++ b/umbrello/umbrello/autolayout/canvas.h
@@ -15,7 +15,7 @@
 #ifndef AUTOLAYOUTCANVAS_H
 #define AUTOLAYOUTCANVAS_H
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
diff --git a/umbrello/umbrello/autolayout/diagram.h b/umbrello/umbrello/autolayout/diagram.h
index 43f35f51..33bda398 100644
--- a/umbrello/umbrello/autolayout/diagram.h
+++ b/umbrello/umbrello/autolayout/diagram.h
@@ -16,12 +16,12 @@
 #define AUTOLAYOUTABLEDIAGRAM_H
 #include <dotneato.h>
 #define internal_renderizer
-#include "autotqlayout.h"
+#include "autolayout.h"
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 Umbrello UML Modeller Authors
 */
-namespace Autotqlayout{
+namespace Autolayout{
 class Diagram//: public virtual Graph, public virtual Canvas{
 {
 private:
@@ -39,7 +39,7 @@ public:
 
     void addNode(const char *name, int width,int heigt);
     void addEdge(const char* nodea,const char*nodeb);
-    void autotqlayout();
+    void autolayout();
     void save();
     Node getNode(const char*);
 
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.cpp b/umbrello/umbrello/autolayout/dotautolayouter.cpp
index dea9b554..5d197845 100644
--- a/umbrello/umbrello/autolayout/dotautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/dotautolayouter.cpp
@@ -15,10 +15,10 @@
 
 #include <graphviz/dotprocs.h>
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 DotAutolayouter::DotAutolayouter()
-        : Autotqlayout::GraphvizAutolayouter()
+        : Autolayout::GraphvizAutolayouter()
 {
 }
 
@@ -32,10 +32,10 @@ DotAutolayouter::~DotAutolayouter()
 void DotAutolayouter::run()
 {
     //#ifndef internal_renderizer
-    /* bind graph to GV context - currently must be done before tqlayout */
+    /* bind graph to GV context - currently must be done before layout */
     //  gvBindContext(gvc,g);
     //#endif
-    // do tqlayout
+    // do layout
     //dot_layout();
     dot_layout( gg->_agraph );
 }
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.h b/umbrello/umbrello/autolayout/dotautolayouter.h
index 4b8af212..5c6530ba 100644
--- a/umbrello/umbrello/autolayout/dotautolayouter.h
+++ b/umbrello/umbrello/autolayout/dotautolayouter.h
@@ -17,12 +17,12 @@
 #include "baseinclude.h"
 #include "graphvizautolayouter.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class DotAutolayouter : virtual public Autotqlayout::GraphvizAutolayouter
+class DotAutolayouter : virtual public Autolayout::GraphvizAutolayouter
 {
 public:
     DotAutolayouter();
diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
index da075642..8defc5ef 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
@@ -15,10 +15,10 @@
 
 #include <graphviz/graph.h>
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 GraphvizAutolayouter::GraphvizAutolayouter()
-        : Autotqlayout::AutolayouterAdapter()
+        : Autolayout::AutolayouterAdapter()
 {
     gg = new GraphvizGraph();
 }
@@ -44,7 +44,7 @@ void GraphvizAutolayouter::setShapeSeparation( int i )
     gg->setShapeSeparation(i);
 }
 
-Autotqlayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view )
+Autolayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view )
 {
     Canvas* canvas= AutolayouterAdapter::setCanvas(view);
     gg->setCanvas(canvas);
diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.h b/umbrello/umbrello/autolayout/graphvizautolayouter.h
index 95fa46ba..114ae63f 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.h
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.h
@@ -15,13 +15,13 @@
 #include "autolayouteradapter.h"
 #include "graphvizgraph.h"
 
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizAutolayouter : virtual public Autotqlayout::AutolayouterAdapter
+class GraphvizAutolayouter : virtual public Autolayout::AutolayouterAdapter
 {
 public:
     GraphvizAutolayouter();
diff --git a/umbrello/umbrello/autolayout/graphvizgraph.cpp b/umbrello/umbrello/autolayout/graphvizgraph.cpp
index a3b4ea8a..716f9223 100644
--- a/umbrello/umbrello/autolayout/graphvizgraph.cpp
+++ b/umbrello/umbrello/autolayout/graphvizgraph.cpp
@@ -23,7 +23,7 @@ char* _strcpy(const char* name)
     a=strcpy(a,name);
     return a;
 }
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
@@ -31,7 +31,7 @@ namespace Autotqlayout
  * @return
  */
 GraphvizGraph::GraphvizGraph()
-        : Autotqlayout::Graph()
+        : Autolayout::Graph()
 {
     aginit();
     empty_flag=true;
@@ -42,7 +42,7 @@ GraphvizGraph::GraphvizGraph()
     a_weight= agedgeattr(_agraph,"weight","");
     agnodeattr(_agraph, "fixedsize", "true");
     agnodeattr(_agraph, "margin", "0.01,0.01");
-    agnodeattr(_agraph, "tqshape", "box");
+    agnodeattr(_agraph, "shape", "box");
     agraphattr(_agraph, "dpi", "DPI/0");
 
 
@@ -96,7 +96,7 @@ void GraphvizGraph::addNode(const char* name, int width, int height)
 }
 
 
-void Autotqlayout::GraphvizGraph::setCompressShapes( bool b )
+void Autolayout::GraphvizGraph::setCompressShapes( bool b )
 {
     if (empty())
     {
@@ -105,7 +105,7 @@ void Autotqlayout::GraphvizGraph::setCompressShapes( bool b )
     }
 }
 
-void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b )
+void Autolayout::GraphvizGraph::setCenterDiagram( bool b )
 {
     if (empty())
     {
@@ -114,7 +114,7 @@ void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b )
     }
 }
 
-void Autotqlayout::GraphvizGraph::setShapeSeparation( int i )
+void Autolayout::GraphvizGraph::setShapeSeparation( int i )
 {
     char* a;
     asprintf(&a,"%f",((float) i)/10.0);
@@ -122,22 +122,22 @@ void Autotqlayout::GraphvizGraph::setShapeSeparation( int i )
     free (a);
 }
 
-bool Autotqlayout::GraphvizGraph::empty( )
+bool Autolayout::GraphvizGraph::empty( )
 {
     return empty_flag;
 }
 
-Autotqlayout::Node* Autotqlayout::GraphvizGraph::getNode( const char * arg1 )
+Autolayout::Node* Autolayout::GraphvizGraph::getNode( const char * arg1 )
 {
     char *a = _strcpy(arg1);
-    Autotqlayout::GraphvizNode* b=
-        new Autotqlayout::GraphvizNode(agnode(_agraph,a));
+    Autolayout::GraphvizNode* b=
+        new Autolayout::GraphvizNode(agnode(_agraph,a));
     delete[](a);
     nodelist.push_back(b);
     return b;
 }
 
-void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas)
+void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas)
 {
     char buf[100];
     sprintf(buf,"%f,%f",((float)canvas->getMaxX()/DPI),((float)canvas->getMaxY()/DPI));
@@ -146,5 +146,5 @@ void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas)
     agraphattr(_agraph, "page", buf);
 }
 
-}  // end namespace Autotqlayout
+}  // end namespace Autolayout
 
diff --git a/umbrello/umbrello/autolayout/graphvizgraph.h b/umbrello/umbrello/autolayout/graphvizgraph.h
index 1be57139..dfbf323d 100644
--- a/umbrello/umbrello/autolayout/graphvizgraph.h
+++ b/umbrello/umbrello/autolayout/graphvizgraph.h
@@ -21,13 +21,13 @@
 #include <deque>
 #include <graphviz/types.h>
 
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizGraph : virtual public Autotqlayout::Graph
+class GraphvizGraph : virtual public Autolayout::Graph
 {
 public:
     GraphvizGraph();
diff --git a/umbrello/umbrello/autolayout/graphviznode.cpp b/umbrello/umbrello/autolayout/graphviznode.cpp
index 430e176c..ea3510cf 100644
--- a/umbrello/umbrello/autolayout/graphviznode.cpp
+++ b/umbrello/umbrello/autolayout/graphviznode.cpp
@@ -17,7 +17,7 @@
 #include <graphviz/types.h>
 #include <graphviz/graph.h>
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 
 
@@ -40,7 +40,7 @@ int GraphvizNode::getY()
 
 }
 
-Autotqlayout::GraphvizNode::GraphvizNode( Agnode_t * node )
+Autolayout::GraphvizNode::GraphvizNode( Agnode_t * node )
 {
     n=node;
 }
diff --git a/umbrello/umbrello/autolayout/graphviznode.h b/umbrello/umbrello/autolayout/graphviznode.h
index 1190f5af..0efcb6d8 100644
--- a/umbrello/umbrello/autolayout/graphviznode.h
+++ b/umbrello/umbrello/autolayout/graphviznode.h
@@ -18,12 +18,12 @@
 
 class Agnode_t;
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizNode : virtual public Autotqlayout::Node
+class GraphvizNode : virtual public Autolayout::Node
 {
 
     GraphvizNode (Agnode_t* n);
diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
index 9301abe3..7213c164 100644
--- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui
+++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
@@ -88,12 +88,12 @@
                         <string>Shape separation</string>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>tqshapeSeparationSB</cstring>
+                        <cstring>shapeSeparationSB</cstring>
                     </property>
                 </widget>
                 <widget class="TQSpinBox">
                     <property name="name">
-                        <cstring>tqshapeSeparationSB</cstring>
+                        <cstring>shapeSeparationSB</cstring>
                     </property>
                     <property name="prefix">
                         <string></string>
@@ -203,7 +203,7 @@
                                 <string>Weight</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
                             </property>
                         </widget>
                     </widget>
@@ -258,7 +258,7 @@
                                 <string>Weight</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
                             </property>
                         </widget>
                     </widget>
@@ -313,7 +313,7 @@
                                 <string>Weight</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
                             </property>
                         </widget>
                     </widget>
@@ -330,7 +330,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>1</height>
@@ -339,7 +339,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -366,7 +366,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>277</width>
                             <height>20</height>
@@ -450,7 +450,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>tqshapeSeparationSB</sender>
+        <sender>shapeSeparationSB</sender>
         <signal>valueChanged(int)</signal>
         <receiver>MyDialog1</receiver>
         <slot>slotSetShapeSeparation(int)</slot>
@@ -513,7 +513,7 @@
         <sender>buttonOk</sender>
         <signal>clicked()</signal>
         <receiver>MyDialog1</receiver>
-        <slot>slotDoAutotqlayout()</slot>
+        <slot>slotDoAutolayout()</slot>
     </connection>
     <connection>
         <sender>restoreDefaultsBTN</sender>
@@ -535,7 +535,7 @@
     </connection>
 </connections>
 <Q_SLOTS>
-    <slot>slotDoAutotqlayout()</slot>
+    <slot>slotDoAutolayout()</slot>
     <slot>slotSaveSettings()</slot>
     <slot>slotReloadSettings()</slot>
     <slot>slotSetClusterizeHierarchies(bool b)</slot>
diff --git a/umbrello/umbrello/autolayout/node.h b/umbrello/umbrello/autolayout/node.h
index 74259233..c2532b8b 100644
--- a/umbrello/umbrello/autolayout/node.h
+++ b/umbrello/umbrello/autolayout/node.h
@@ -15,7 +15,7 @@
 #ifndef AUTOLAYOUTNODE_H
 #define AUTOLAYOUTNODE_H
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Umbrello UML Modeller Authors
diff --git a/umbrello/umbrello/autolayout/simplecanvas.cpp b/umbrello/umbrello/autolayout/simplecanvas.cpp
index 38832962..0598c15e 100644
--- a/umbrello/umbrello/autolayout/simplecanvas.cpp
+++ b/umbrello/umbrello/autolayout/simplecanvas.cpp
@@ -13,7 +13,7 @@
  ***************************************************************************/
 #include "simplecanvas.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 
 
diff --git a/umbrello/umbrello/autolayout/simplecanvas.h b/umbrello/umbrello/autolayout/simplecanvas.h
index 90cecea5..29712b9e 100644
--- a/umbrello/umbrello/autolayout/simplecanvas.h
+++ b/umbrello/umbrello/autolayout/simplecanvas.h
@@ -17,7 +17,7 @@
 
 #include "canvas.h"
 #include <tqrect.h>
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
diff --git a/umbrello/umbrello/classifierwidget.h b/umbrello/umbrello/classifierwidget.h
index b92b774f..f80f1289 100644
--- a/umbrello/umbrello/classifierwidget.h
+++ b/umbrello/umbrello/classifierwidget.h
@@ -101,7 +101,7 @@ public:
     /**
      * Return the status of showing operation signatures.
      *
-     * @return  tqStatus of showing operation signatures.
+     * @return  Status of showing operation signatures.
      */
     Uml::Signature_Type getShowOpSigs() const;
 
@@ -173,7 +173,7 @@ public:
      * Returns whether to show attribute signatures.
      * Only applies when m_pObject->getBaseType() is ot_Class.
      *
-     * @return  tqStatus of how attribute signatures are shown.
+     * @return  Status of how attribute signatures are shown.
      */
     Uml::Signature_Type getShowAttSigs() {
         return m_ShowAttSigs;
diff --git a/umbrello/umbrello/clipboard/umlclipboard.cpp b/umbrello/umbrello/clipboard/umlclipboard.cpp
index d654e083..069ba84b 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.cpp
+++ b/umbrello/umbrello/clipboard/umlclipboard.cpp
@@ -267,7 +267,7 @@ void UMLClipboard::checkItemForCopyType(UMLListViewItem* Item, bool & WithDiagra
     }
 }
 
-/** Adds the tqchildren of a UMLListViewItem to m_ItemList */
+/** Adds the children of a UMLListViewItem to m_ItemList */
 bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemList& SelectedItems) {
     if(Item->childCount()) {
         UMLListViewItem * child = (UMLListViewItem*)Item->firstChild();
@@ -347,7 +347,7 @@ bool UMLClipboard::pasteClip1(TQMimeSource* data) {
         return true;
     lv->setStartedCopy(false);
     /* If we get here we are pasting after a Copy and need to
-    // paste possible tqchildren.
+    // paste possible children.
     UMLListViewItem* itemdata = 0;
     UMLListViewItemListIt it(itemdatalist);
     while ( (itemdata=it.current()) != 0 ) {
@@ -630,7 +630,7 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
                 break;
             }
         default :
-            kWarning() << "pasting unknown tqchildren type in clip type 5" << endl;
+            kWarning() << "pasting unknown children type in clip type 5" << endl;
             return false;
         }
     }
diff --git a/umbrello/umbrello/clipboard/umlclipboard.h b/umbrello/umbrello/clipboard/umlclipboard.h
index b0607ef2..017a4beb 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.h
+++ b/umbrello/umbrello/clipboard/umlclipboard.h
@@ -167,13 +167,13 @@ private:
                               bool& OnlyAttsOps);
 
     /**
-     * Adds the tqchildren of a UMLListViewItem to m_ItemList.
+     * Adds the children of a UMLListViewItem to m_ItemList.
      */
     bool insertItemChildren(UMLListViewItem* Item,
                             UMLListViewItemList& SelectedItems);
 
     /**
-     * Inserts the data of the tqchildren of the given item
+     * Inserts the data of the children of the given item
      * into the item data list.  Used for clip type 4.  Used
      * to make * sure classes have all the attributes and
      * operations saved.
@@ -181,7 +181,7 @@ private:
     bool insertItemChildren(UMLListViewItem* item);
 
     /**
-     * Pastes the tqchildren of a UMLListViewItem (The Parent)
+     * Pastes the children of a UMLListViewItem (The Parent)
      */
     bool pasteChildren(UMLListViewItem* parent, IDChangeLog *chgLog);
 
diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp
index 543a4b39..27f8dde2 100644
--- a/umbrello/umbrello/clipboard/umldrag.cpp
+++ b/umbrello/umbrello/clipboard/umldrag.cpp
@@ -108,11 +108,11 @@ void UMLDrag::setSubType(const TQCString& string, int index) {
     data->setSubType(string, index);
 }
 
-void UMLDrag::setEncodedData(const TQByteArray& tqencodedData, int index) {
-    data->enc[index] = tqencodedData.copy();
+void UMLDrag::setEncodedData(const TQByteArray& encodedData, int index) {
+    data->enc[index] = encodedData.copy();
 }
 
-TQByteArray UMLDrag::tqencodedData(const char* dataName) const {
+TQByteArray UMLDrag::encodedData(const char* dataName) const {
     TQString str(dataName);
     for (int i = 0; i < 4; i++) {
         if ( !qstricmp(dataName,data->fmt[i]) ) {
@@ -286,7 +286,7 @@ bool UMLDrag::decodeClip1(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip1") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip1");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip1");
     if ( !payload.size() ) {
         return false;
     }
@@ -376,7 +376,7 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip2") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip2");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip2");
     if ( !payload.size() ) {
         return false;
     }
@@ -486,7 +486,7 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource,
     if ( !mimeSource->provides("application/x-uml-clip3") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3");
     if ( !payload.size() ) {
         return false;
     }
@@ -543,7 +543,7 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u
     if ( !mimeSource->provides("application/x-uml-clip3") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3");
     if ( !payload.size() ) {
         return false;
     }
@@ -602,7 +602,7 @@ bool UMLDrag::decodeClip4(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip4") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip4");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip4");
     if ( !payload.size() ) {
         return false;
     }
@@ -699,7 +699,7 @@ bool UMLDrag::decodeClip5(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip5") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip5");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip5");
     if ( !payload.size() ) {
         return false;
     }
diff --git a/umbrello/umbrello/clipboard/umldrag.h b/umbrello/umbrello/clipboard/umldrag.h
index ad5e4f02..fa535399 100644
--- a/umbrello/umbrello/clipboard/umldrag.h
+++ b/umbrello/umbrello/clipboard/umldrag.h
@@ -149,7 +149,7 @@ public:
      *
      * @param dataName the name of the data type to return
      */
-    virtual TQByteArray tqencodedData(const char* dataName) const;
+    virtual TQByteArray encodedData(const char* dataName) const;
 
     /**
      * For use when the user selects only UML Objects
diff --git a/umbrello/umbrello/codedocument.cpp b/umbrello/umbrello/codedocument.cpp
index cb571b6b..a77e948a 100644
--- a/umbrello/umbrello/codedocument.cpp
+++ b/umbrello/umbrello/codedocument.cpp
@@ -281,7 +281,7 @@ void CodeDocument::updateHeader () {
     headingText.replace(TQRegExp("%filename%"),getFileName()+getFileExtension());
     headingText.replace(TQRegExp("%filepath%"),getPath());
     headingText.replace( TQRegExp("%time%"), TQTime::currentTime().toString());
-    headingText.replace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString());
+    headingText.replace( TQRegExp("%date%"), TQDate::currentDate().toString());
 
     getHeader()->setText(headingText);
 
diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp
index 9cac6c3a..273018b6 100644
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@@ -23,7 +23,7 @@
 // qt includes
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdatetime.h>
 
 // kde includes
@@ -552,7 +552,7 @@ TQString CodeGenerationPolicy::getHeadingFile(const TQString& str) {
     retstr.replace( TQRegExp("%author%"),TQString(getenv("USER")));  //get the user name from some where else
     retstr.replace( TQRegExp("%headingpath%"),filename );
     retstr.replace( TQRegExp("%time%"), TQTime::currentTime().toString());
-    retstr.replace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString());
+    retstr.replace( TQRegExp("%date%"), TQDate::currentDate().toString());
     // the replace filepath, time parts are also in the code document updateHeader method
     // (which is not a virtual function)...
 
diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp
index 44a65c62..8c4f64d0 100644
--- a/umbrello/umbrello/codegenerator.cpp
+++ b/umbrello/umbrello/codegenerator.cpp
@@ -24,7 +24,7 @@
 #include <tqdatetime.h>
 #include <tqregexp.h>
 #include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // kde includes
 #include <kdebug.h>
@@ -470,7 +470,7 @@ bool CodeGenerator::openFile (TQFile & file, const TQString &fileName ) {
         TQDir outputDirectory = UMLApp::app()->getCommonPolicy()->getOutputDirectory();
         file.setName(outputDirectory.absFilePath(fileName));
         if(!file.open(IO_WriteOnly)) {
-            KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").tqarg(file.name()),i18n("Cannot Open File"));
+            KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").arg(file.name()),i18n("Cannot Open File"));
             return false;
         }
         return true;
diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp
index ec2bf59a..c4b36956 100644
--- a/umbrello/umbrello/codegenerators/adawriter.cpp
+++ b/umbrello/umbrello/codegenerators/adawriter.cpp
@@ -20,7 +20,7 @@
 #include <kmessagebox.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../uml.h"
diff --git a/umbrello/umbrello/codegenerators/aswriter.cpp b/umbrello/umbrello/codegenerators/aswriter.cpp
index e973a55e..e3e72a38 100644
--- a/umbrello/umbrello/codegenerators/aswriter.cpp
+++ b/umbrello/umbrello/codegenerators/aswriter.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 ASWriter::ASWriter() {
 }
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
index 6ca8377b..dee5c9f4 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
@@ -41,7 +41,7 @@
             </property>
             <widget class="TQLayoutWidget" row="0" column="0">
                 <property name="name">
-                    <cstring>tqlayout4</cstring>
+                    <cstring>layout4</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -149,7 +149,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>410</width>
                             <height>113</height>
@@ -166,7 +166,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout17</cstring>
+                        <cstring>layout17</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -223,7 +223,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
@@ -285,7 +285,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -302,7 +302,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -430,7 +430,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
diff --git a/umbrello/umbrello/codegenerators/cppwriter.cpp b/umbrello/umbrello/codegenerators/cppwriter.cpp
index d58ceae4..5517d2f3 100644
--- a/umbrello/umbrello/codegenerators/cppwriter.cpp
+++ b/umbrello/umbrello/codegenerators/cppwriter.cpp
@@ -20,7 +20,7 @@
 #include "cppwriter.h"
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <kdebug.h>
 // app includes
@@ -627,7 +627,7 @@ void CppWriter::writeAttributeMethods(UMLAttributeList *attribs,
         // from what I can tell, this IS the default behavior for
         // cleanName. I dunno why its not working -b.t.
         methodBaseName = methodBaseName.stripWhiteSpace();
-        methodBaseName.replace(0,1,methodBaseName.tqat(0).upper());
+        methodBaseName.replace(0,1,methodBaseName.at(0).upper());
 
         writeSingleAttributeAccessorMethods(at->getTypeName(), varName,
                                             methodBaseName, at->getDoc(), Uml::chg_Changeable, isHeaderMethod,
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp
index 180ba176..167ccb12 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp
@@ -16,7 +16,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../uml.h"
 #include "../umldoc.h"
@@ -629,7 +629,7 @@ void CSharpWriter::writeAssociatedAttributes(UMLAssociationList &associated, UML
         TQString roleName = cleanName(a->getRoleName(Uml::B));
         TQString typeName = cleanName(o->getName());
         if (roleName.isEmpty()) {
-            roleName = TQString("UnnamedRoleB_%1").tqarg(m_unnamedRoles++);
+            roleName = TQString("UnnamedRoleB_%1").arg(m_unnamedRoles++);
         }
         TQString roleDoc = a->getRoleDoc(Uml::B);
 
diff --git a/umbrello/umbrello/codegenerators/dwriter.cpp b/umbrello/umbrello/codegenerators/dwriter.cpp
index 088ab9c1..fdcc63b6 100644
--- a/umbrello/umbrello/codegenerators/dwriter.cpp
+++ b/umbrello/umbrello/codegenerators/dwriter.cpp
@@ -20,7 +20,7 @@
 #include "dwriter.h"
 // qt includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 // kde includes
 #include <kdebug.h>
diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp
index efb49dc9..675982ca 100644
--- a/umbrello/umbrello/codegenerators/idlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/idlwriter.cpp
@@ -15,7 +15,7 @@
 #include <kmessagebox.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
index 1587c265..426c6d9a 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
@@ -428,7 +428,7 @@ void JavaClassifierCodeDocument::updateContent( )
 
     // NOW create document in sections..
     // now we want to populate the body of our class
-    // our tqlayout is the following general groupings of code blocks:
+    // our layout is the following general groupings of code blocks:
 
     // start java classifier document
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
index a9ba6a89..60764673 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -74,7 +74,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -117,7 +117,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="1" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -163,7 +163,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp
index 19f3c1fd..a1e4d0b3 100644
--- a/umbrello/umbrello/codegenerators/javawriter.cpp
+++ b/umbrello/umbrello/codegenerators/javawriter.cpp
@@ -21,7 +21,7 @@
 #include "javawriter.h"
 // qt includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 // kde includes
 #include <kdebug.h>
@@ -408,7 +408,7 @@ void JavaWriter::writeAttributeMethods(UMLAttributeList &atpub, Uml::Visibility
         // from what I can tell, this IS the default behavior for
         // cleanName. I dunno why its not working -b.t.
         fieldName.stripWhiteSpace();
-        fieldName.replace(0,1,fieldName.tqat(0).upper());
+        fieldName.replace(0,1,fieldName.at(0).upper());
 
         writeSingleAttributeAccessorMethods(at->getTypeName(),
                                             cleanName(at->getName()),
diff --git a/umbrello/umbrello/codegenerators/jswriter.cpp b/umbrello/umbrello/codegenerators/jswriter.cpp
index ea4cc2e1..9d58cf3d 100644
--- a/umbrello/umbrello/codegenerators/jswriter.cpp
+++ b/umbrello/umbrello/codegenerators/jswriter.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 JSWriter::JSWriter() {
 }
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp
index 0f3c32ef..9e75c6d6 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp
@@ -16,7 +16,7 @@
 #include <kmessagebox.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../uml.h"
diff --git a/umbrello/umbrello/codegenerators/perlwriter.cpp b/umbrello/umbrello/codegenerators/perlwriter.cpp
index 9d51ffde..def1c7dd 100644
--- a/umbrello/umbrello/codegenerators/perlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/perlwriter.cpp
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqdir.h>
 #include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 PerlWriter::PerlWriter()
 {
@@ -168,8 +168,8 @@ void PerlWriter::writeClass(UMLClassifier *c) {
   if(!str.isEmpty()) {
     str.replace(TQRegExp("%filename%"),fileName);
     str.replace(TQRegExp("%filepath%"),fileperl.name());
-    str.replace(TQRegExp("%year%"),TQDate::tqcurrentDate().toString("yyyy"));
-    str.replace(TQRegExp("%date%"),TQDate::tqcurrentDate().toString());
+    str.replace(TQRegExp("%year%"),TQDate::currentDate().toString("yyyy"));
+    str.replace(TQRegExp("%date%"),TQDate::currentDate().toString());
     str.replace(TQRegExp("%time%"),TQTime::currentTime().toString());
     str.replace(TQRegExp("%package-name%"),ThisPkgName);
     if(str.find(TQRegExp("%PACKAGE-DECLARE%"))){
diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp
index f0de28a3..c222e3c9 100644
--- a/umbrello/umbrello/codegenerators/php5writer.cpp
+++ b/umbrello/umbrello/codegenerators/php5writer.cpp
@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
@@ -173,7 +173,7 @@ static const char *php5words[] =
         "checkout",
         "chgrp",
         "child_nodes",
-        "tqchildren",
+        "children",
         "chmod",
         "chop",
         "chown",
@@ -760,8 +760,8 @@ static const char *php5words[] =
         "getrusage",
         "getservbyname",
         "getservbyport",
-        "gettqshape1",
-        "gettqshape2",
+        "getshape1",
+        "getshape2",
         "gettext",
         "gettimeofday",
         "gettype",
@@ -2704,7 +2704,7 @@ static const char *php5words[] =
         "SWFDisplayItem",
         "swf_endbutton",
         "swf_enddoaction",
-        "swf_endtqshape",
+        "swf_endshape",
         "swf_endsymbol",
         "SWFFill",
         "SWFFont",
@@ -2738,21 +2738,21 @@ static const char *php5words[] =
         "swf_setfont",
         "swf_setframe",
         "SWFShape",
-        "swf_tqshapearc",
-        "swf_tqshapecurveto",
-        "swf_tqshapecurveto3",
-        "swf_tqshapefillbitmapclip",
-        "swf_tqshapefillbitmaptile",
-        "swf_tqshapefilloff",
-        "swf_tqshapefillsolid",
-        "swf_tqshapelinesolid",
-        "swf_tqshapelineto",
-        "swf_tqshapemoveto",
+        "swf_shapearc",
+        "swf_shapecurveto",
+        "swf_shapecurveto3",
+        "swf_shapefillbitmapclip",
+        "swf_shapefillbitmaptile",
+        "swf_shapefilloff",
+        "swf_shapefillsolid",
+        "swf_shapelinesolid",
+        "swf_shapelineto",
+        "swf_shapemoveto",
         "swf_showframe",
         "SWFSprite",
         "swf_startbutton",
         "swf_startdoaction",
-        "swf_starttqshape",
+        "swf_startshape",
         "swf_startsymbol",
         "SWFText",
         "SWFTextField",
diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp
index f7e1e76e..e589b661 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/phpwriter.cpp
@@ -18,7 +18,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
@@ -171,7 +171,7 @@ static const char *words[] =
         "checkout",
         "chgrp",
         "child_nodes",
-        "tqchildren",
+        "children",
         "chmod",
         "chop",
         "chown",
@@ -758,8 +758,8 @@ static const char *words[] =
         "getrusage",
         "getservbyname",
         "getservbyport",
-        "gettqshape1",
-        "gettqshape2",
+        "getshape1",
+        "getshape2",
         "gettext",
         "gettimeofday",
         "gettype",
@@ -2700,7 +2700,7 @@ static const char *words[] =
         "SWFDisplayItem",
         "swf_endbutton",
         "swf_enddoaction",
-        "swf_endtqshape",
+        "swf_endshape",
         "swf_endsymbol",
         "SWFFill",
         "SWFFont",
@@ -2734,21 +2734,21 @@ static const char *words[] =
         "swf_setfont",
         "swf_setframe",
         "SWFShape",
-        "swf_tqshapearc",
-        "swf_tqshapecurveto",
-        "swf_tqshapecurveto3",
-        "swf_tqshapefillbitmapclip",
-        "swf_tqshapefillbitmaptile",
-        "swf_tqshapefilloff",
-        "swf_tqshapefillsolid",
-        "swf_tqshapelinesolid",
-        "swf_tqshapelineto",
-        "swf_tqshapemoveto",
+        "swf_shapearc",
+        "swf_shapecurveto",
+        "swf_shapecurveto3",
+        "swf_shapefillbitmapclip",
+        "swf_shapefillbitmaptile",
+        "swf_shapefilloff",
+        "swf_shapefillsolid",
+        "swf_shapelinesolid",
+        "swf_shapelineto",
+        "swf_shapemoveto",
         "swf_showframe",
         "SWFSprite",
         "swf_startbutton",
         "swf_startdoaction",
-        "swf_starttqshape",
+        "swf_startshape",
         "swf_startsymbol",
         "SWFText",
         "SWFTextField",
diff --git a/umbrello/umbrello/codegenerators/pythonwriter.cpp b/umbrello/umbrello/codegenerators/pythonwriter.cpp
index 8c913022..c89da92e 100644
--- a/umbrello/umbrello/codegenerators/pythonwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pythonwriter.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "../umldoc.h"
@@ -418,7 +418,7 @@ const TQStringList PythonWriter::reservedKeywords() const {
         << "TypeError"
         << "UnboundLocalError"
         << "unichr"
-        << "tqunicode"
+        << "unicode"
         << "UnicodeError"
         << "UserWarning"
         << "ValueError"
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
index 22fa56fc..ada4b0bb 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
@@ -435,7 +435,7 @@ void RubyClassifierCodeDocument::updateContent( )
 
     // NOW create document in sections..
     // now we want to populate the body of our class
-    // our tqlayout is the following general groupings of code blocks:
+    // our layout is the following general groupings of code blocks:
 
     // start ruby classifier document
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
index c47dc97f..28f74fd0 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -45,7 +45,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -88,7 +88,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="1" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -134,7 +134,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp
index e736641f..64302a80 100644
--- a/umbrello/umbrello/codegenerators/rubywriter.cpp
+++ b/umbrello/umbrello/codegenerators/rubywriter.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "classifierinfo.h"
diff --git a/umbrello/umbrello/codegenerators/sqlwriter.cpp b/umbrello/umbrello/codegenerators/sqlwriter.cpp
index 8582ec93..55717ea0 100644
--- a/umbrello/umbrello/codegenerators/sqlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/sqlwriter.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "../classifier.h"
diff --git a/umbrello/umbrello/codegenerators/tclwriter.cpp b/umbrello/umbrello/codegenerators/tclwriter.cpp
index 6d40b4b0..c0c42ad6 100644
--- a/umbrello/umbrello/codegenerators/tclwriter.cpp
+++ b/umbrello/umbrello/codegenerators/tclwriter.cpp
@@ -18,7 +18,7 @@
 #include "tclwriter.h"
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <kdebug.h>
 // app includes
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
index f2bf7a66..bff55304 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
@@ -19,7 +19,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "../umldoc.h"
@@ -543,7 +543,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc
     }
 }
 
-// all that matters here is roleA, the role served by the tqchildren of this class
+// all that matters here is roleA, the role served by the children of this class
 // in any composition or aggregation association. In full associations, I have only
 // considered the case of "self" association, so it shouldn't matter if we use role A or
 // B to find the child class as long as we don't use BOTH roles. I bet this will fail
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.h b/umbrello/umbrello/codegenerators/xmlschemawriter.h
index cc4372a2..cb5546d8 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.h
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.h
@@ -88,7 +88,7 @@ private:
 
     /**
      * write a <group> declaration for this classifier. Used for interfaces to classes with
-     * inheriting tqchildren.
+     * inheriting children.
      */
     void writeGroupClassifierDecl(UMLClassifier *c,
                                   UMLClassifierList superclassifiers,
diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.cpp b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
index 0c689e1e..c3fb2fd6 100644
--- a/umbrello/umbrello/codegenobjectwithtextblocks.cpp
+++ b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
@@ -170,7 +170,7 @@ CodeGenObjectWithTextBlocks * CodeGenObjectWithTextBlocks::findParentObjectForTa
         return this;
 
     // shouldn't happen unless the textblock doesn't exist in this object
-    // or its tqchildren at all
+    // or its children at all
     return (CodeGenObjectWithTextBlocks*) NULL;
 
 }
@@ -378,7 +378,7 @@ void CodeGenObjectWithTextBlocks::setAttributesFromNode ( TQDomElement & root)
 // in this vanilla version, we only load comments and codeblocks
 // as they are the only instanciatable (vanilla) things
 // this method should be overridden if this class is inherited
-// by some other class that is concrete and takes tqchildren
+// by some other class that is concrete and takes children
 // derived from codeblock/codecomment
 void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & root)
 {
diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.h b/umbrello/umbrello/codegenobjectwithtextblocks.h
index b8f50454..7bf338f2 100644
--- a/umbrello/umbrello/codegenobjectwithtextblocks.h
+++ b/umbrello/umbrello/codegenobjectwithtextblocks.h
@@ -165,7 +165,7 @@ protected:
       * in this vanilla version, we only load comments and codeblocks
       * as they are the only instanciatable (vanilla) things
       * this method should be overridden if this class is inherited
-      * by some other class that is concrete and takes tqchildren
+      * by some other class that is concrete and takes children
       * derived from codeblock/codecomment/hierarchicalcb/ownedhiercodeblock
       */
     virtual void loadChildTextBlocksFromNode ( TQDomElement & root);
diff --git a/umbrello/umbrello/codeimport/classimport.cpp b/umbrello/umbrello/codeimport/classimport.cpp
index 469e4030..e32758dd 100644
--- a/umbrello/umbrello/codeimport/classimport.cpp
+++ b/umbrello/umbrello/codeimport/classimport.cpp
@@ -32,7 +32,7 @@ void ClassImport::importFiles(const TQStringList &fileList) {
             fileIT != fileList.end(); ++fileIT) {
         TQString fileName = (*fileIT);
         umldoc->writeToStatusBar(i18n("Importing file: %1 Progress: %2/%3").
-                                 tqarg(fileName).tqarg(processedFilesCount).tqarg(fileList.size()));
+                                 arg(fileName).arg(processedFilesCount).arg(fileList.size()));
         parseFile(fileName);
         processedFilesCount++;
     }
diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp
index 4e38a1aa..6b87f493 100644
--- a/umbrello/umbrello/codeimport/import_utils.cpp
+++ b/umbrello/umbrello/codeimport/import_utils.cpp
@@ -178,7 +178,7 @@ UMLObject *createUMLObject(Uml::Object_Type type,
                         /* We know std and TQt are namespaces */
                         if (scopeName != "std" && scopeName != "TQt") {
                             wantNamespace = KMessageBox::questionYesNo(NULL,
-                                        i18n("Is the scope %1 a namespace or a class?").tqarg(scopeName),
+                                        i18n("Is the scope %1 a namespace or a class?").arg(scopeName),
                                         i18n("C++ Import Requests Your Help"),
                                         i18n("Namespace"), i18n("Class"));
                         }
diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp
index 7f62a1a9..0b90d5a0 100644
--- a/umbrello/umbrello/codeimport/javaimport.cpp
+++ b/umbrello/umbrello/codeimport/javaimport.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
 #include <kdebug.h>
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
index ebb10af4..2c962e5d 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
@@ -128,7 +128,7 @@ AST::AST()
       m_endLine( 0 ), m_endColumn( 0 )
 {
 #ifndef CPPPARSER_NO_CHILDREN
-    m_tqchildren.setAutoDelete( false );
+    m_children.setAutoDelete( false );
 #endif
 }
 
@@ -188,12 +188,12 @@ void AST::setParent( AST* parent )
 #ifndef CPPPARSER_NO_CHILDREN
 void AST::appendChild( AST* child )
 {
-    m_tqchildren.append( child );
+    m_children.append( child );
 }
 
 void AST::removeChild( AST* child )
 {
-    m_tqchildren.remove( child );
+    m_children.remove( child );
 }
 #endif
 
@@ -466,7 +466,7 @@ TQString ClassOrNamespaceNameAST::text() const
 
     TQString str = m_name->text();
     if( m_templateArgumentList.get() )
-        str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >");
+        str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >");
 
     return str;
 }
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
index 49520e33..3c96da9e 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
@@ -232,7 +232,7 @@ public:
     void getEndPosition( int* line, int* col ) const;
 
 #ifndef CPPPARSER_NO_CHILDREN
-    TQPtrList<AST> tqchildren() { return m_tqchildren; }
+    TQPtrList<AST> children() { return m_children; }
     void appendChild( AST* child );
     void removeChild( AST* child );
 #endif
@@ -266,7 +266,7 @@ private:
     int m_endLine, m_endColumn;
     Slice m_slice;
 #ifndef CPPPARSER_NO_CHILDREN
-    TQPtrList<AST> m_tqchildren;
+    TQPtrList<AST> m_children;
 #endif
     TQString m_comment;
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index ee6937ac..44c10f82 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -35,8 +35,8 @@ AST* findNodeAt( AST* node, int line, int column )
     if( (line > startLine || (line == startLine && column >= startColumn)) &&
         (line < endLine || (line == endLine && column < endColumn)) ){
 
-        TQPtrList<AST> tqchildren = node->tqchildren();
-	TQPtrListIterator<AST> it( tqchildren );
+        TQPtrList<AST> children = node->children();
+	TQPtrListIterator<AST> it( children );
 	while( it.current() ){
 	    AST* a = it.current();
 	    ++it;
@@ -66,7 +66,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
     case NodeType_ClassSpecifier:
         if( ((ClassSpecifierAST*)ast)->name() ){
 	    s = ((ClassSpecifierAST*)ast)->name()->text();
-	    s = s.isEmpty() ? TQString::tqfromLatin1("<unnamed>") : s;
+	    s = s.isEmpty() ? TQString::fromLatin1("<unnamed>") : s;
 	    scope.push_back( s );
 	}
 	break;
@@ -74,7 +74,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
     case NodeType_Namespace:
     {
         AST* namespaceName = ((NamespaceAST*)ast)->namespaceName();
-	s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1("<unnamed>");
+	s = namespaceName ? namespaceName->text() : TQString::fromLatin1("<unnamed>");
 	scope.push_back( s );
     }
     break;
@@ -131,7 +131,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b
    text += scope;
 
    if( declarator->subDeclarator() )
-       text += TQString::tqfromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::tqfromLatin1(")");
+       text += TQString::fromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::fromLatin1(")");
 
    if( declarator->declaratorId() )
        text += declarator->declaratorId()->text();
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index f91813f1..eb3c4b6a 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -175,7 +175,7 @@ int Lexer::toInt( const Token& token )
 	int i = s[0] == 'L' ? 2 : 1; // wide char ?
 	if( s[i] == '\\' ){
 	    // escaped char
-	    int c = s[i+1].tqunicode();
+	    int c = s[i+1].unicode();
 	    switch( c ) {
 	    case '0':
 		return 0;
@@ -186,7 +186,7 @@ int Lexer::toInt( const Token& token )
 		return c;
 	    }
 	} else {
-	    return s[i].tqunicode();
+	    return s[i].unicode();
 	}
     } else {
 	return 0;
@@ -374,21 +374,21 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
                 TQString tokText = tok.text();
                 TQString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText;
                 if( str == ide ){
-                    //Problem p( i18n("unsafe use of macro '%1'").tqarg(ide), m_currentLine, m_currentColumn );
+                    //Problem p( i18n("unsafe use of macro '%1'").arg(ide), m_currentLine, m_currentColumn );
                     //m_driver->addProblem( m_driver->currentFileName(), p );
                     m_driver->removeMacro( ide );
                     // str = TQString();
                 }
 
                 if( stringify ) {
-                    textToInsert.append( TQString::tqfromLatin1("\"") + str + TQString::tqfromLatin1("\" ") );
+                    textToInsert.append( TQString::fromLatin1("\"") + str + TQString::fromLatin1("\" ") );
                 } else if( merge ){
                     textToInsert.truncate( textToInsert.length() - 1 );
                     textToInsert.append( str );
                 } else if( tok == Token_ellipsis && d->hasBind("...") ){
                     textToInsert.append( ellipsisArg );
                 } else {
-                    textToInsert.append( str + TQString::tqfromLatin1(" ") );
+                    textToInsert.append( str + TQString::fromLatin1(" ") );
                 }
             }
 
@@ -465,7 +465,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
 	tk.setStartPosition( startLine, startColumn );
 	tk.setEndPosition( m_currentLine, m_currentColumn );
     } else {
-	tk = CREATE_TOKEN( ch.tqunicode(), currentPosition(), 1 );
+	tk = CREATE_TOKEN( ch.unicode(), currentPosition(), 1 );
 	nextChar();
 	tk.setStartPosition( startLine, startColumn );
 	tk.setEndPosition( m_currentLine, m_currentColumn );
@@ -808,7 +808,7 @@ int Lexer::macroPrimary()
 {
     readWhiteSpaces( false );
     int result = 0;
-    switch( currentChar().tqunicode() ) {
+    switch( currentChar().unicode() ) {
     case '(':
 	nextChar();
 	result = macroExpression();
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
index a05a7ddf..2d009294 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
@@ -71,7 +71,7 @@ const HashEntry* Lookup::findEntry( const struct HashTable *table,
 const HashEntry* Lookup::findEntry( const struct HashTable *table,
 				    const TQString &s )
 {
-    return findEntry( table, s.tqunicode(), s.length() );
+    return findEntry( table, s.unicode(), s.length() );
 }
 
 int Lookup::find(const struct HashTable *table,
@@ -85,7 +85,7 @@ int Lookup::find(const struct HashTable *table,
 
 int Lookup::find(const struct HashTable *table, const TQString &s)
 {
-  return find(table, s.tqunicode(), s.length());
+  return find(table, s.unicode(), s.length());
 }
 
 unsigned int Lookup::hash(const TQChar *c, unsigned int len)
@@ -100,7 +100,7 @@ unsigned int Lookup::hash(const TQChar *c, unsigned int len)
 
 unsigned int Lookup::hash(const TQString &key)
 {
-    return hash(key.tqunicode(), key.length());
+    return hash(key.unicode(), key.length());
 }
 
 unsigned int Lookup::hash(const char *s)
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
index 51837b1e..b724faba 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
@@ -37,7 +37,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
       return false; \
   } \
   lex->nextToken(); \
@@ -47,7 +47,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
   } \
   else \
       lex->nextToken(); \
@@ -137,7 +137,7 @@ bool Parser::reportError( const Error& err )
 	if( s.isEmpty() )
 	    s = i18n( "<eof>" );
 
-	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) );
+	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) );
     }
 
     return true;
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
index 8b8cc8eb..3e6dde46 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
@@ -294,7 +294,7 @@ TQString URLUtil::envExpand ( const TQString& str )
       if (pos < 0)
         pos = len;
 
-      char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() );
+      char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() );
 
       if (ret)
       {
diff --git a/umbrello/umbrello/codeimport/nativeimportbase.cpp b/umbrello/umbrello/codeimport/nativeimportbase.cpp
index b2f7dac3..5005bd1e 100644
--- a/umbrello/umbrello/codeimport/nativeimportbase.cpp
+++ b/umbrello/umbrello/codeimport/nativeimportbase.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/umbrello/umbrello/dialog_utils.cpp b/umbrello/umbrello/dialog_utils.cpp
index 0e114082..d6092915 100644
--- a/umbrello/umbrello/dialog_utils.cpp
+++ b/umbrello/umbrello/dialog_utils.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <kinputdialog.h>
@@ -25,15 +25,15 @@
 
 namespace Dialog_Utils {
 
-TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row,
+TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row,
                                 TQLabel * &label, const TQString& labelText,
                                 TQLineEdit * &editField,
                                 const TQString& editFieldText /* = TQString() */)
 {
     label = new TQLabel(labelText, containingBox);
-    tqlayout->addWidget(label, row, 0);
+    layout->addWidget(label, row, 0);
     editField = new TQLineEdit(editFieldText, containingBox);
-    tqlayout->addWidget(editField, row, 1 );
+    layout->addWidget(editField, row, 1 );
     label->setBuddy(editField);
     return editField;
 }
diff --git a/umbrello/umbrello/dialog_utils.h b/umbrello/umbrello/dialog_utils.h
index 5588049e..59925d3e 100644
--- a/umbrello/umbrello/dialog_utils.h
+++ b/umbrello/umbrello/dialog_utils.h
@@ -31,7 +31,7 @@ namespace Dialog_Utils {
  * Create a labeled text lineedit widget.
  *
  * @param containingBox         The containing TQGroupBox.
- * @param tqlayout                The TQGridLayout to use.
+ * @param layout                The TQGridLayout to use.
  * @param row                   The row number within the TQGridLayout.
  * @param label                 The TQLabel object allocated (return value)
  * @param labelText             The label text.
@@ -39,7 +39,7 @@ namespace Dialog_Utils {
  * @param editFieldText         Initialization text in the editField (optional.)
  * @return a pointer to the TQLineEdit so you can setFocus() if necessary
  */
-TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row,
+TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row,
                                 TQLabel * &label, const TQString& labelText,
                                 TQLineEdit * &editField,
                                 const TQString& editFieldText = TQString());
diff --git a/umbrello/umbrello/dialogs/activitydialog.cpp b/umbrello/umbrello/dialogs/activitydialog.cpp
index ed7f779e..6449bd50 100644
--- a/umbrello/umbrello/dialogs/activitydialog.cpp
+++ b/umbrello/umbrello/dialogs/activitydialog.cpp
@@ -13,7 +13,7 @@
 #include "activitydialog.h"
 
 //qt includes
-#include <tqlayout.h>
+#include <layout.h>
 
 //kde includes
 #include <kiconloader.h>
diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp
index 10ccb04b..5b604d1d 100644
--- a/umbrello/umbrello/dialogs/activitypage.cpp
+++ b/umbrello/umbrello/dialogs/activitypage.cpp
@@ -18,7 +18,7 @@
 #include <klocale.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstringlist.h>
 
 ActivityPage::ActivityPage( TQWidget * pParent, StateWidget * pWidget ) : TQWidget( pParent ) {
@@ -37,7 +37,7 @@ void ActivityPage::setupPage() {
 
     m_pActivityGB = new TQGroupBox(i18n("Activities"), this );
 
-    // vertical box tqlayout for the activity lists, arrow buttons and the button box
+    // vertical box layout for the activity lists, arrow buttons and the button box
     TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pActivityGB );
     listVBoxLayout -> setMargin(margin);
     listVBoxLayout -> setSpacing ( 10 );
diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp
index b093cae0..089a8427 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.cpp
+++ b/umbrello/umbrello/dialogs/assocgenpage.cpp
@@ -13,7 +13,7 @@
 #include "assocgenpage.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <kcombobox.h>
 
 // kde includes
diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp
index ec95f619..67ff8cd1 100644
--- a/umbrello/umbrello/dialogs/assocpage.cpp
+++ b/umbrello/umbrello/dialogs/assocpage.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include "assocpage.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include "assocpropdlg.h"
 
@@ -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 * tqlayout = new TQHBoxLayout(m_pAssocGB);
-    tqlayout -> setSpacing(10);
-    tqlayout -> setMargin(margin);
+    TQHBoxLayout * layout = new TQHBoxLayout(m_pAssocGB);
+    layout -> setSpacing(10);
+    layout -> setMargin(margin);
 
     m_pAssocLB = new TQListBox(m_pAssocGB);
-    tqlayout -> addWidget(m_pAssocLB);
+    layout -> addWidget(m_pAssocLB);
     setMinimumSize(310, 330);
     fillListBox();
     m_pMenu = 0;
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp
index 1d5b9c77..32bedb48 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp
@@ -13,7 +13,7 @@
 #include "assocpropdlg.h"
 
 // qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp
index a44a5f05..1d884bad 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.cpp
+++ b/umbrello/umbrello/dialogs/assocrolepage.cpp
@@ -13,7 +13,7 @@
 #include "assocrolepage.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 
 // kde includes
 #include <klocale.h>
@@ -228,7 +228,7 @@ void AssocRolePage::constructWidget() {
     // m_pDocB-> setEnabled(false);
     m_pDocB->setWordWrap(TQMultiLineEdit::WidgetWidth);
 
-    // add group boxes to main tqlayout 
+    // add group boxes to main layout 
     mainLayout -> addWidget( propsAGB, 0, 0);
     mainLayout -> addWidget( scopeABG, 1, 0);
     mainLayout -> addWidget(changeABG, 2, 0);
diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp
index d633b6ae..a21018a2 100644
--- a/umbrello/umbrello/dialogs/classgenpage.cpp
+++ b/umbrello/umbrello/dialogs/classgenpage.cpp
@@ -13,7 +13,7 @@
 #include "classgenpage.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index a96cb645..16039a79 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -25,7 +25,7 @@
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace Uml;
 
@@ -60,11 +60,11 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi
     int margin = fontMetrics().height();
     setMinimumSize(310,330);
 
-    //main tqlayout contains our two group boxes, the list and the documentation
+    //main layout contains our two group boxes, the list and the documentation
     TQVBoxLayout* mainLayout = new TQVBoxLayout( this );
     mainLayout->setSpacing(10);
 
-    //top group box, contains a vertical tqlayout with list box above and buttons below
+    //top group box, contains a vertical layout with list box above and buttons below
     m_pItemListGB = new TQGroupBox(typeName, this );
     TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pItemListGB );
     listVBoxLayout->setMargin(margin);
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h
index 2675fd35..fb3527b2 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.h
+++ b/umbrello/umbrello/dialogs/classifierlistpage.h
@@ -16,7 +16,7 @@
 #include <tqwidget.h>
 #include <tqgroupbox.h>
 #include <tqlistbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 //kde includes
 #include <karrowbutton.h>
 
diff --git a/umbrello/umbrello/dialogs/classoptionspage.cpp b/umbrello/umbrello/dialogs/classoptionspage.cpp
index 670d86f1..87e8430c 100644
--- a/umbrello/umbrello/dialogs/classoptionspage.cpp
+++ b/umbrello/umbrello/dialogs/classoptionspage.cpp
@@ -13,7 +13,7 @@
 #include "classoptionspage.h"
 
 // qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/umbrello/umbrello/dialogs/classoptionspage.h b/umbrello/umbrello/dialogs/classoptionspage.h
index e9c81525..718944cc 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
- * tqchildren.  This is not normally called by you.  It is used by
+ * children.  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..e1da407f 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/classpropdlg.cpp
@@ -13,7 +13,7 @@
 #include "classpropdlg.h"
 
 // qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp
index 33fb743b..432bf941 100644
--- a/umbrello/umbrello/dialogs/codeeditor.cpp
+++ b/umbrello/umbrello/dialogs/codeeditor.cpp
@@ -26,8 +26,8 @@
 #include <tqcursor.h>
 #include <tqcolor.h>
 #include <tqlabel.h>
-#include <tqbrush.h>
-#include <tqlayout.h>
+#include <brush.h>
+#include <layout.h>
 #include <tqregexp.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h
index d5c42d1f..a1186223 100644
--- a/umbrello/umbrello/dialogs/codeeditor.h
+++ b/umbrello/umbrello/dialogs/codeeditor.h
@@ -22,7 +22,7 @@
 #include <tqpopupmenu.h>
 #include <tqstring.h>
 #include <tqlabel.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include "../codeviewerstate.h"
 #include "../textblocklist.h"
 
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
index 601b5385..0adc90c3 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
@@ -55,7 +55,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout1</cstring>
+                            <cstring>layout1</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -163,7 +163,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>30</width>
                                                 <height>20</height>
@@ -180,7 +180,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>30</width>
                                                 <height>20</height>
@@ -270,7 +270,7 @@ generator wants to use as output file already exists:</string>
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -297,7 +297,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <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="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
@@ -331,7 +331,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
index 30ab5817..b64e30dc 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
@@ -159,7 +159,7 @@ 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?").tqarg(info.filePath()),
+                                           i18n("The folder %1 does not exist. Do you want to create it now?").arg(info.filePath()),
                                            i18n("Output Folder Does Not Exist"), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes)
             {
                 TQDir dir;
@@ -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.").tqarg(info.filePath()),
+                KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").arg(info.filePath()),
                                    i18n("Please Choose Valid Folder"));
                 return;
             }
diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
index 517df16e..fdd59c2c 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
@@ -88,7 +88,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -146,7 +146,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -190,7 +190,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -206,7 +206,7 @@ for in the right hand side list</string>
             <cstring>status</cstring>
         </property>
         <attribute name="title">
-            <string>Code Generation tqStatus</string>
+            <string>Code Generation Status</string>
         </attribute>
         <vbox>
             <property name="name">
@@ -231,7 +231,7 @@ for in the right hand side list</string>
                     <cstring>GroupBox2</cstring>
                 </property>
                 <property name="title">
-                    <string>Generation tqStatus</string>
+                    <string>Generation Status</string>
                 </property>
                 <vbox>
                     <property name="name">
@@ -257,7 +257,7 @@ for in the right hand side list</string>
                         </column>
                         <column>
                             <property name="text">
-                                <string>Generation tqStatus</string>
+                                <string>Generation Status</string>
                             </property>
                             <property name="clickable">
                                 <bool>true</bool>
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
index 3f11adb3..054f84d7 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
@@ -19,7 +19,7 @@
 #include "codeviewerdialog.h"
 
 // qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqcheckbox.h>
 #include <kdebug.h>
@@ -69,7 +69,7 @@ void CodeViewerDialog::initGUI ( const char * name) {
 
     CodeViewerDialogBaseLayout->setMargin(margin);
 
-    resize( TQSize(width, height).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(width, height).expandedTo(minimumSizeHint()) );
 
 }
 
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h
index eef90445..d8774674 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.h
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -23,7 +23,7 @@
 #include <tqmap.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include "../codeviewerstate.h"
 #include "codeviewerdialogbase.h"
 
diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
index 665d6ccf..1a283200 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
+++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
index ed75ea9d..346dc44d 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
@@ -31,7 +31,7 @@
         </widget>
         <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
-                <cstring>tqcolorGroupBox</cstring>
+                <cstring>colorGroupBox</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
@@ -161,7 +161,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -192,7 +192,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="4">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp
index 34176e3a..0301ca18 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.cpp
+++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp
@@ -13,7 +13,7 @@
 #include "diagramprintpage.h"
 
 // qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrlist.h>
 #include <tqlistbox.h>
 #include <tqradiobutton.h>
@@ -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").tqarg(count);
-            TQString sID = TQString("%1").tqarg(ID2STR(view -> getID()));
+            TQString sCount = TQString("%1").arg(count);
+            TQString sID = TQString("%1").arg(ID2STR(view -> getID()));
             opts.insert(diagram + sCount, sID);
             count++;
         }
     }
-    opts.insert("kde-uml-count", TQString("%1").tqarg(count));
+    opts.insert("kde-uml-count", TQString("%1").arg(count));
 }
 
 void DiagramPrintPage::setOptions( const TQMap<TQString,TQString>& /*opts*/ ) {}
diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
index 8dc7f029..c7e430cb 100644
--- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui
+++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
@@ -70,7 +70,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout20</cstring>
+                        <cstring>layout20</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -78,7 +78,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -131,7 +131,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
@@ -164,7 +164,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -172,7 +172,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -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="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -229,7 +229,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -318,7 +318,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
index 443ad9e2..4ec2b30c 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@@ -13,7 +13,7 @@
 #include "exportallviewsdialog.h"
 
 // include files for TQt
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 
@@ -33,7 +33,7 @@ ExportAllViewsDialog::ExportAllViewsDialog(
   : ExportAllViewsDialogBase(parent,name, modal,fl) {
     // create and initialize m_imageType
     m_imageType = new KFileFilterCombo(this, "m_imageType");
-    m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
+    m_imageType->setSizePolicy(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/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
index e795d2c9..4a7edb52 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
+++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
@@ -120,7 +120,7 @@ Only the folders made by the user are created in the base directory (Logical vie
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -151,7 +151,7 @@ Only the folders made by the user are created in the base directory (Logical vie
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp
index effb585d..ab823a4b 100644
--- a/umbrello/umbrello/dialogs/notedialog.cpp
+++ b/umbrello/umbrello/dialogs/notedialog.cpp
@@ -15,8 +15,8 @@
 // qt/kde includes
 #include <tqlineedit.h>
 #include <tqgroupbox.h>
-#include <tqtextedit.h>
-#include <tqlayout.h>
+#include <textedit.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp
index 9088b794..d2baa69e 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.cpp
+++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -26,14 +26,14 @@ OverwriteDialogue::OverwriteDialogue(
         bool applyToAllRemaining, TQWidget* parent, const char* name) :
 KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) {
 
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
+    TQVBoxLayout* layout = 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.").tqarg(fileName).tqarg(outputDirectory), plainPage() );
-    tqlayout->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.").arg(fileName).arg(outputDirectory), plainPage() );
+    layout->addWidget(dialogueLabel);
 
     m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() );
     m_applyToAllRemaining->setChecked(applyToAllRemaining);
-    tqlayout->addWidget(m_applyToAllRemaining);
+    layout->addWidget(m_applyToAllRemaining);
 
     setButtonText(KDialogBase::Ok, i18n("&Overwrite"));
     setButtonText(KDialogBase::Apply, i18n("&Generate Similar File Name"));
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp
index 38a75292..c0f161dc 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp
@@ -13,7 +13,7 @@
 #include "parmpropdlg.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 
 // kde includes
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h
index 0164277d..851eedae 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.h
+++ b/umbrello/umbrello/dialogs/parmpropdlg.h
@@ -16,7 +16,7 @@
 #include <kcombobox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
index a5b742b1..172fc0cd 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include "pkgcontentspage.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include "../umlobjectlist.h"
 #include "../uml.h"
@@ -29,12 +29,12 @@ PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg)
     m_pContentGB = new TQGroupBox(i18n("Contained Items"), this);
     mainLayout -> addWidget(m_pContentGB);
 
-    TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pContentGB);
-    tqlayout -> setSpacing(10);
-    tqlayout -> setMargin(margin);
+    TQHBoxLayout * layout = new TQHBoxLayout(m_pContentGB);
+    layout -> setSpacing(10);
+    layout -> setMargin(margin);
 
     m_pContentLB = new TQListBox(m_pContentGB);
-    tqlayout -> addWidget(m_pContentLB);
+    layout -> addWidget(m_pContentLB);
     setMinimumSize(310, 330);
     fillListBox();
     m_pMenu = 0;
diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp
index 1c175752..d4694afb 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.cpp
+++ b/umbrello/umbrello/dialogs/selectopdlg.cpp
@@ -13,7 +13,7 @@
 #include "selectopdlg.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 
 // kde includes
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index b5cddff5..f4827ac8 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -13,7 +13,7 @@
 #include "settingsdlg.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqvbox.h>
 // kde includes
diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp
index 564146ec..1d3288d7 100644
--- a/umbrello/umbrello/dialogs/statedialog.cpp
+++ b/umbrello/umbrello/dialogs/statedialog.cpp
@@ -13,7 +13,7 @@
 #include "statedialog.h"
 
 //qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqmultilineedit.h>
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp
index d6ea57ce..c46e2af6 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp
@@ -13,7 +13,7 @@
 #include "umlattributedialog.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
index 55a47857..d00718b6 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
@@ -13,7 +13,7 @@
 #include "umlentityattributedialog.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index e8216b99..c177a01b 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -13,7 +13,7 @@
 #include "umloperationdialog.h"
 
 //qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlistbox.h>
 #include <tqbuttongroup.h>
@@ -463,7 +463,7 @@ bool UMLOperationDialog::apply()
     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")).tqarg(classifier->getName())
+        TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(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/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp
index 607ac759..e66c841f 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.cpp
+++ b/umbrello/umbrello/dialogs/umlroledialog.cpp
@@ -13,7 +13,7 @@
 #include "umlroledialog.h"
 
 // qt/kde  includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <kdebug.h>
 #include <klocale.h>
 
@@ -35,7 +35,7 @@ void UMLRoleDialog::setupDialog() {
     m_pRoleProps = new UMLRoleProperties(this, m_pRole);
     setMainWidget( m_pRoleProps );
 
-    resize( TQSize(425, 620).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(425, 620).expandedTo(minimumSizeHint()) );
 
     //  topLayout -> addWidget( m_pParmsGB);
 
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp
index fe2e2f5f..998a6311 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.cpp
+++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqradiobutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqlineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
index ecaa98ae..dde405a5 100644
--- a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
+++ b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
@@ -14,7 +14,7 @@
     </property>
     <widget class="TQLayoutWidget">
         <property name="name">
-            <cstring>tqlayout6</cstring>
+            <cstring>layout6</cstring>
         </property>
         <property name="geometry">
             <rect>
@@ -37,7 +37,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <property name="geometry">
                         <rect>
@@ -111,7 +111,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout2</cstring>
+                            <cstring>layout2</cstring>
                         </property>
                         <grid>
                             <property name="name">
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
index 6075fbe4..de8af77c 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
@@ -13,7 +13,7 @@
 #include "umltemplatedialog.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp
index 33a6a21f..586f729d 100644
--- a/umbrello/umbrello/dialogs/umlviewdialog.cpp
+++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp
@@ -14,12 +14,12 @@
 
 // qt/kde includes
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqgroupbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqspinbox.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
index 824d708f..ca84bf7d 100644
--- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
+++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
@@ -14,7 +14,7 @@
 #include "../umlview.h"
 #include "../umlwidget.h"
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
index e577a6c3..266dd12f 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@@ -33,7 +33,7 @@
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "uml.h"
 #include "umldoc.h"
@@ -96,7 +96,7 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
 
   // lets open the file for writing
   if( !file.open( IO_WriteOnly ) ) {
-    KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(tmpfile.name()), i18n("Save Error"));
+    KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(tmpfile.name()), i18n("Save Error"));
     return false;
   }
   umlDoc->saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it
diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
index a0555188..c00e9c5d 100644
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
@@ -33,7 +33,7 @@
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "uml.h"
 #include "umldoc.h"
diff --git a/umbrello/umbrello/docwindow.cpp b/umbrello/umbrello/docwindow.cpp
index ab935d00..d2900533 100644
--- a/umbrello/umbrello/docwindow.cpp
+++ b/umbrello/umbrello/docwindow.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmultilineedit.h>
 #include <klocale.h>
 
diff --git a/umbrello/umbrello/floatingtextwidget.cpp b/umbrello/umbrello/floatingtextwidget.cpp
index 700f9de4..94c5ec21 100644
--- a/umbrello/umbrello/floatingtextwidget.cpp
+++ b/umbrello/umbrello/floatingtextwidget.cpp
@@ -225,7 +225,7 @@ void FloatingTextWidget::changeName(const TQString& newText)
         setText( newText );
         UMLApp::app()->getDocument()->setModified(true);
     }
-    tqsetVisible( true );
+    setVisible( true );
     updateComponentSize();
     update();
 }
@@ -265,7 +265,7 @@ void FloatingTextWidget::changeTextDlg() {
 
     if(ok && newText != getText() && isTextValid(newText)) {
         setText( newText );
-        tqsetVisible( ( getText().length() > 0 ) );
+        setVisible( ( getText().length() > 0 ) );
         updateComponentSize();
         update();
     }
@@ -302,7 +302,7 @@ void FloatingTextWidget::showOpDlg() {
     opText = selectDlg.getOpText();
     if (selectDlg.isClassOp()) {
         Model_Utils::OpDescriptor od;
-        Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(opText, od, c);
+        Model_Utils::Parse_Status st = Model_Utils::parseOperation(opText, od, c);
         if (st == Model_Utils::PS_OK) {
             UMLClassifierList selfAndAncestors = c->findSuperClassConcepts();
             selfAndAncestors.prepend(c);
@@ -444,7 +444,7 @@ bool FloatingTextWidget::loadFromXMI( TQDomElement & qElement ) {
 void FloatingTextWidget::setMessageText() {
     if (m_pLink)
         m_pLink->setMessageText(this);
-    tqsetVisible(getText().length() > 0);
+    setVisible(getText().length() > 0);
     updateComponentSize();
 }
 
diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp
index 127c3b34..1c608d8f 100644
--- a/umbrello/umbrello/folder.cpp
+++ b/umbrello/umbrello/folder.cpp
@@ -286,11 +286,11 @@ bool UMLFolder::loadDiagramsFromXMI(TQDomNode& diagrams) {
 bool UMLFolder::loadFolderFile(const TQString& path) {
     TQFile file(path);
     if (!file.exists()) {
-        KMessageBox::error(0, i18n("The folderfile %1 does not exist.").tqarg(path), i18n("Load Error"));
+        KMessageBox::error(0, i18n("The folderfile %1 does not exist.").arg(path), i18n("Load Error"));
         return false;
     }
     if (!file.open(IO_ReadOnly)) {
-        KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").tqarg(path), i18n("Load Error"));
+        KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").arg(path), i18n("Load Error"));
         return false;
     }
     TQTextStream stream(&file);
diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp
index 3968e72a..70b98b6c 100644
--- a/umbrello/umbrello/import_rose.cpp
+++ b/umbrello/umbrello/import_rose.cpp
@@ -14,7 +14,7 @@
 
 // qt includes
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqptrlist.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp
index c5efcb65..95007d73 100644
--- a/umbrello/umbrello/kplayerslideraction.cpp
+++ b/umbrello/umbrello/kplayerslideraction.cpp
@@ -74,7 +74,7 @@ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text,
     m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised);
     m_frame -> setLineWidth (2);
     m_slider = new KPlayerSlider (Qt::Vertical, m_frame);
-    m_frame -> resize (36, m_slider -> tqsizeHint().height() + 4);
+    m_frame -> resize (36, m_slider -> sizeHint().height() + 4);
     m_slider -> setGeometry (m_frame -> contentsRect());
     //CHANGED  kdDebug() << "Popup slider size " << m_slider -> width() << "x" << m_slider -> height() << "\n";
     connect (m_slider, TQT_SIGNAL (changed (int)), receiver, slot);
@@ -278,9 +278,9 @@ KPlayerSlider::~KPlayerSlider()
     //CHANGED  kdDebug() << "KPlayerSlider destroyed\n";
 }
 
-TQSize KPlayerSlider::tqsizeHint() const
+TQSize KPlayerSlider::sizeHint() const
 {
-    TQSize hint = TQSlider::tqsizeHint();
+    TQSize hint = TQSlider::sizeHint();
     //CHANGED int length = kPlayerSettings() -> preferredSliderLength();
     int length = 200;
     if ( orientation() == Qt::Horizontal )
@@ -296,10 +296,10 @@ TQSize KPlayerSlider::tqsizeHint() const
     return hint;
 }
 
-TQSize KPlayerSlider::tqminimumSizeHint() const
+TQSize KPlayerSlider::minimumSizeHint() const
 {
     //kdDebug() << "KPlayerSlider minimum size hint\n";
-    TQSize hint = TQSlider::tqminimumSizeHint();
+    TQSize hint = TQSlider::minimumSizeHint();
     //CHANGED  int length = kPlayerSettings() -> minimumSliderLength();
     int length = 200;
     if ( orientation() == Qt::Horizontal )
diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h
index 8c0b11ef..14866991 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -38,10 +38,10 @@ public:
 
     /** The size hint.
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     /** The minimum size hint.
      */
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     /** The minimum value.
       */
diff --git a/umbrello/umbrello/linepath.cpp b/umbrello/umbrello/linepath.cpp
index 2d23021d..df3f614d 100644
--- a/umbrello/umbrello/linepath.cpp
+++ b/umbrello/umbrello/linepath.cpp
@@ -176,7 +176,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
         line -> setZ( -2 );
         line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
         line -> setPen( getPen() );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         m_LineList.insert( 1, line );
         if (!bLoading)
             setupSelected();
@@ -191,7 +191,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
         line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
         line -> setZ( -2 );
         line -> setPen( getPen() );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         m_LineList.append( line );
         if (!bLoading)
             setupSelected();
@@ -205,7 +205,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
     line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
     line -> setZ( -2 );
     line -> setPen( getPen() );
-    line -> tqsetVisible( true );
+    line -> setVisible( true );
     m_LineList.insert( pointIndex, line );
     if (!bLoading)
         setupSelected();
@@ -277,7 +277,7 @@ bool LinePath::setStartEndPoints( const TQPoint &start, const TQPoint &end ) {
         line -> setPoints( start.x(), start.y(), end.x(), end.y() );
         line -> setZ( -2 );
         line -> setPen( getPen() );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         m_LineList.append( line );
         return true;
     }
@@ -644,7 +644,7 @@ void LinePath::growList(LineList &list, int by) {
         TQCanvasLine * line = new TQCanvasLine( getCanvas() );
         line -> setZ( 0 );
         line -> setPen( pen );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         list.append( line );
     }
 }
@@ -665,7 +665,7 @@ void LinePath::createHeadLines() {
     case Uml::at_Realization:
         growList(m_HeadList, 3);
         m_pClearPoly = new TQCanvasPolygon( canvas );
-        m_pClearPoly -> tqsetVisible( true );
+        m_pClearPoly -> setVisible( true );
         m_pClearPoly -> setBrush( TQBrush( TQt::white ) );
         m_pClearPoly -> setZ( -1 );
         break;
@@ -674,7 +674,7 @@ void LinePath::createHeadLines() {
     case Uml::at_Aggregation:
         growList(m_HeadList, 4);
         m_pClearPoly = new TQCanvasPolygon( canvas );
-        m_pClearPoly -> tqsetVisible( true );
+        m_pClearPoly -> setVisible( true );
         if( getAssocType() == Uml::at_Aggregation )
             m_pClearPoly -> setBrush( TQBrush( TQt::white ) );
         else
diff --git a/umbrello/umbrello/messagewidget.cpp b/umbrello/umbrello/messagewidget.cpp
index 6f2eea21..f3227c31 100644
--- a/umbrello/umbrello/messagewidget.cpp
+++ b/umbrello/umbrello/messagewidget.cpp
@@ -64,7 +64,7 @@ void MessageWidget::init() {
     m_pOw[Uml::A] = m_pOw[Uml::B] = NULL;
     m_pFText = NULL;
     m_nY = 0;
-    tqsetVisible(true);
+    setVisible(true);
 }
 
 MessageWidget::~MessageWidget() {
@@ -353,7 +353,7 @@ void MessageWidget::calculateWidget() {
     setMessageText(m_pFText);
     calculateDimensions();
 
-    tqsetVisible(true);
+    setVisible(true);
 
     setX(m_nPosX);
     setY(m_nY);
@@ -464,7 +464,7 @@ bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) {
     m_pFText -> setText("");
     m_pFText->setActivated();
     TQString messageText = m_pFText->getText();
-    m_pFText->tqsetVisible( messageText.length() > 1 );
+    m_pFText->setVisible( messageText.length() > 1 );
 
     connect(m_pOw[Uml::A], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType)));
     connect(m_pOw[Uml::B], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType)));
diff --git a/umbrello/umbrello/messagewidget.h b/umbrello/umbrello/messagewidget.h
index 9d36922b..db24fd36 100644
--- a/umbrello/umbrello/messagewidget.h
+++ b/umbrello/umbrello/messagewidget.h
@@ -209,7 +209,7 @@ public:
     UMLClassifier * getSeqNumAndOp(TQString& seqNum, TQString& op);
 
     /**
-     * Calculate the tqgeometry of the widget.
+     * Calculate the geometry of the widget.
      */
     void calculateWidget();
 
diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp
index 4131d9b1..1c7a1add 100644
--- a/umbrello/umbrello/model_utils.cpp
+++ b/umbrello/umbrello/model_utils.cpp
@@ -407,7 +407,7 @@ int stringToDirection(TQString input, Uml::Parameter_Direction & result) {
     return dirLen;
 }
 
-Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) {
+Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) {
 
     UMLDoc *pDoc = UMLApp::app()->getDocument();
 
@@ -430,7 +430,7 @@ Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *ownin
     return PS_OK;
 }
 
-Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
+Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
                             Uml::Visibility *vis /* = 0 */) {
     UMLDoc *pDoc = UMLApp::app()->getDocument();
 
@@ -494,7 +494,7 @@ Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owni
     return PS_OK;
 }
 
-Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) {
+Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) {
     UMLDoc *pDoc = UMLApp::app()->getDocument();
 
     m = m.simplifyWhiteSpace();
@@ -546,7 +546,7 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own
     TQStringList args = TQStringList::split( TQRegExp("\\s*,\\s*"), arglist);
     for (TQStringList::Iterator lit = args.begin(); lit != args.end(); ++lit) {
         NameAndType nmTp;
-        Parse_tqStatus ps = parseAttribute(*lit, nmTp, owningScope);
+        Parse_Status ps = parseAttribute(*lit, nmTp, owningScope);
         if (ps)
             return ps;
         desc.m_args.append(nmTp);
@@ -554,7 +554,7 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own
     return PS_OK;
 }
 
-TQString psText(Parse_tqStatus value) {
+TQString psText(Parse_Status value) {
     const TQString text[] = {
                                i18n("OK"), i18n("Empty"), i18n("Malformed argument"),
                                i18n("Unknown argument type"), i18n("Illegal method name"),
diff --git a/umbrello/umbrello/model_utils.h b/umbrello/umbrello/model_utils.h
index 6660ff64..1e8bd83b 100644
--- a/umbrello/umbrello/model_utils.h
+++ b/umbrello/umbrello/model_utils.h
@@ -236,7 +236,7 @@ Uml::Programming_Language stringToProgLang(TQString str);
 /**
  * Return type of parseOperation()
  */
-enum Parse_tqStatus {
+enum Parse_Status {
     PS_OK, PS_Empty, PS_Malformed_Arg, PS_Unknown_ArgType,
     PS_Illegal_MethodName, PS_Unknown_ReturnType, PS_Unspecified_Error
 };
@@ -284,7 +284,7 @@ struct OpDescriptor {
  * @param owningScope   Pointer to the owning scope of the template param.
  * @return      Error status of the parse, PS_OK for success.
  */
-Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope);
+Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope);
 
 /**
  * Parses an attribute given in UML syntax.
@@ -303,7 +303,7 @@ Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *ownin
  *
  * @return      Error status of the parse, PS_OK for success.
  */
-Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
+Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
                             Uml::Visibility *vis = 0);
 
 /**
@@ -316,12 +316,12 @@ Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owni
  * @param owningScope   Pointer to the owning scope of the operation.
  * @return      Error status of the parse, PS_OK for success.
  */
-Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope);
+Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope);
 
 /**
- * Returns the Parse_tqStatus as a text.
+ * Returns the Parse_Status as a text.
  */
-TQString psText(Parse_tqStatus value);
+TQString psText(Parse_Status value);
 
 }
 
diff --git a/umbrello/umbrello/notewidget.cpp b/umbrello/umbrello/notewidget.cpp
index 1826847b..c23425d1 100644
--- a/umbrello/umbrello/notewidget.cpp
+++ b/umbrello/umbrello/notewidget.cpp
@@ -14,7 +14,7 @@
 //qt includes
 #include <tqpointarray.h>
 #include <tqpainter.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqframe.h>
 // kde includes
 #include <kdebug.h>
@@ -201,7 +201,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse
 #if defined (NOTEWIDGET_EMBED_EDITOR)
     m_pEditor->setText( getDoc() );
     m_pEditor->setShown(true);
-    m_pEditor->tqrepaint();
+    m_pEditor->repaint();
 #else
     if (p == NULL)
         return;
diff --git a/umbrello/umbrello/notewidgetcontroller.h b/umbrello/umbrello/notewidgetcontroller.h
index 7c3da48c..081556ed 100644
--- a/umbrello/umbrello/notewidgetcontroller.h
+++ b/umbrello/umbrello/notewidgetcontroller.h
@@ -44,7 +44,7 @@ public:
     /**
      * Overriden from UMLWidgetController.
      * Handles a mouse move event.
-     * Executes base code and then sets the tqgeometry of the editor.
+     * Executes base code and then sets the geometry of the editor.
      *
      * @param me The TQMouseEvent event.
      */
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp
index 1986cfa3..193f9545 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.cpp
+++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp
@@ -650,7 +650,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
         UMLOperation *op = static_cast<UMLOperation*>(movingObject);
         if(newClassifier->checkOperationSignature(op->getName(), op->getParmList()))
         {
-            TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(newClassifier->getName())
+            TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(newClassifier->getName())
                           +
                           TQString(i18n("Choose a different name or parameter list." ));
             KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
@@ -666,7 +666,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
         //              UMLAttribute *att = static_cast<UMLAttribute*>(movingObject);
         //              if(!newClassifier->checkAttributeSignature(att))
         //              {
-        //                      TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).tqarg(newClassifier->getName())
+        //                      TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).arg(newClassifier->getName())
         //                              +
         //                            TQString(i18n("Choose a different name or parameter list." ));
         //                      KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
diff --git a/umbrello/umbrello/seqlinewidget.cpp b/umbrello/umbrello/seqlinewidget.cpp
index 18d70a68..9b992398 100644
--- a/umbrello/umbrello/seqlinewidget.cpp
+++ b/umbrello/umbrello/seqlinewidget.cpp
@@ -28,7 +28,7 @@ SeqLineWidget::SeqLineWidget( UMLView * pView, ObjectWidget * pObject ) : TQCanv
     m_pObject = pObject;
     setPen( TQPen( m_pObject->getLineColor(), 0, TQt::DashLine ) );
     setZ( 0 );
-    tqsetVisible( true );
+    setVisible( true );
     m_DestructionBox.line1 = 0;
     m_nLengthY = 250;
     setupDestructionBox();
@@ -83,13 +83,13 @@ void SeqLineWidget::setupDestructionBox() {
 
     m_DestructionBox.line1 = new TQCanvasLine( m_pView->canvas() );
     m_DestructionBox.setLine1Points(rect);
-    m_DestructionBox.line1->tqsetVisible( true );
+    m_DestructionBox.line1->setVisible( true );
     m_DestructionBox.line1->setPen( TQPen(m_pObject->getLineColor(), 2) );
     m_DestructionBox.line1->setZ( 3 );
 
     m_DestructionBox.line2 = new TQCanvasLine( m_pView -> canvas() );
     m_DestructionBox.setLine2Points(rect);
-    m_DestructionBox.line2->tqsetVisible( true );
+    m_DestructionBox.line2->setVisible( true );
     m_DestructionBox.line2->setPen( TQPen(m_pObject->getLineColor(), 2) );
     m_DestructionBox.line2->setZ( 3 );
 }
diff --git a/umbrello/umbrello/toolbarstatearrow.cpp b/umbrello/umbrello/toolbarstatearrow.cpp
index 05e98734..cbcbc20f 100644
--- a/umbrello/umbrello/toolbarstatearrow.cpp
+++ b/umbrello/umbrello/toolbarstatearrow.cpp
@@ -58,7 +58,7 @@ void ToolBarStateArrow::mousePressEmpty() {
             line->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(),
                             m_pMouseEvent->x(), m_pMouseEvent->y());
             line->setPen(TQPen(TQColor("grey"), 0, TQt::DotLine));
-            line->tqsetVisible(true);
+            line->setVisible(true);
             line->setZ(100);
             m_selectionRect.append(line);
         }
diff --git a/umbrello/umbrello/toolbarstateassociation.cpp b/umbrello/umbrello/toolbarstateassociation.cpp
index 340a28dc..005e5def 100644
--- a/umbrello/umbrello/toolbarstateassociation.cpp
+++ b/umbrello/umbrello/toolbarstateassociation.cpp
@@ -132,7 +132,7 @@ void ToolBarStateAssociation::setFirstWidget() {
     m_associationLine->setPoints(pos.x(), pos.y(), pos.x(), pos.y());
     m_associationLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine));
 
-    m_associationLine->tqsetVisible(true);
+    m_associationLine->setVisible(true);
 
     m_pUMLView->viewport()->setMouseTracking(true);
 }
diff --git a/umbrello/umbrello/toolbarstatemessages.cpp b/umbrello/umbrello/toolbarstatemessages.cpp
index 453c6d7c..f8e5930a 100644
--- a/umbrello/umbrello/toolbarstatemessages.cpp
+++ b/umbrello/umbrello/toolbarstatemessages.cpp
@@ -118,7 +118,7 @@ void ToolBarStateMessages::setFirstWidget(ObjectWidget* firstObject) {
     m_messageLine->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y());
     m_messageLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine));
 
-    m_messageLine->tqsetVisible(true);
+    m_messageLine->setVisible(true);
 
     m_pUMLView->viewport()->setMouseTracking(true);
 }
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 8a305952..8f991962 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -13,7 +13,7 @@
 #include "uml.h"
 
 // qt includes
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpopupmenu.h>
 #include <tqtimer.h>
 #include <tqwidgetstack.h>
@@ -55,7 +55,7 @@
 #include "umlviewlist.h"
 #include "worktoolbar.h"
 #ifdef HAVE_DOT
-# include "autotqlayout/autolayoutdlg.h" //dimitri
+# include "autolayout/autolayoutdlg.h" //dimitri
 #endif
 #include "model_utils.h"
 #include "clipboard/umlclipboard.h"
@@ -225,8 +225,8 @@ void UMLApp::initActions() {
                                 TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
 
 #if defined (HAVE_DOT)
-    autotqlayout = new KAction(i18n("&Autotqlayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutotqlayout()),
-                             actionCollection(),"autotqlayout");
+    autolayout = new KAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()),
+                             actionCollection(),"autolayout");
 #endif
     sequenceDiagram= new KAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0,
                                   TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" );
@@ -374,7 +374,7 @@ void UMLApp::setupZoomMenu() {
 
 void UMLApp::initStatusBar() {
     m_statusLabel = new KStatusBarLabel( i18n("Ready."), 0, statusBar() );
-    m_statusLabel->setFixedHeight( m_statusLabel->tqsizeHint().height() );
+    m_statusLabel->setFixedHeight( m_statusLabel->sizeHint().height() );
 
     m_statusLabel->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
     m_statusLabel->setMargin( 0 );
@@ -382,7 +382,7 @@ void UMLApp::initStatusBar() {
 
     statusBar()->addWidget( m_statusLabel, 1, false );
 
-    m_statusLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter);
+    m_statusLabel->setAlignment(TQt::AlignLeft|TQt::AlignVCenter);
 
     connect(m_doc, TQT_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQT_SLOT( slotStatusMsg(const TQString &) ));
 }
@@ -737,7 +737,7 @@ bool UMLApp::slotFileSaveAs()
             TQDir d = url.path(-1);
 
             if(TQFile::exists(d.path())) {
-                int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").tqarg(url.path()), i18n("Warning"), i18n("Overwrite"));
+                int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").arg(url.path()), i18n("Warning"), i18n("Overwrite"));
                 if(want_save == KMessageBox::Continue)
                     cont = false;
             } else
@@ -776,7 +776,7 @@ void UMLApp::slotFilePrint()
     DiagramPrintPage * selectPage = new DiagramPrintPage(0, m_doc);
     printer.addDialogPage(selectPage);
     TQString msg;
-    if (printer.setup(this, i18n("Print %1").tqarg(m_doc->URL().prettyURL()))) {
+    if (printer.setup(this, i18n("Print %1").arg(m_doc->URL().prettyURL()))) {
 
         m_doc -> print(&printer);
     }
@@ -842,7 +842,7 @@ void UMLApp::slotEditCopy() {
 
 void UMLApp::slotEditPaste() {
     slotStatusMsg(i18n("Inserting clipboard contents..."));
-    TQMimeSource* data = TQApplication::tqclipboard()->data();
+    TQMimeSource* data = TQApplication::clipboard()->data();
     UMLClipboard clipboard;
     setCursor(KCursor::waitCursor());
     if(!clipboard.paste(data)) {
@@ -895,7 +895,7 @@ void UMLApp::slotStatusMsg(const TQString &text) {
     statusBar()->clear();
     m_statusLabel->setText( text );
 
-    m_statusLabel->tqrepaint();
+    m_statusLabel->repaint();
 }
 
 void UMLApp::slotClassDiagram() {
@@ -977,7 +977,7 @@ void UMLApp::enableRedo(bool enable) {
 
 /** initialize the QT's global clipboard support for the application */
 void UMLApp::initClip() {
-    TQClipboard* clip = TQApplication::tqclipboard();
+    TQClipboard* clip = TQApplication::clipboard();
     connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged()));
 
     // Don't poll the X11 clipboard every second. This is a little expensive and resulted
@@ -1007,7 +1007,7 @@ bool UMLApp::canDecode(const TQMimeSource* mimeSource) {
 }
 
 void UMLApp::slotClipDataChanged() {
-    TQMimeSource * data = TQApplication::tqclipboard()->data();
+    TQMimeSource * data = TQApplication::clipboard()->data();
 
     //Pass the MimeSource to the Doc
     editPaste->setEnabled( data && canDecode(data) );
@@ -1075,7 +1075,7 @@ bool UMLApp::editCutCopy( bool bFromView ) {
     TQMimeSource * clipdata = 0;
 
     if ((clipdata = clipboard.copy(bFromView)) != 0) {
-        TQClipboard* clip = TQApplication::tqclipboard();
+        TQClipboard* clip = TQApplication::clipboard();
         clip->setData(clipdata);//the global clipboard takes ownership of the clipdata memory
         connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged()));
         return true;
@@ -1679,7 +1679,7 @@ void UMLApp::slotMoveTabRight() {
     //m_tabWidget->moveTab( m_tabWidget->currentPageIndex(), m_tabWidget->currentPageIndex() + 1 );
 }
 
-void UMLApp::slotAutotqlayout(){
+void UMLApp::slotAutolayout(){
 #ifdef HAVE_DOT
 /*
     TQDialog* d = new AutolayoutDlg(getCurrentView());
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index 3e5b27e7..f8e1be48 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -340,7 +340,7 @@ protected:
 
     /**
      * Save general Options like all bar positions and status
-     * as well as the tqgeometry and the recent file list to
+     * as well as the geometry and the recent file list to
      * the configuration file.
      */
     void saveOptions();
@@ -535,7 +535,7 @@ public slots:
     /**
      * Autolayouts the current class diagram
      */
-    void slotAutotqlayout();
+    void slotAutolayout();
 
     /**
      * Changes the statusbar contents for the standard label
@@ -959,7 +959,7 @@ private:
     KAction* deleteSelectedWidget;
     KAction* deleteDiagram;
 #ifdef HAVE_DOT
-    KAction* autotqlayout;
+    KAction* autolayout;
 #endif
 
     KAction* changeTabLeft;
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index 39c8ce61..edf56b23 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -352,7 +352,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     KIO::NetAccess::download( url, tmpfile, UMLApp::app() );
     TQFile file( tmpfile );
     if ( !file.exists() ) {
-        KMessageBox::error(0, i18n("The file %1 does not exist.").tqarg(d.path()), i18n("Load Error"));
+        KMessageBox::error(0, i18n("The file %1 does not exist.").arg(d.path()), i18n("Load Error"));
         m_doc_url.setFileName(i18n("Untitled"));
         m_bLoading = false;
         newDocument();
@@ -377,7 +377,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
         KTar archive(tmpfile, mimetype);
         if (archive.open(IO_ReadOnly) == false)
         {
-            KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").tqarg(d.path()), i18n("Load Error"));
+            KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").arg(d.path()), i18n("Load Error"));
             m_doc_url.setFileName(i18n("Untitled"));
             m_bLoading = false;
             newDocument();
@@ -419,7 +419,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             entry = const_cast<KArchiveEntry*>(rootDir->entry(*it));
             if (entry == 0)
             {
-                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
+                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 m_bLoading = false;
                 newDocument();
@@ -431,7 +431,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             fileEntry = dynamic_cast<KArchiveFile*>(entry);
             if (fileEntry == 0)
             {
-                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
+                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 m_bLoading = false;
                 newDocument();
@@ -445,7 +445,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             TQFile xmi_file(tmp_dir.name() + *it);
             if( !xmi_file.open( IO_ReadOnly ) )
             {
-                KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").tqarg(d.path()), i18n("Load Error"));
+                KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").arg(d.path()), i18n("Load Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 m_bLoading = false;
                 newDocument();
@@ -458,7 +458,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             tmp_dir.unlink();
 
         } else {
-            KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
+            KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
             m_doc_url.setFileName(i18n("Untitled"));
             m_bLoading = false;
             newDocument();
@@ -469,7 +469,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     } else {
         // no, it seems to be an ordinary file
         if( !file.open( IO_ReadOnly ) ) {
-            KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error"));
+            KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error"));
             m_doc_url.setFileName(i18n("Untitled"));
             m_bLoading = false;
             newDocument();
@@ -485,7 +485,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     KIO::NetAccess::removeTempFile( tmpfile );
     if( !status )
     {
-        KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error"));
+        KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error"));
         m_bLoading = false;
         newDocument();
         return false;
@@ -553,7 +553,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
         // now check if we can write to the file
         if (archive->open(IO_WriteOnly) == false)
         {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
 
@@ -562,7 +562,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
         KTempFile tmp_xmi_file;
         file.setName(tmp_xmi_file.name());
         if( !file.open( IO_WriteOnly ) ) {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
         saveToXMI(*TQT_TQIODEVICE(&file)); // save XMI to this file...
@@ -582,7 +582,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
 #if KDE_IS_VERSION(3,4,89)
         if (!archive->closeSucceeded())
         {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
 #endif
@@ -617,7 +617,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
 
         // lets open the file for writing
         if( !file.open( IO_WriteOnly ) ) {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
         saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it
@@ -630,7 +630,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
         } else {
             // now remove the original file
             if ( KIO::NetAccess::file_move( tmpfile.name(), d.path(), -1, true ) == false ) {
-                KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+                KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 return false;
             }
@@ -638,7 +638,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
     }
     if( !uploaded )
     {
-        KMessageBox::error(0, i18n("There was a problem uploading file: %1").tqarg(d.path()), i18n("Save Error"));
+        KMessageBox::error(0, i18n("There was a problem uploading file: %1").arg(d.path()), i18n("Save Error"));
         m_doc_url.setFileName(i18n("Untitled"));
     }
     setModified(false);
@@ -1096,7 +1096,7 @@ void UMLDoc::removeDiagram(Uml::IDType id) {
         kError()<<"Request to remove diagram " << ID2STR(id) << ": Diagram not found!"<<endl;
         return;
     }
-    if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").tqarg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) {
+    if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) {
         removeView(umlview);
         emit sigDiagramRemoved(id);
         setModified(true);
@@ -1213,7 +1213,7 @@ void UMLDoc::saveToXMI(TQIODevice& file) {
 
     TQDomElement root = doc.createElement( "XMI" );
     root.setAttribute( "xmi.version", "1.2" );
-    TQDateTime now = TQDateTime::tqcurrentDateTime();
+    TQDateTime now = TQDateTime::currentDateTime();
     root.setAttribute( "timestamp", now.toString(Qt::ISODate));
     root.setAttribute( "verified", "false");
     root.setAttribute( "xmlns:UML", "http://schema.omg.org/spec/UML/1.3");
@@ -1915,7 +1915,7 @@ void UMLDoc::print(KPrinter * pPrinter) {
     for(int i = 0;i < count;i++) {
         if(i>0)
             pPrinter -> newPage();
-        TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").tqarg(i);
+        TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").arg(i);
         TQString sID = pPrinter -> option(diagram);
         Uml::IDType id = STR2ID(sID);
         printView = findView(id);
@@ -2101,7 +2101,7 @@ void UMLDoc::slotAutoSave() {
     }
     KURL tempURL = m_doc_url;
     if( tempURL.fileName() == i18n("Untitled") ) {
-        tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").tqarg(".xmi") );
+        tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").arg(".xmi") );
         saveDocument( tempURL );
         m_doc_url.setFileName( i18n("Untitled") );
         m_modified = true;
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index 6fe7b84f..5db7d670 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -86,7 +86,7 @@ protected:
             return;
         UMLOperation *op = static_cast<UMLOperation*>(obj);
         TQString text = op->toString(Uml::st_ShowSig);
-        TQRect rect = lv->tqitemRect(item);
+        TQRect rect = lv->itemRect(item);
         tip(rect, text);
     }
 };
@@ -381,7 +381,7 @@ void UMLListView::popupMenuSel(int sel) {
                 file.close();
             } else {
                 KMessageBox::error(0,
-                                   i18n("There was a problem saving file: %1").tqarg(fileName),
+                                   i18n("There was a problem saving file: %1").arg(fileName),
                                    i18n("Save Error"));
                 return;
             }
@@ -1719,7 +1719,7 @@ void UMLListView::focusOutEvent ( TQFocusEvent * fe) {
         clearSelection();
         triggerUpdate();
     }
-    //tqrepaint();
+    //repaint();
 
     TQListView::focusOutEvent(fe);
 }
@@ -2111,7 +2111,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
     } else if ( type == Uml::ot_Template )  {
         UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent);
         Model_Utils::NameAndType nt;
-        Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(text, nt, owningClassifier);
+        Model_Utils::Parse_Status st = Model_Utils::parseTemplate(text, nt, owningClassifier);
         if (st) {
             KMessageBox::error( kapp->mainWidget(),
                                 Model_Utils::psText(st),
@@ -2127,7 +2127,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
         UMLClassifier *owningClass = static_cast<UMLClassifier*>(parent);
         Model_Utils::NameAndType nt;
         Uml::Visibility vis;
-        Model_Utils::Parse_tqStatus st;
+        Model_Utils::Parse_Status st;
         st = Model_Utils::parseAttribute(text, nt, owningClass, &vis);
         if (st) {
             KMessageBox::error( kapp->mainWidget(),
@@ -2143,7 +2143,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
     } else if ( type == Uml::ot_Operation ) {
         UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent);
         Model_Utils::OpDescriptor od;
-        Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(text, od, owningClassifier);
+        Model_Utils::Parse_Status st = Model_Utils::parseOperation(text, od, owningClassifier);
         if (st) {
             KMessageBox::error( kapp->mainWidget(),
                                 Model_Utils::psText(st),
@@ -2378,7 +2378,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement &
         UMLListViewItem * item = 0;
         if (nID != Uml::id_None) {
             // The following is an ad hoc hack for the copy/paste code.
-            // The clip still contains the old tqchildren although new
+            // The clip still contains the old children although new
             // UMLCLassifierListItems have already been created.
             // If the IDChangeLog finds new IDs this means we are in
             // copy/paste and need to adjust the child listitems to the
diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h
index b6bf201c..f2328cef 100644
--- a/umbrello/umbrello/umllistview.h
+++ b/umbrello/umbrello/umllistview.h
@@ -88,7 +88,7 @@ public:
     int getSelectedItems(UMLListViewItemList &ItemList);
 
     /**
-     * Get selected items, but only root elements selected (without tqchildren).
+     * Get selected items, but only root elements selected (without children).
      *
      * @param ItemList  List of UMLListViewItems returned.
      * @return          The number of selected items.
diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp
index 01680fde..89bb581c 100644
--- a/umbrello/umbrello/umllistviewitem.cpp
+++ b/umbrello/umbrello/umllistviewitem.cpp
@@ -333,7 +333,7 @@ void UMLListViewItem::okRename( int col ) {
             UMLOperation *op = static_cast<UMLOperation*>(m_pObject);
             UMLClassifier *parent = static_cast<UMLClassifier *>( op -> parent() );
             Model_Utils::OpDescriptor od;
-            Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, parent);
+            Model_Utils::Parse_Status st = Model_Utils::parseOperation(newText, od, parent);
             if (st == Model_Utils::PS_OK) {
                 // TODO: Check that no operation with the exact same profile exists.
                 op->setName( od.m_name );
@@ -385,7 +385,7 @@ void UMLListViewItem::okRename( int col ) {
             UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent());
             Model_Utils::NameAndType nt;
             Uml::Visibility vis;
-            Model_Utils::Parse_tqStatus st;
+            Model_Utils::Parse_Status st;
             st = Model_Utils::parseAttribute(newText, nt, parent, &vis);
             if (st == Model_Utils::PS_OK) {
                 UMLObject *exists = parent->findChildObject(newText);
@@ -417,7 +417,7 @@ void UMLListViewItem::okRename( int col ) {
             }
             UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent());
             Model_Utils::NameAndType nt;
-            Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, parent);
+            Model_Utils::Parse_Status st = Model_Utils::parseTemplate(newText, nt, parent);
             if (st == Model_Utils::PS_OK) {
                 UMLObject *exists = parent->findChildObject(newText);
                 if (exists) {
@@ -465,7 +465,7 @@ void UMLListViewItem::okRename( int col ) {
         }
     default:
         KMessageBox::error( kapp->mainWidget() ,
-                            i18n("Renaming an item of listview type %1 is not yet implemented.").tqarg(m_Type),
+                            i18n("Renaming an item of listview type %1 is not yet implemented.").arg(m_Type),
                             i18n("Function Not Implemented") );
         TQListViewItem::setText(0, m_Label);
         break;
diff --git a/umbrello/umbrello/umllistviewitem.h b/umbrello/umbrello/umllistviewitem.h
index 596a93f5..1064befc 100644
--- a/umbrello/umbrello/umllistviewitem.h
+++ b/umbrello/umbrello/umllistviewitem.h
@@ -190,7 +190,7 @@ public:
     virtual int compare(TQListViewItem *other, int col, bool ascending) const;
 
     /**
-     * Returns the number of tqchildren of the UMLListViewItem
+     * Returns the number of children of the UMLListViewItem
      * containing this object
      */
     int childCount() const {
@@ -213,7 +213,7 @@ public:
 
     /**
      * Find the UMLListViewItem that represents the given UMLClassifierListItem
-     * in the tqchildren of the current UMLListViewItem.  (Only makes sense if
+     * in the children of the current UMLListViewItem.  (Only makes sense if
      * the current UMLListViewItem represents a UMLClassifier.)
      * Return a pointer to the item or NULL if not found.
      */
diff --git a/umbrello/umbrello/umlobject.h b/umbrello/umbrello/umlobject.h
index a0e02160..aedc2325 100644
--- a/umbrello/umbrello/umlobject.h
+++ b/umbrello/umbrello/umlobject.h
@@ -379,7 +379,7 @@ public slots:
 
 signals:
     /** Emitted when the UMLObject has changed. Note that some objects emit
-      * this signal when one of its tqchildren changes, for example, a UMLClass
+      * this signal when one of its children changes, for example, a UMLClass
       * emits a modified() signal when one of its operation changes while the Operation
       * itself emits the corresponding signal as well.
       */
diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp
index a64b770c..aef18eca 100644
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@@ -294,7 +294,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
             pPainter.translate(offsetX,offsetY);
 
             //draw foot note
-            TQString string = i18n("Diagram: %2 Page %1").tqarg(page + 1).tqarg(getName());
+            TQString string = i18n("Diagram: %2 Page %1").arg(page + 1).arg(getName());
             TQColor textColor(50, 50, 50);
             pPainter.setPen(textColor);
             pPainter.drawLine(0, height + 2, width, height + 2);
@@ -354,7 +354,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
     getDiagram(TQRect(rect.x(), rect.y(), windowWidth, diagramHeight), pPainter);
 
     //draw foot note
-    TQString string = i18n("Diagram: %2 Page %1").tqarg( 1).tqarg(getName());
+    TQString string = i18n("Diagram: %2 Page %1").arg( 1).arg(getName());
     TQColor textColor(50, 50, 50);
     pPainter.setPen(textColor);
     pPainter.drawLine(rect.x(), footTop    , windowWidth, footTop);
@@ -371,7 +371,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
 void UMLView::setupNewWidget(UMLWidget *w) {
     w->setX( m_Pos.x() );
     w->setY( m_Pos.y() );
-    w->tqsetVisible( true );
+    w->setVisible( true );
     w->setActivated();
     w->setFont( getFont() );
     w->slotColorChanged( getID() );
@@ -451,7 +451,7 @@ void UMLView::slotObjectCreated(UMLObject* o) {
     UMLWidget* newWidget = Widget_Factory::createWidget(this, o);
     if (newWidget == NULL)
         return;
-    newWidget->tqsetVisible( true );
+    newWidget->setVisible( true );
     newWidget->setActivated();
     newWidget->setFont( getFont() );
     newWidget->slotColorChanged( getID() );
@@ -1362,7 +1362,7 @@ void UMLView::activate() {
             continue;
 
         if (obj->activate()) {
-            obj->tqsetVisible(true);
+            obj->setVisible(true);
         } else {
             m_WidgetList.remove(obj);
             delete obj;
@@ -1378,7 +1378,7 @@ void UMLView::activate() {
             continue;
 
         obj->activate(m_pDoc->getChangeLog());
-        obj->tqsetVisible( true );
+        obj->setVisible( true );
 
     }//end while
 
@@ -2365,7 +2365,7 @@ void UMLView::setMenu() {
     if( menu != ListPopupMenu::mt_Undefined ) {
         m_pMenu = new ListPopupMenu(this, menu, this);
         connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int)));
-        m_pMenu->popup( mapToGlobal( contentsToViewport(tqworldMatrix().map(m_Pos)) ) );
+        m_pMenu->popup( mapToGlobal( contentsToViewport(worldMatrix().map(m_Pos)) ) );
     }
 }
 
@@ -2797,17 +2797,17 @@ void UMLView::setZoom(int zoom) {
 }
 
 int UMLView::currentZoom() {
-    return (int)(tqworldMatrix().m11()*100.0);
+    return (int)(worldMatrix().m11()*100.0);
 }
 
 void UMLView::zoomIn() {
-    TQWMatrix wm = tqworldMatrix();
+    TQWMatrix wm = worldMatrix();
     wm.scale(1.5,1.5); // adjust zooming step here
     setZoom( (int)(wm.m11()*100.0) );
 }
 
 void UMLView::zoomOut() {
-    TQWMatrix wm = tqworldMatrix();
+    TQWMatrix wm = worldMatrix();
     wm.scale(2.0/3.0, 2.0/3.0); //adjust zooming step here
     setZoom( (int)(wm.m11()*100.0) );
 }
@@ -3014,10 +3014,10 @@ bool UMLView::loadFromXMI( TQDomElement & qElement ) {
     TQString zoom = qElement.attribute( "zoom", "100" );
     m_nZoom = zoom.toInt();
 
-    TQString height = qElement.attribute( "canvasheight", TQString("%1").tqarg(UMLView::defaultCanvasSize) );
+    TQString height = qElement.attribute( "canvasheight", TQString("%1").arg(UMLView::defaultCanvasSize) );
     m_nCanvasHeight = height.toInt();
 
-    TQString width = qElement.attribute( "canvaswidth", TQString("%1").tqarg(UMLView::defaultCanvasSize) );
+    TQString width = qElement.attribute( "canvaswidth", TQString("%1").arg(UMLView::defaultCanvasSize) );
     m_nCanvasWidth = width.toInt();
 
     int nType = type.toInt();
@@ -3226,7 +3226,7 @@ bool UMLView::loadUisDiagramPresentation(TQDomElement & qElement) {
         while (!e.isNull()) {
             tag = e.tagName();
             kDebug() << "Presentation: tag = " << tag << endl;
-            if (Uml::tagEq(tag, "Presentation.tqgeometry")) {
+            if (Uml::tagEq(tag, "Presentation.geometry")) {
                 TQDomNode gnode = e.firstChild();
                 TQDomElement gelem = gnode.toElement();
                 TQString csv = gelem.text();
diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h
index 4cf51b7f..ce84e17c 100644
--- a/umbrello/umbrello/umlview.h
+++ b/umbrello/umbrello/umlview.h
@@ -706,7 +706,7 @@ public:
     void resetPastePoint();
 
     /**
-     * Called by the view or any of its tqchildren when they start a cut
+     * Called by the view or any of its children when they start a cut
      * operation.
      */
     void setStartedCut() {
@@ -1120,7 +1120,7 @@ protected:
     UMLWidgetList m_SelectedList;
 
     /**
-     *  Flag if view/tqchildren started cut operation.
+     *  Flag if view/children started cut operation.
      */
     bool m_bStartedCut;
 
@@ -1152,7 +1152,7 @@ private:
     bool m_bActivated;
 
     /**
-     * tqStatus of a popupmenu on view.
+     * Status of a popupmenu on view.
      * true - a popup is on view
      */
     bool m_bPopupShowing;
diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp
index 23164171..c669086d 100644
--- a/umbrello/umbrello/umlviewimageexporter.cpp
+++ b/umbrello/umbrello/umlviewimageexporter.cpp
@@ -63,7 +63,7 @@ bool UMLViewImageExporter::prepareExportView() {
         // check if the file exists
         if (KIO::NetAccess::exists(m_imageURL, true, UMLApp::app())) {
             int wantSave = KMessageBox::warningContinueCancel(0,
-                                i18n("The selected file %1 exists.\nDo you want to overwrite it?").tqarg(m_imageURL.prettyURL()),
+                                i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_imageURL.prettyURL()),
                                 i18n("File Already Exists"), i18n("&Overwrite"));
             if (wantSave == KMessageBox::Continue) {
                 exportPrepared = true;
diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp
index a8de3637..155ba9b8 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.cpp
+++ b/umbrello/umbrello/umlviewimageexportermodel.cpp
@@ -123,7 +123,7 @@ TQStringList UMLViewImageExporterModel::exportAllViews(const TQString &imageType
 TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &imageType, const KURL &url) const {
     // create the needed directories
     if (!prepareDirectory(url)) {
-        return i18n("Can not create directory: %1").tqarg(url.directory());
+        return i18n("Can not create directory: %1").arg(url.directory());
     }
 
     // The fileName will be used when exporting the image. If the url isn't local,
@@ -148,14 +148,14 @@ TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &im
     // exporting the view to the file
     if (!exportViewTo(view, imageType, fileName)) {
         tmpFile.unlink();
-        return i18n("A problem occured while saving diagram in %1").tqarg(fileName);
+        return i18n("A problem occured while saving diagram in %1").arg(fileName);
     }
 
     // if the file wasn't local, upload the temp file to the target
     if (!url.isLocalFile()) {
         if (!KIO::NetAccess::upload(tmpFile.name(), url, UMLApp::app())) {
             tmpFile.unlink();
-            return i18n("There was a problem saving file: %1").tqarg(url.path());
+            return i18n("There was a problem saving file: %1").arg(url.path());
         }
     } //!isLocalFile
 
@@ -177,7 +177,7 @@ TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQSt
     listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent());
 
     // Relies on the tree structure of the UMLListView. There are a base "Views" folder
-    // and five tqchildren, one for each view type (Logical, use case, components, deployment
+    // and five children, one for each view type (Logical, use case, components, deployment
     // and entity relationship)
     while (listView->rootView(listViewItem->getType()) == NULL) {
         name.insert(0, listViewItem->getText() + '/');
@@ -320,7 +320,7 @@ bool UMLViewImageExporterModel::fixEPS(const TQString &fileName, const TQRect& r
 
     // modify content
     fileContent.replace(pos,rx.cap(0).length(),
-                        TQString("%%BoundingBox: %1 %2 %3 %4").tqarg(left).tqarg(bottom).tqarg(right).tqarg(top));
+                        TQString("%%BoundingBox: %1 %2 %3 %4").arg(left).arg(bottom).arg(right).arg(top));
 
     ts << fileContent;
     epsfile.close();
diff --git a/umbrello/umbrello/umlwidget.h b/umbrello/umbrello/umlwidget.h
index 0cebb9d8..6a74579f 100644
--- a/umbrello/umbrello/umlwidget.h
+++ b/umbrello/umbrello/umlwidget.h
@@ -466,7 +466,7 @@ public:
     /**
      * Set the m_bActivated flag of a widget but does not perform the Activate method
      *
-     * @param Active tqStatus of activation is to be set.
+     * @param Active Status of activation is to be set.
      */
     void setActivated(bool Active = true);
 
@@ -667,7 +667,7 @@ public slots:
     /**
      * This slot is entered when an event has occurred on the views display,
      * most likely a mouse event.  Before it sends out that mouse event all
-     * tqchildren should make sure that they don't have a menu active or there
+     * children should make sure that they don't have a menu active or there
      * could be more than one popup menu displayed.
      */
     virtual void slotRemovePopupMenu();
diff --git a/umbrello/umbrello/widget_utils.cpp b/umbrello/umbrello/widget_utils.cpp
index eeb51956..bc9226dd 100644
--- a/umbrello/umbrello/widget_utils.cpp
+++ b/umbrello/umbrello/widget_utils.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqcanvas.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpen.h>
 #include <kiconloader.h>
 #include <kdebug.h>
@@ -101,7 +101,7 @@ TQCanvasRectangle *decoratePoint(const TQPoint& p) {
                                 SIZE, SIZE, currentView->canvas());
     rect->setBrush( TQBrush(TQt::blue) );
     rect->setPen( TQPen(TQt::blue) );
-    rect->tqsetVisible(true);
+    rect->setVisible(true);
     return rect;
 }
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:50:38 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:50:38 -0600
commit	d6331f1b56eb6dca7a1950658b2932f208015da0 (patch)
tree	f99bf8d1571f93304bdb4a46fb199a1bde60e6ee /umbrello
parent	e738fee8847c1f606df7b338a589cc8c0539a521 (diff)
download	tdesdk-d6331f1b56eb6dca7a1950658b2932f208015da0.tar.gz tdesdk-d6331f1b56eb6dca7a1950658b2932f208015da0.zip