Remove additional unneeded tq method conversions

6 files changed, 11 insertions, 11 deletions

diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index e47911e6..6b6196d4 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -84,7 +84,7 @@ void AutolayoutDlg::slotSetClusterizeHierarchies(bool b)
 
 void AutolayoutDlg::slotSetShapeSeparation(int i)
 {
-    tqshapeSeparation=i;
+    shapeSeparation=i;
 }
 
 void AutolayoutDlg::slotReloadSettings()
@@ -115,7 +115,7 @@ void AutolayoutDlg::slotDoAutotqlayout()
     a->setGeneralizationWeight( generalizationWeight);
     a->setNoteConnectionWeight( 1);
     a->setNoteConnectionsAsEdges(true);
-    a->setShapeSeparation( tqshapeSeparation);
+    a->setShapeSeparation( shapeSeparation);
     a->autotqlayout( view);
     delete a;
     a=0;
@@ -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
 
 
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index f2614d03..a5e4117a 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -54,7 +54,7 @@ class AutolayoutDlg : public MyDialog1
     bool compressShapes;
     bool centerDiagram;
     bool clusterizeHierarchies;
-    int tqshapeSeparation;
+    int shapeSeparation;
     KConfig* config;
     TQString algname;
     Autotqlayout::Autolayouter* getAutolayouter();
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
index 3a245cbc..30f3fad7 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
@@ -118,7 +118,7 @@ void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
 
 void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i )
   {
-  tqshapeSeparation=i;
+  shapeSeparation=i;
   }
 
 Autotqlayout::Graph  * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view )
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h
index 1d05f0d2..49e71803 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.h
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.h
@@ -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/graphvizgraph.cpp b/umbrello/umbrello/autolayout/graphvizgraph.cpp
index a3b4ea8a..36a50170 100644
--- a/umbrello/umbrello/autolayout/graphvizgraph.cpp
+++ b/umbrello/umbrello/autolayout/graphvizgraph.cpp
@@ -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");
 
 
diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
index bca63027..af2e3db5 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>
@@ -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>