TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

1 files changed, 37 insertions, 37 deletions

diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index 894dddbc..61bf16b6 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -9,100 +9,100 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "autolayoutdlg.h"
+#include "autotqlayoutdlg.h"
 #include "../associationwidget.h"
 #include "../umlwidget.h"
-#include "autolayout.h"
-#include "newautolayoutdialog.h"
+#include "autotqlayout.h"
+#include "newautotqlayoutdialog.h"
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 #include <tqslider.h>
 #include <kdebug.h>
 
 
-AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *parent, const char *name)
-        :MyDialog1(parent, name)
+AutotqlayoutDlg::AutotqlayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const char *name)
+        :MyDialog1(tqparent, name)
 {
     view=v;
     readConfig(c);
     config=c;
 }
 
-void AutolayoutDlg::slotSetAssociationWeight(int i)
+void AutotqlayoutDlg::slotSetAssociationWeight(int i)
 {
     associationWeight=i;
 }
 
 
-void AutolayoutDlg::slotSetDependenciesWeight(int i)
+void AutotqlayoutDlg::slotSetDependenciesWeight(int i)
 {
     dependenciesWeight=i;
 }
 
 
-void AutolayoutDlg::slotSetGeneralizationWeight(int i)
+void AutotqlayoutDlg::slotSetGeneralizationWeight(int i)
 {
     generalizationWeight=i;
 }
-void AutolayoutDlg::slotSetGenralizationAsEdges(bool b)
+void AutotqlayoutDlg::slotSetGenralizationAsEdges(bool b)
 {
     genralizationAsEdges=b;
 }
 
 
-void AutolayoutDlg::slotSetDependenciesAsEdges(bool b)
+void AutotqlayoutDlg::slotSetDependenciesAsEdges(bool b)
 {
     dependenciesAsEdges=b;
 }
 
 
-void AutolayoutDlg::slotSetAssociationAsEdges(bool b)
+void AutotqlayoutDlg::slotSetAssociationAsEdges(bool b)
 {
     associationAsEdges=b;
 }
 
 
 
-void AutolayoutDlg::slotSetCompressShapes(bool b)
+void AutotqlayoutDlg::slotSetCompressShapes(bool b)
 {
     compressShapes=b;
 }
 
 
-void AutolayoutDlg::slotSetCenterDiagram(bool b)
+void AutotqlayoutDlg::slotSetCenterDiagram(bool b)
 {
     centerDiagram=b;
 }
 
 
-void AutolayoutDlg::slotSetClusterizeHierarchies(bool b)
+void AutotqlayoutDlg::slotSetClusterizeHierarchies(bool b)
 
 {
     clusterizeHierarchies=b;
 }
 
 
-void AutolayoutDlg::slotSetShapeSeparation(int i)
+void AutotqlayoutDlg::slotSetShapeSeparation(int i)
 {
-    shapeSeparation=i;
+    tqshapeSeparation=i;
 }
 
-void AutolayoutDlg::slotReloadSettings()
+void AutotqlayoutDlg::slotReloadSettings()
 {
     readConfig(config);
 }
 
 
-void AutolayoutDlg::slotSaveSettings()
+void AutotqlayoutDlg::slotSaveSettings()
 {
     writeConfig(config);
 }
 
 
-void AutolayoutDlg::slotDoAutolayout()
+void AutotqlayoutDlg::slotDoAutotqlayout()
 {
 
-    Autolayout::Autolayouter* a=getAutolayouter();;
+    Autotqlayout::Autotqlayouter* a=getAutotqlayouter();;
 
     a->setAssociationAsEdges( associationAsEdges);
     a->setAssociationWeight( associationWeight );
@@ -115,16 +115,16 @@ 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();
 }
 
-void AutolayoutDlg::readConfig( KConfig * conf)
+void AutotqlayoutDlg::readConfig( KConfig * conf)
 {
-    conf->setGroup("AutolayoutDlg");
+    conf->setGroup("AutotqlayoutDlg");
     associationEdgesCB->setChecked((bool)(conf->readBoolEntry( "associationAsEdges",false)));
     centerDiagramCB->setChecked((bool)(conf->readBoolEntry( "centerDiagram",true)));
     dependenciesEdgesCB->setChecked((bool)(conf->readBoolEntry( "dependenciesAsEdges",false)));
@@ -134,14 +134,14 @@ 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)));
 }
 
-void AutolayoutDlg::writeConfig( KConfig * conf)
+void AutotqlayoutDlg::writeConfig( KConfig * conf)
 {
     //  conf=kapp->config();
-    conf->setGroup("AutolayoutDlg");
+    conf->setGroup("AutotqlayoutDlg");
     conf->writeEntry( "associationAsEdges",associationEdgesCB->isChecked());
     conf->writeEntry( "centerDiagram", centerDiagramCB->isChecked());
     conf->writeEntry("dependenciesAsEdges",dependenciesEdgesCB->isChecked());
@@ -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
 
 
@@ -159,26 +159,26 @@ void AutolayoutDlg::writeConfig( KConfig * conf)
 
 }
 
-void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname)
+void AutotqlayoutDlg::slotSelectAlgorithm( const TQString& _algname)
 {
     algname=_algname;
 
 }
 
-Autolayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
+Autotqlayout::Autotqlayouter * AutotqlayoutDlg::getAutotqlayouter( )
 {
     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::DotAutotqlayouter();
     if (text == "circo")
-        return new Autolayout::CircoAutolayouter();
+        return new Autotqlayout::CircoAutotqlayouter();
     if (text ==  "neato")
-        return new Autolayout::NeatoAutolayouter();
-    kError() << "Autolayout Algorithm not found" << endl;
-    return new Autolayout::DotAutolayouter();
+        return new Autotqlayout::NeatoAutotqlayouter();
+    kError() << "Autotqlayout Algorithm not found" << endl;
+    return new Autotqlayout::DotAutotqlayouter();
 }
 
 
 
-#include "autolayoutdlg.moc"
+#include "autotqlayoutdlg.moc"