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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

21 files changed, 102 insertions, 102 deletions

diff --git a/umbrello/umbrello/autolayout/_graph.h b/umbrello/umbrello/autolayout/_graph.h
index 179a9471..b3c42f30 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 Autolayout {
+namespace Autotqlayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index 894dddbc..e47911e6 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 "autolayout.h"
+#include "autotqlayout.h"
 #include "newautolayoutdialog.h"
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
@@ -84,7 +84,7 @@ void AutolayoutDlg::slotSetClusterizeHierarchies(bool b)
 
 void AutolayoutDlg::slotSetShapeSeparation(int i)
 {
-    shapeSeparation=i;
+    tqshapeSeparation=i;
 }
 
 void AutolayoutDlg::slotReloadSettings()
@@ -99,10 +99,10 @@ void AutolayoutDlg::slotSaveSettings()
 }
 
 
-void AutolayoutDlg::slotDoAutolayout()
+void AutolayoutDlg::slotDoAutotqlayout()
 {
 
-    Autolayout::Autolayouter* a=getAutolayouter();;
+    Autotqlayout::Autolayouter* a=getAutolayouter();;
 
     a->setAssociationAsEdges( associationAsEdges);
     a->setAssociationWeight( associationWeight );
@@ -115,8 +115,8 @@ void AutolayoutDlg::slotDoAutolayout()
     a->setGeneralizationWeight( generalizationWeight);
     a->setNoteConnectionWeight( 1);
     a->setNoteConnectionsAsEdges(true);
-    a->setShapeSeparation( shapeSeparation);
-    a->autolayout( view);
+    a->setShapeSeparation( tqshapeSeparation);
+    a->autotqlayout( 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)));
-    shapeSeparationSB->setValue((int)(conf->readNumEntry( "shapeSeparation",0)));
+    tqshapeSeparationSB->setValue((int)(conf->readNumEntry( "tqshapeSeparation",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("shapeSeparation",shapeSeparationSB->value());
+    conf->writeEntry("tqshapeSeparation",tqshapeSeparationSB->value());
     //conf->writeEntry("al
 
 
@@ -165,18 +165,18 @@ void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname)
 
 }
 
-Autolayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
+Autotqlayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
 {
     const TQString text = algorithmCOB->currentText();
-    kDebug() << "Autolayout Algorithm " << algname << " found " << text << endl;
+    kDebug() << "Autotqlayout Algorithm " << algname << " found " << text << endl;
     if (text == "dot")
-        return new Autolayout::DotAutolayouter();
+        return new Autotqlayout::DotAutolayouter();
     if (text == "circo")
-        return new Autolayout::CircoAutolayouter();
+        return new Autotqlayout::CircoAutolayouter();
     if (text ==  "neato")
-        return new Autolayout::NeatoAutolayouter();
-    kError() << "Autolayout Algorithm not found" << endl;
-    return new Autolayout::DotAutolayouter();
+        return new Autotqlayout::NeatoAutolayouter();
+    kError() << "Autotqlayout Algorithm not found" << endl;
+    return new Autotqlayout::DotAutolayouter();
 }
 
 
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index 972fd83c..f2614d03 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 "autolayout.h"
+#include "autotqlayout.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 slotDoAutolayout();
+    virtual void slotDoAutotqlayout();
     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 shapeSeparation;
+    int tqshapeSeparation;
     KConfig* config;
     TQString algname;
-    Autolayout::Autolayouter* getAutolayouter();
+    Autotqlayout::Autolayouter* getAutolayouter();
 
 };
 
diff --git a/umbrello/umbrello/autolayout/autolayouter.cpp b/umbrello/umbrello/autolayout/autolayouter.cpp
index f70fd195..802bc438 100644
--- a/umbrello/umbrello/autolayout/autolayouter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouter.cpp
@@ -13,11 +13,11 @@
  ***************************************************************************/
 #include "autolayouter.h"
 
-namespace Autolayout {
+namespace Autotqlayout {
 
 
 
-void Autolayouter::autolayout( UMLView * v )
+void Autolayouter::autotqlayout( UMLView * v )
 {
     setCanvas(v);
     setGraph(v);
@@ -25,5 +25,5 @@ void Autolayouter::autolayout( UMLView * v )
     updateView(v);
 }
 
-}  // end namespace Autolayout
+}  // end namespace Autotqlayout
 
diff --git a/umbrello/umbrello/autolayout/autolayouter.h b/umbrello/umbrello/autolayout/autolayouter.h
index a56b1ce3..5d4645f9 100644
--- a/umbrello/umbrello/autolayout/autolayouter.h
+++ b/umbrello/umbrello/autolayout/autolayouter.h
@@ -13,10 +13,10 @@
 #define AUTOLAYOUTAUTOLAYOUTER_H
 #include "baseinclude.h"
 
-namespace Autolayout {
+namespace Autotqlayout {
 
 /**
-This is the super class of any class which encapsulate an autolayout algorithm
+This is the super class of any class which encapsulate an autotqlayout algorithm
 
 
 @author Dimitri Ognibene <ognibened @yahoo.it>
@@ -47,14 +47,14 @@ public:
 
     virtual void setShapeSeparation(int i)=0;
 
-    virtual void autolayout(UMLView* v);
+    virtual void autotqlayout(UMLView* v);
 protected:
     virtual void run()=0;
     virtual void updateView(UMLView*)=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;
+    virtual Autotqlayout::Canvas* getCanvas()=0;
+    virtual Autotqlayout::Graph* getGraph()=0;
+    virtual Autotqlayout::Graph* setGraph(UMLView* view)=0;
+    virtual Autotqlayout::Canvas* setCanvas(UMLView* view)=0;
 
 
 };
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
index 0673fde1..3a245cbc 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
@@ -12,18 +12,18 @@
 #include "autolayouteradapter.h"
 
 
-namespace Autolayout
+namespace Autotqlayout
   {
 
   AutolayouterAdapter::AutolayouterAdapter()
-      : Autolayout::Autolayouter()
+      : Autotqlayout::Autolayouter()
     {}
 
 
   AutolayouterAdapter::~AutolayouterAdapter()
   {}}
 
-void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
+void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
   {
   int weight;
   switch (a->getAssocType())
@@ -71,60 +71,60 @@ void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
   getGraph()->addEdge(a->getWidgetID(Uml::A).c_str(),a->getWidgetID(Uml::B).c_str(),weight);
   }
 
-void Autolayout::AutolayouterAdapter::setAssociationWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setAssociationWeight( int i )
   {
   associationWeight=i;
   }
 
-void Autolayout::AutolayouterAdapter::setDependenciesWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setDependenciesWeight( int i )
   {
   dependenciesWeight=i;
   }
 
-void Autolayout::AutolayouterAdapter::setGeneralizationWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setGeneralizationWeight( int i )
   {
   generalizationWeight=i;
   }
 
-void Autolayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
   {
   genralizationAsEdges=b;
   }
 
-void Autolayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
   {
   dependenciesAsEdges=b;
   }
 
-void Autolayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
   {
   associationAsEdges=b;
   }
 
-void Autolayout::AutolayouterAdapter::setCompressShapes( bool b )
+void Autotqlayout::AutolayouterAdapter::setCompressShapes( bool b )
   {
   compressShapes=b;
   }
 
-void Autolayout::AutolayouterAdapter::setCenterDiagram( bool b )
+void Autotqlayout::AutolayouterAdapter::setCenterDiagram( bool b )
   {
   centerDiagram=b;
   }
 
-void Autolayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
+void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
   {
   clusterizeHierarchies=b;
   }
 
-void Autolayout::AutolayouterAdapter::setShapeSeparation( int i )
+void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i )
   {
-  shapeSeparation=i;
+  tqshapeSeparation=i;
   }
 
-Autolayout::Graph  * Autolayout::AutolayouterAdapter::setGraph( UMLView * view )
+Autotqlayout::Graph  * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view )
   {
   if (! view) return 0;
-  Autolayout::Graph * g=getGraph();
+  Autotqlayout::Graph * g=getGraph();
   if (g&&g->empty())
     {
     UMLWidgetList list = view->getWidgetList();
@@ -151,7 +151,7 @@ Autolayout::Graph  * Autolayout::AutolayouterAdapter::setGraph( UMLView * view )
   return g;
   }
 
-void Autolayout::AutolayouterAdapter::updateView( UMLView* view )
+void Autotqlayout::AutolayouterAdapter::updateView( UMLView* view )
   {
 if (! view) return ;
 UMLWidgetList list = view->getWidgetList();
@@ -175,17 +175,17 @@ UMLWidgetList list = view->getWidgetList();
       }
   }
 
-Autolayout::Canvas * Autolayout::AutolayouterAdapter::setCanvas( UMLView* view )
+Autotqlayout::Canvas * Autotqlayout::AutolayouterAdapter::setCanvas( UMLView* view )
   {
-  return canvas=new Autolayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
+  return canvas=new Autotqlayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
   }
 
-void Autolayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
 {
 noteConnectionWeight=i;
 }
 
-void Autolayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
 {
 noteConnectionAsEdges=b;
 }
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h
index 7c52e742..1d05f0d2 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.h
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.h
@@ -11,19 +11,19 @@
 
 #ifndef AUTOLAYOUTAUTOLAYOUTERADAPTER_H
 #define AUTOLAYOUTAUTOLAYOUTERADAPTER_H
-//#include "autolayout.h"
+//#include "autotqlayout.h"
 #include "baseinclude.h"
 #include "autolayouter.h"
 #include "../umlnamespace.h"
 
 
-namespace Autolayout
+namespace Autotqlayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class AutolayouterAdapter : virtual public Autolayout::Autolayouter
+class AutolayouterAdapter : virtual public Autotqlayout::Autolayouter
 {
 public:
     AutolayouterAdapter();
@@ -70,7 +70,7 @@ protected:
     bool compressShapes;
     bool centerDiagram;
     bool clusterizeHierarchies;
-    int shapeSeparation;
+    int tqshapeSeparation;
     int noteConnectionWeight;
     bool noteConnectionAsEdges;
     bool anchorsAsEdges;
diff --git a/umbrello/umbrello/autolayout/canvas.h b/umbrello/umbrello/autolayout/canvas.h
index 246df8a7..210b1353 100644
--- a/umbrello/umbrello/autolayout/canvas.h
+++ b/umbrello/umbrello/autolayout/canvas.h
@@ -15,7 +15,7 @@
 #ifndef AUTOLAYOUTCANVAS_H
 #define AUTOLAYOUTCANVAS_H
 
-namespace Autolayout {
+namespace Autotqlayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
diff --git a/umbrello/umbrello/autolayout/diagram.h b/umbrello/umbrello/autolayout/diagram.h
index 33bda398..43f35f51 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 "autolayout.h"
+#include "autotqlayout.h"
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 Umbrello UML Modeller Authors
 */
-namespace Autolayout{
+namespace Autotqlayout{
 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 autolayout();
+    void autotqlayout();
     void save();
     Node getNode(const char*);
 
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.cpp b/umbrello/umbrello/autolayout/dotautolayouter.cpp
index 5d197845..dea9b554 100644
--- a/umbrello/umbrello/autolayout/dotautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/dotautolayouter.cpp
@@ -15,10 +15,10 @@
 
 #include <graphviz/dotprocs.h>
 
-namespace Autolayout {
+namespace Autotqlayout {
 
 DotAutolayouter::DotAutolayouter()
-        : Autolayout::GraphvizAutolayouter()
+        : Autotqlayout::GraphvizAutolayouter()
 {
 }
 
@@ -32,10 +32,10 @@ DotAutolayouter::~DotAutolayouter()
 void DotAutolayouter::run()
 {
     //#ifndef internal_renderizer
-    /* bind graph to GV context - currently must be done before layout */
+    /* bind graph to GV context - currently must be done before tqlayout */
     //  gvBindContext(gvc,g);
     //#endif
-    // do layout
+    // do tqlayout
     //dot_layout();
     dot_layout( gg->_agraph );
 }
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.h b/umbrello/umbrello/autolayout/dotautolayouter.h
index 5c6530ba..4b8af212 100644
--- a/umbrello/umbrello/autolayout/dotautolayouter.h
+++ b/umbrello/umbrello/autolayout/dotautolayouter.h
@@ -17,12 +17,12 @@
 #include "baseinclude.h"
 #include "graphvizautolayouter.h"
 
-namespace Autolayout {
+namespace Autotqlayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class DotAutolayouter : virtual public Autolayout::GraphvizAutolayouter
+class DotAutolayouter : virtual public Autotqlayout::GraphvizAutolayouter
 {
 public:
     DotAutolayouter();
diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
index 8defc5ef..da075642 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
@@ -15,10 +15,10 @@
 
 #include <graphviz/graph.h>
 
-namespace Autolayout {
+namespace Autotqlayout {
 
 GraphvizAutolayouter::GraphvizAutolayouter()
-        : Autolayout::AutolayouterAdapter()
+        : Autotqlayout::AutolayouterAdapter()
 {
     gg = new GraphvizGraph();
 }
@@ -44,7 +44,7 @@ void GraphvizAutolayouter::setShapeSeparation( int i )
     gg->setShapeSeparation(i);
 }
 
-Autolayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view )
+Autotqlayout::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 114ae63f..95fa46ba 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.h
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.h
@@ -15,13 +15,13 @@
 #include "autolayouteradapter.h"
 #include "graphvizgraph.h"
 
-namespace Autolayout
+namespace Autotqlayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizAutolayouter : virtual public Autolayout::AutolayouterAdapter
+class GraphvizAutolayouter : virtual public Autotqlayout::AutolayouterAdapter
 {
 public:
     GraphvizAutolayouter();
diff --git a/umbrello/umbrello/autolayout/graphvizgraph.cpp b/umbrello/umbrello/autolayout/graphvizgraph.cpp
index 716f9223..a3b4ea8a 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 Autolayout
+namespace Autotqlayout
 {
 
 /**
@@ -31,7 +31,7 @@ namespace Autolayout
  * @return
  */
 GraphvizGraph::GraphvizGraph()
-        : Autolayout::Graph()
+        : Autotqlayout::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, "shape", "box");
+    agnodeattr(_agraph, "tqshape", "box");
     agraphattr(_agraph, "dpi", "DPI/0");
 
 
@@ -96,7 +96,7 @@ void GraphvizGraph::addNode(const char* name, int width, int height)
 }
 
 
-void Autolayout::GraphvizGraph::setCompressShapes( bool b )
+void Autotqlayout::GraphvizGraph::setCompressShapes( bool b )
 {
     if (empty())
     {
@@ -105,7 +105,7 @@ void Autolayout::GraphvizGraph::setCompressShapes( bool b )
     }
 }
 
-void Autolayout::GraphvizGraph::setCenterDiagram( bool b )
+void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b )
 {
     if (empty())
     {
@@ -114,7 +114,7 @@ void Autolayout::GraphvizGraph::setCenterDiagram( bool b )
     }
 }
 
-void Autolayout::GraphvizGraph::setShapeSeparation( int i )
+void Autotqlayout::GraphvizGraph::setShapeSeparation( int i )
 {
     char* a;
     asprintf(&a,"%f",((float) i)/10.0);
@@ -122,22 +122,22 @@ void Autolayout::GraphvizGraph::setShapeSeparation( int i )
     free (a);
 }
 
-bool Autolayout::GraphvizGraph::empty( )
+bool Autotqlayout::GraphvizGraph::empty( )
 {
     return empty_flag;
 }
 
-Autolayout::Node* Autolayout::GraphvizGraph::getNode( const char * arg1 )
+Autotqlayout::Node* Autotqlayout::GraphvizGraph::getNode( const char * arg1 )
 {
     char *a = _strcpy(arg1);
-    Autolayout::GraphvizNode* b=
-        new Autolayout::GraphvizNode(agnode(_agraph,a));
+    Autotqlayout::GraphvizNode* b=
+        new Autotqlayout::GraphvizNode(agnode(_agraph,a));
     delete[](a);
     nodelist.push_back(b);
     return b;
 }
 
-void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas)
+void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas)
 {
     char buf[100];
     sprintf(buf,"%f,%f",((float)canvas->getMaxX()/DPI),((float)canvas->getMaxY()/DPI));
@@ -146,5 +146,5 @@ void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas)
     agraphattr(_agraph, "page", buf);
 }
 
-}  // end namespace Autolayout
+}  // end namespace Autotqlayout
 
diff --git a/umbrello/umbrello/autolayout/graphvizgraph.h b/umbrello/umbrello/autolayout/graphvizgraph.h
index dfbf323d..1be57139 100644
--- a/umbrello/umbrello/autolayout/graphvizgraph.h
+++ b/umbrello/umbrello/autolayout/graphvizgraph.h
@@ -21,13 +21,13 @@
 #include <deque>
 #include <graphviz/types.h>
 
-namespace Autolayout
+namespace Autotqlayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizGraph : virtual public Autolayout::Graph
+class GraphvizGraph : virtual public Autotqlayout::Graph
 {
 public:
     GraphvizGraph();
diff --git a/umbrello/umbrello/autolayout/graphviznode.cpp b/umbrello/umbrello/autolayout/graphviznode.cpp
index ea3510cf..430e176c 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 Autolayout {
+namespace Autotqlayout {
 
 
 
@@ -40,7 +40,7 @@ int GraphvizNode::getY()
 
 }
 
-Autolayout::GraphvizNode::GraphvizNode( Agnode_t * node )
+Autotqlayout::GraphvizNode::GraphvizNode( Agnode_t * node )
 {
     n=node;
 }
diff --git a/umbrello/umbrello/autolayout/graphviznode.h b/umbrello/umbrello/autolayout/graphviznode.h
index 0efcb6d8..1190f5af 100644
--- a/umbrello/umbrello/autolayout/graphviznode.h
+++ b/umbrello/umbrello/autolayout/graphviznode.h
@@ -18,12 +18,12 @@
 
 class Agnode_t;
 
-namespace Autolayout {
+namespace Autotqlayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizNode : virtual public Autolayout::Node
+class GraphvizNode : virtual public Autotqlayout::Node
 {
 
     GraphvizNode (Agnode_t* n);
diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
index 7213c164..9301abe3 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>shapeSeparationSB</cstring>
+                        <cstring>tqshapeSeparationSB</cstring>
                     </property>
                 </widget>
                 <widget class="TQSpinBox">
                     <property name="name">
-                        <cstring>shapeSeparationSB</cstring>
+                        <cstring>tqshapeSeparationSB</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 autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autotqlayout 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 autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autotqlayout 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 autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autotqlayout 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="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>1</height>
@@ -339,7 +339,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -366,7 +366,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>277</width>
                             <height>20</height>
@@ -450,7 +450,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>shapeSeparationSB</sender>
+        <sender>tqshapeSeparationSB</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>slotDoAutolayout()</slot>
+        <slot>slotDoAutotqlayout()</slot>
     </connection>
     <connection>
         <sender>restoreDefaultsBTN</sender>
@@ -535,7 +535,7 @@
     </connection>
 </connections>
 <Q_SLOTS>
-    <slot>slotDoAutolayout()</slot>
+    <slot>slotDoAutotqlayout()</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 c2532b8b..74259233 100644
--- a/umbrello/umbrello/autolayout/node.h
+++ b/umbrello/umbrello/autolayout/node.h
@@ -15,7 +15,7 @@
 #ifndef AUTOLAYOUTNODE_H
 #define AUTOLAYOUTNODE_H
 
-namespace Autolayout {
+namespace Autotqlayout {
 
 /**
 @author Umbrello UML Modeller Authors
diff --git a/umbrello/umbrello/autolayout/simplecanvas.cpp b/umbrello/umbrello/autolayout/simplecanvas.cpp
index 0598c15e..38832962 100644
--- a/umbrello/umbrello/autolayout/simplecanvas.cpp
+++ b/umbrello/umbrello/autolayout/simplecanvas.cpp
@@ -13,7 +13,7 @@
  ***************************************************************************/
 #include "simplecanvas.h"
 
-namespace Autolayout {
+namespace Autotqlayout {
 
 
 
diff --git a/umbrello/umbrello/autolayout/simplecanvas.h b/umbrello/umbrello/autolayout/simplecanvas.h
index 29712b9e..90cecea5 100644
--- a/umbrello/umbrello/autolayout/simplecanvas.h
+++ b/umbrello/umbrello/autolayout/simplecanvas.h
@@ -17,7 +17,7 @@
 
 #include "canvas.h"
 #include <tqrect.h>
-namespace Autolayout {
+namespace Autotqlayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>