diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
commit | 99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch) | |
tree | eff34cf0762227f6baf2a93e8fef48d4bed2651c /umbrello/umbrello/autolayout | |
parent | 1c104292188541106338d4940b0f04beeb4301a0 (diff) | |
download | tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.tar.gz tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.zip |
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
Diffstat (limited to 'umbrello/umbrello/autolayout')
22 files changed, 195 insertions, 194 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/autolayout.h b/umbrello/umbrello/autolayout/autolayout.h index 9f34a1d8..fecb2c6f 100644 --- a/umbrello/umbrello/autolayout/autolayout.h +++ b/umbrello/umbrello/autolayout/autolayout.h @@ -31,12 +31,12 @@ -#include "autolayouter.h" -#include "autolayouteradapter.h" -#include "graphvizautolayouter.h" -#include "dotautolayouter.h" -#include "circoautolayouter.h" -#include "neatoautolayouter.h" +#include "autotqlayouter.h" +#include "autotqlayouteradapter.h" +#include "graphvizautotqlayouter.h" +#include "dotautotqlayouter.h" +#include "circoautotqlayouter.h" +#include "neatoautotqlayouter.h" 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" diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h index 126c4a08..a664a7b7 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.h +++ b/umbrello/umbrello/autolayout/autolayoutdlg.h @@ -12,17 +12,18 @@ #ifndef AUTOLAYOUTDLG_H #define AUTOLAYOUTDLG_H -#include "newautolayoutdialog.h" +#include "newautotqlayoutdialog.h" #include "../umlview.h" #include <tqobject.h> #include <kconfig.h> -#include "autolayout.h" +#include "autotqlayout.h" -class AutolayoutDlg : public MyDialog1 +class AutotqlayoutDlg : public MyDialog1 { Q_OBJECT + TQ_OBJECT public: - AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *parent = 0, const char *name = 0); + AutotqlayoutDlg(KConfig* c,UMLView* v, TQWidget *tqparent = 0, const char *name = 0); public slots: virtual void slotSetAssociationWeight(int i); virtual void slotSetDependenciesWeight(int i); @@ -36,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&); @@ -53,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::Autotqlayouter* getAutotqlayouter(); }; diff --git a/umbrello/umbrello/autolayout/autolayouter.cpp b/umbrello/umbrello/autolayout/autolayouter.cpp index f70fd195..caf852b7 100644 --- a/umbrello/umbrello/autolayout/autolayouter.cpp +++ b/umbrello/umbrello/autolayout/autolayouter.cpp @@ -11,13 +11,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "autolayouter.h" +#include "autotqlayouter.h" -namespace Autolayout { +namespace Autotqlayout { -void Autolayouter::autolayout( UMLView * v ) +void Autotqlayouter::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..40a24235 100644 --- a/umbrello/umbrello/autolayout/autolayouter.h +++ b/umbrello/umbrello/autolayout/autolayouter.h @@ -13,17 +13,17 @@ #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> */ -class Autolayouter { +class Autotqlayouter { public: - virtual ~Autolayouter() {} + virtual ~Autotqlayouter() {} virtual void setNoteConnectionWeight(int i)=0; virtual void setNoteConnectionsAsEdges(bool b)=0; @@ -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..0bba19c7 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp +++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp @@ -9,21 +9,21 @@ * * ***************************************************************************/ -#include "autolayouteradapter.h" +#include "autotqlayouteradapter.h" -namespace Autolayout +namespace Autotqlayout { - AutolayouterAdapter::AutolayouterAdapter() - : Autolayout::Autolayouter() + AutotqlayouterAdapter::AutotqlayouterAdapter() + : Autotqlayout::Autotqlayouter() {} - AutolayouterAdapter::~AutolayouterAdapter() + AutotqlayouterAdapter::~AutotqlayouterAdapter() {}} -void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a ) +void Autotqlayout::AutotqlayouterAdapter::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::AutotqlayouterAdapter::setAssociationWeight( int i ) { associationWeight=i; } -void Autolayout::AutolayouterAdapter::setDependenciesWeight( int i ) +void Autotqlayout::AutotqlayouterAdapter::setDependenciesWeight( int i ) { dependenciesWeight=i; } -void Autolayout::AutolayouterAdapter::setGeneralizationWeight( int i ) +void Autotqlayout::AutotqlayouterAdapter::setGeneralizationWeight( int i ) { generalizationWeight=i; } -void Autolayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setGeneralizationAsEdges( bool b ) { genralizationAsEdges=b; } -void Autolayout::AutolayouterAdapter::setDependenciesAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setDependenciesAsEdges( bool b ) { dependenciesAsEdges=b; } -void Autolayout::AutolayouterAdapter::setAssociationAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setAssociationAsEdges( bool b ) { associationAsEdges=b; } -void Autolayout::AutolayouterAdapter::setCompressShapes( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setCompressShapes( bool b ) { compressShapes=b; } -void Autolayout::AutolayouterAdapter::setCenterDiagram( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setCenterDiagram( bool b ) { centerDiagram=b; } -void Autolayout::AutolayouterAdapter::setClusterizeHierarchies( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setClusterizeHierarchies( bool b ) { clusterizeHierarchies=b; } -void Autolayout::AutolayouterAdapter::setShapeSeparation( int i ) +void Autotqlayout::AutotqlayouterAdapter::setShapeSeparation( int i ) { - shapeSeparation=i; + tqshapeSeparation=i; } -Autolayout::Graph * Autolayout::AutolayouterAdapter::setGraph( UMLView * view ) +Autotqlayout::Graph * Autotqlayout::AutotqlayouterAdapter::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::AutotqlayouterAdapter::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::AutotqlayouterAdapter::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::AutotqlayouterAdapter::setNoteConnectionWeight( int i ) { noteConnectionWeight=i; } -void Autolayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setNoteConnectionsAsEdges( bool b ) { noteConnectionAsEdges=b; } diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h index 7c52e742..0d8e9021 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.h +++ b/umbrello/umbrello/autolayout/autolayouteradapter.h @@ -11,24 +11,24 @@ #ifndef AUTOLAYOUTAUTOLAYOUTERADAPTER_H #define AUTOLAYOUTAUTOLAYOUTERADAPTER_H -//#include "autolayout.h" +//#include "autotqlayout.h" #include "baseinclude.h" -#include "autolayouter.h" +#include "autotqlayouter.h" #include "../umlnamespace.h" -namespace Autolayout +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class AutolayouterAdapter : virtual public Autolayout::Autolayouter +class AutotqlayouterAdapter : virtual public Autotqlayout::Autotqlayouter { public: - AutolayouterAdapter(); + AutotqlayouterAdapter(); - virtual ~AutolayouterAdapter(); + virtual ~AutotqlayouterAdapter(); virtual void setAssociationWeight(int i); virtual void setDependenciesWeight(int i); @@ -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..20d5d34c 100644 --- a/umbrello/umbrello/autolayout/dotautolayouter.cpp +++ b/umbrello/umbrello/autolayout/dotautolayouter.cpp @@ -11,31 +11,31 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "dotautolayouter.h" +#include "dotautotqlayouter.h" #include <graphviz/dotprocs.h> -namespace Autolayout { +namespace Autotqlayout { -DotAutolayouter::DotAutolayouter() - : Autolayout::GraphvizAutolayouter() +DotAutotqlayouter::DotAutotqlayouter() + : Autotqlayout::GraphvizAutotqlayouter() { } -DotAutolayouter::~DotAutolayouter() +DotAutotqlayouter::~DotAutotqlayouter() { dot_cleanup(gg->_agraph); } -void DotAutolayouter::run() +void DotAutotqlayouter::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..1ccb4bcc 100644 --- a/umbrello/umbrello/autolayout/dotautolayouter.h +++ b/umbrello/umbrello/autolayout/dotautolayouter.h @@ -15,19 +15,19 @@ #ifndef AUTOLAYOUTDOTAUTOLAYOUTER_H #define AUTOLAYOUTDOTAUTOLAYOUTER_H #include "baseinclude.h" -#include "graphvizautolayouter.h" +#include "graphvizautotqlayouter.h" -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class DotAutolayouter : virtual public Autolayout::GraphvizAutolayouter +class DotAutotqlayouter : virtual public Autotqlayout::GraphvizAutotqlayouter { public: - DotAutolayouter(); + DotAutotqlayouter(); - virtual ~DotAutolayouter(); + virtual ~DotAutotqlayouter(); virtual void run(); diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp index 8defc5ef..b8fe49d1 100644 --- a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp +++ b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp @@ -11,42 +11,42 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "graphvizautolayouter.h" +#include "graphvizautotqlayouter.h" #include <graphviz/graph.h> -namespace Autolayout { +namespace Autotqlayout { -GraphvizAutolayouter::GraphvizAutolayouter() - : Autolayout::AutolayouterAdapter() +GraphvizAutotqlayouter::GraphvizAutotqlayouter() + : Autotqlayout::AutotqlayouterAdapter() { gg = new GraphvizGraph(); } -GraphvizAutolayouter::~GraphvizAutolayouter() +GraphvizAutotqlayouter::~GraphvizAutotqlayouter() { agclose(gg->_agraph); delete gg; } -void GraphvizAutolayouter::setCompressShapes( bool b ) +void GraphvizAutotqlayouter::setCompressShapes( bool b ) { gg->setCompressShapes(b); } -void GraphvizAutolayouter::setCenterDiagram( bool b ) +void GraphvizAutotqlayouter::setCenterDiagram( bool b ) { gg->setCenterDiagram(b); } -void GraphvizAutolayouter::setShapeSeparation( int i ) +void GraphvizAutotqlayouter::setShapeSeparation( int i ) { gg->setShapeSeparation(i); } -Autolayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view ) +Autotqlayout::Canvas * GraphvizAutotqlayouter::setCanvas( UMLView * view ) { - Canvas* canvas= AutolayouterAdapter::setCanvas(view); + Canvas* canvas= AutotqlayouterAdapter::setCanvas(view); gg->setCanvas(canvas); } diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.h b/umbrello/umbrello/autolayout/graphvizautolayouter.h index 114ae63f..a2036749 100644 --- a/umbrello/umbrello/autolayout/graphvizautolayouter.h +++ b/umbrello/umbrello/autolayout/graphvizautolayouter.h @@ -12,19 +12,19 @@ #ifndef AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H #define AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H #include "baseinclude.h" -#include "autolayouteradapter.h" +#include "autotqlayouteradapter.h" #include "graphvizgraph.h" -namespace Autolayout +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class GraphvizAutolayouter : virtual public Autolayout::AutolayouterAdapter +class GraphvizAutotqlayouter : virtual public Autotqlayout::AutotqlayouterAdapter { public: - GraphvizAutolayouter(); + GraphvizAutotqlayouter(); virtual void setCompressShapes(bool b); @@ -35,7 +35,7 @@ public: virtual Canvas* setCanvas(UMLView* view); - virtual ~GraphvizAutolayouter(); + virtual ~GraphvizAutotqlayouter(); protected: virtual Graph* getGraph(){if (!gg) gg=new GraphvizGraph(); return gg;} 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..96ae6c31 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(); @@ -50,7 +50,7 @@ public: std::deque<Node*> nodelist; GVC_t* gvc; bool empty_flag; - friend class GraphvizAutolayouter; + friend class GraphvizAutotqlayouter; }; } 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 e6407a5c..de9477e8 100644 --- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui +++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MyDialog1</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>MyDialog1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame12</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -44,7 +44,7 @@ <cstring>comboBox1</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>dot</string> @@ -66,7 +66,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -80,7 +80,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -88,12 +88,12 @@ <string>Shape separation</string> </property> <property name="buddy" stdset="0"> - <cstring>shapeSeparationSB</cstring> + <cstring>tqshapeSeparationSB</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> - <cstring>shapeSeparationSB</cstring> + <cstring>tqshapeSeparationSB</cstring> </property> <property name="prefix"> <string></string> @@ -107,7 +107,7 @@ </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -121,7 +121,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>clusterizeHierarchiesCB</cstring> </property> @@ -129,7 +129,7 @@ <string>Clusteri&ze Hierarchies</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>centerDiagramCB</cstring> </property> @@ -137,7 +137,7 @@ <string>Ce&nter Diagram</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>compressShapesCB</cstring> </property> @@ -147,14 +147,14 @@ </widget> </hbox> </widget> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter14</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5_2_2</cstring> </property> @@ -168,14 +168,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter7_4</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>generalizationCB</cstring> </property> @@ -186,7 +186,7 @@ <bool>true</bool> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>generalizationEdgessSL</cstring> </property> @@ -203,13 +203,13 @@ <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> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5_2</cstring> </property> @@ -223,14 +223,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter7</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>associationEdgesCB</cstring> </property> @@ -238,7 +238,7 @@ <string>Association as Ed&ges</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>associationEdgesSL</cstring> </property> @@ -258,13 +258,13 @@ <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> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5</cstring> </property> @@ -278,14 +278,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter6</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>dependenciesEdgesCB</cstring> </property> @@ -293,7 +293,7 @@ <string>Dependencies &as Edges</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>dependenciedEdgesSL</cstring> </property> @@ -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,22 +330,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>1</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -366,14 +366,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>277</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -390,7 +390,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -404,7 +404,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>restoreDefaultsBTN</cstring> </property> @@ -412,7 +412,7 @@ <string>&Restore Default</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>saveDefaultsBTN</cstring> </property> @@ -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> @@ -534,8 +534,8 @@ <slot>slotSelectAlgorithm(const QString&)</slot> </connection> </connections> -<slots> - <slot>slotDoAutolayout()</slot> +<Q_SLOTS> + <slot>slotDoAutotqlayout()</slot> <slot>slotSaveSettings()</slot> <slot>slotReloadSettings()</slot> <slot>slotSetClusterizeHierarchies(bool b)</slot> @@ -549,6 +549,6 @@ <slot>slotSetCenterDiagram(bool b)</slot> <slot>slotSetShapeSeparation(int i)</slot> <slot specifier="pure virtual">slotSelectAlgorithm(const QString&)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> 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> |