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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

1 files changed, 15 insertions, 15 deletions

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();
 }