summaryrefslogtreecommitdiffstats
path: root/umbrello/umbrello/autolayout
diff options
context:
space:
mode:
Diffstat (limited to 'umbrello/umbrello/autolayout')
-rw-r--r--umbrello/umbrello/autolayout/_graph.h2
-rw-r--r--umbrello/umbrello/autolayout/autolayoutdlg.cpp20
-rw-r--r--umbrello/umbrello/autolayout/autolayoutdlg.h4
-rw-r--r--umbrello/umbrello/autolayout/autolayouter.cpp6
-rw-r--r--umbrello/umbrello/autolayout/autolayouter.h14
-rw-r--r--umbrello/umbrello/autolayout/autolayouteradapter.cpp40
-rw-r--r--umbrello/umbrello/autolayout/autolayouteradapter.h4
-rw-r--r--umbrello/umbrello/autolayout/canvas.h2
-rw-r--r--umbrello/umbrello/autolayout/diagram.h4
-rw-r--r--umbrello/umbrello/autolayout/dotautolayouter.cpp8
-rw-r--r--umbrello/umbrello/autolayout/dotautolayouter.h4
-rw-r--r--umbrello/umbrello/autolayout/graphvizautolayouter.cpp6
-rw-r--r--umbrello/umbrello/autolayout/graphvizautolayouter.h4
-rw-r--r--umbrello/umbrello/autolayout/graphvizgraph.cpp22
-rw-r--r--umbrello/umbrello/autolayout/graphvizgraph.h4
-rw-r--r--umbrello/umbrello/autolayout/graphviznode.cpp4
-rw-r--r--umbrello/umbrello/autolayout/graphviznode.h4
-rw-r--r--umbrello/umbrello/autolayout/newautolayoutdialog.ui12
-rw-r--r--umbrello/umbrello/autolayout/node.h2
-rw-r--r--umbrello/umbrello/autolayout/simplecanvas.cpp2
-rw-r--r--umbrello/umbrello/autolayout/simplecanvas.h2
21 files changed, 85 insertions, 85 deletions
diff --git a/umbrello/umbrello/autolayout/_graph.h b/umbrello/umbrello/autolayout/_graph.h
index b3c42f30..179a9471 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 Autotqlayout {
+namespace Autolayout {
/**
@author Dimitri Ognibene <ognibened @yahoo.it>
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index 6b6196d4..fb76d4f8 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -99,10 +99,10 @@ void AutolayoutDlg::slotSaveSettings()
}
-void AutolayoutDlg::slotDoAutotqlayout()
+void AutolayoutDlg::slotDoAutolayout()
{
- Autotqlayout::Autolayouter* a=getAutolayouter();;
+ Autolayout::Autolayouter* a=getAutolayouter();;
a->setAssociationAsEdges( associationAsEdges);
a->setAssociationWeight( associationWeight );
@@ -116,7 +116,7 @@ void AutolayoutDlg::slotDoAutotqlayout()
a->setNoteConnectionWeight( 1);
a->setNoteConnectionsAsEdges(true);
a->setShapeSeparation( shapeSeparation);
- a->autotqlayout( view);
+ a->autolayout( view);
delete a;
a=0;
accept();
@@ -165,18 +165,18 @@ void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname)
}
-Autotqlayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
+Autolayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
{
const TQString text = algorithmCOB->currentText();
- kDebug() << "Autotqlayout Algorithm " << algname << " found " << text << endl;
+ kDebug() << "Autolayout Algorithm " << algname << " found " << text << endl;
if (text == "dot")
- return new Autotqlayout::DotAutolayouter();
+ return new Autolayout::DotAutolayouter();
if (text == "circo")
- return new Autotqlayout::CircoAutolayouter();
+ return new Autolayout::CircoAutolayouter();
if (text == "neato")
- return new Autotqlayout::NeatoAutolayouter();
- kError() << "Autotqlayout Algorithm not found" << endl;
- return new Autotqlayout::DotAutolayouter();
+ return new Autolayout::NeatoAutolayouter();
+ kError() << "Autolayout Algorithm not found" << endl;
+ return new Autolayout::DotAutolayouter();
}
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index a5e4117a..7278841e 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -37,7 +37,7 @@ class AutolayoutDlg : public MyDialog1
virtual void slotSetShapeSeparation(int i);
virtual void slotReloadSettings();
virtual void slotSaveSettings();
- virtual void slotDoAutotqlayout();
+ virtual void slotDoAutolayout();
void readConfig(KConfig*);
void writeConfig(KConfig*);
virtual void slotSelectAlgorithm(const TQString&);
@@ -57,7 +57,7 @@ class AutolayoutDlg : public MyDialog1
int shapeSeparation;
KConfig* config;
TQString algname;
- Autotqlayout::Autolayouter* getAutolayouter();
+ Autolayout::Autolayouter* getAutolayouter();
};
diff --git a/umbrello/umbrello/autolayout/autolayouter.cpp b/umbrello/umbrello/autolayout/autolayouter.cpp
index 802bc438..f70fd195 100644
--- a/umbrello/umbrello/autolayout/autolayouter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouter.cpp
@@ -13,11 +13,11 @@
***************************************************************************/
#include "autolayouter.h"
-namespace Autotqlayout {
+namespace Autolayout {
-void Autolayouter::autotqlayout( UMLView * v )
+void Autolayouter::autolayout( UMLView * v )
{
setCanvas(v);
setGraph(v);
@@ -25,5 +25,5 @@ void Autolayouter::autotqlayout( UMLView * v )
updateView(v);
}
-} // end namespace Autotqlayout
+} // end namespace Autolayout
diff --git a/umbrello/umbrello/autolayout/autolayouter.h b/umbrello/umbrello/autolayout/autolayouter.h
index 5d4645f9..a56b1ce3 100644
--- a/umbrello/umbrello/autolayout/autolayouter.h
+++ b/umbrello/umbrello/autolayout/autolayouter.h
@@ -13,10 +13,10 @@
#define AUTOLAYOUTAUTOLAYOUTER_H
#include "baseinclude.h"
-namespace Autotqlayout {
+namespace Autolayout {
/**
-This is the super class of any class which encapsulate an autotqlayout algorithm
+This is the super class of any class which encapsulate an autolayout algorithm
@author Dimitri Ognibene <ognibened @yahoo.it>
@@ -47,14 +47,14 @@ public:
virtual void setShapeSeparation(int i)=0;
- virtual void autotqlayout(UMLView* v);
+ virtual void autolayout(UMLView* v);
protected:
virtual void run()=0;
virtual void updateView(UMLView*)=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;
+ virtual Autolayout::Canvas* getCanvas()=0;
+ virtual Autolayout::Graph* getGraph()=0;
+ virtual Autolayout::Graph* setGraph(UMLView* view)=0;
+ virtual Autolayout::Canvas* setCanvas(UMLView* view)=0;
};
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
index 30f3fad7..0673fde1 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
@@ -12,18 +12,18 @@
#include "autolayouteradapter.h"
-namespace Autotqlayout
+namespace Autolayout
{
AutolayouterAdapter::AutolayouterAdapter()
- : Autotqlayout::Autolayouter()
+ : Autolayout::Autolayouter()
{}
AutolayouterAdapter::~AutolayouterAdapter()
{}}
-void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
+void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
{
int weight;
switch (a->getAssocType())
@@ -71,60 +71,60 @@ void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
getGraph()->addEdge(a->getWidgetID(Uml::A).c_str(),a->getWidgetID(Uml::B).c_str(),weight);
}
-void Autotqlayout::AutolayouterAdapter::setAssociationWeight( int i )
+void Autolayout::AutolayouterAdapter::setAssociationWeight( int i )
{
associationWeight=i;
}
-void Autotqlayout::AutolayouterAdapter::setDependenciesWeight( int i )
+void Autolayout::AutolayouterAdapter::setDependenciesWeight( int i )
{
dependenciesWeight=i;
}
-void Autotqlayout::AutolayouterAdapter::setGeneralizationWeight( int i )
+void Autolayout::AutolayouterAdapter::setGeneralizationWeight( int i )
{
generalizationWeight=i;
}
-void Autotqlayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
{
genralizationAsEdges=b;
}
-void Autotqlayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
{
dependenciesAsEdges=b;
}
-void Autotqlayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
{
associationAsEdges=b;
}
-void Autotqlayout::AutolayouterAdapter::setCompressShapes( bool b )
+void Autolayout::AutolayouterAdapter::setCompressShapes( bool b )
{
compressShapes=b;
}
-void Autotqlayout::AutolayouterAdapter::setCenterDiagram( bool b )
+void Autolayout::AutolayouterAdapter::setCenterDiagram( bool b )
{
centerDiagram=b;
}
-void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
+void Autolayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
{
clusterizeHierarchies=b;
}
-void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i )
+void Autolayout::AutolayouterAdapter::setShapeSeparation( int i )
{
shapeSeparation=i;
}
-Autotqlayout::Graph * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view )
+Autolayout::Graph * Autolayout::AutolayouterAdapter::setGraph( UMLView * view )
{
if (! view) return 0;
- Autotqlayout::Graph * g=getGraph();
+ Autolayout::Graph * g=getGraph();
if (g&&g->empty())
{
UMLWidgetList list = view->getWidgetList();
@@ -151,7 +151,7 @@ Autotqlayout::Graph * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * vi
return g;
}
-void Autotqlayout::AutolayouterAdapter::updateView( UMLView* view )
+void Autolayout::AutolayouterAdapter::updateView( UMLView* view )
{
if (! view) return ;
UMLWidgetList list = view->getWidgetList();
@@ -175,17 +175,17 @@ UMLWidgetList list = view->getWidgetList();
}
}
-Autotqlayout::Canvas * Autotqlayout::AutolayouterAdapter::setCanvas( UMLView* view )
+Autolayout::Canvas * Autolayout::AutolayouterAdapter::setCanvas( UMLView* view )
{
- return canvas=new Autotqlayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
+ return canvas=new Autolayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
}
-void Autotqlayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
+void Autolayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
{
noteConnectionWeight=i;
}
-void Autotqlayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
{
noteConnectionAsEdges=b;
}
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h
index 49e71803..5dec6d02 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.h
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.h
@@ -17,13 +17,13 @@
#include "../umlnamespace.h"
-namespace Autotqlayout
+namespace Autolayout
{
/**
@author Dimitri Ognibene <ognibened @yahoo.it>
*/
-class AutolayouterAdapter : virtual public Autotqlayout::Autolayouter
+class AutolayouterAdapter : virtual public Autolayout::Autolayouter
{
public:
AutolayouterAdapter();
diff --git a/umbrello/umbrello/autolayout/canvas.h b/umbrello/umbrello/autolayout/canvas.h
index 210b1353..246df8a7 100644
--- a/umbrello/umbrello/autolayout/canvas.h
+++ b/umbrello/umbrello/autolayout/canvas.h
@@ -15,7 +15,7 @@
#ifndef AUTOLAYOUTCANVAS_H
#define AUTOLAYOUTCANVAS_H
-namespace Autotqlayout {
+namespace Autolayout {
/**
@author Dimitri Ognibene <ognibened @yahoo.it>
diff --git a/umbrello/umbrello/autolayout/diagram.h b/umbrello/umbrello/autolayout/diagram.h
index 43f35f51..b5e918b2 100644
--- a/umbrello/umbrello/autolayout/diagram.h
+++ b/umbrello/umbrello/autolayout/diagram.h
@@ -21,7 +21,7 @@
@author Dimitri Ognibene <ognibened @yahoo.it>
Umbrello UML Modeller Authors
*/
-namespace Autotqlayout{
+namespace Autolayout{
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 autotqlayout();
+ void autolayout();
void save();
Node getNode(const char*);
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.cpp b/umbrello/umbrello/autolayout/dotautolayouter.cpp
index dea9b554..5d197845 100644
--- a/umbrello/umbrello/autolayout/dotautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/dotautolayouter.cpp
@@ -15,10 +15,10 @@
#include <graphviz/dotprocs.h>
-namespace Autotqlayout {
+namespace Autolayout {
DotAutolayouter::DotAutolayouter()
- : Autotqlayout::GraphvizAutolayouter()
+ : Autolayout::GraphvizAutolayouter()
{
}
@@ -32,10 +32,10 @@ DotAutolayouter::~DotAutolayouter()
void DotAutolayouter::run()
{
//#ifndef internal_renderizer
- /* bind graph to GV context - currently must be done before tqlayout */
+ /* bind graph to GV context - currently must be done before layout */
// gvBindContext(gvc,g);
//#endif
- // do tqlayout
+ // do layout
//dot_layout();
dot_layout( gg->_agraph );
}
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.h b/umbrello/umbrello/autolayout/dotautolayouter.h
index 4b8af212..5c6530ba 100644
--- a/umbrello/umbrello/autolayout/dotautolayouter.h
+++ b/umbrello/umbrello/autolayout/dotautolayouter.h
@@ -17,12 +17,12 @@
#include "baseinclude.h"
#include "graphvizautolayouter.h"
-namespace Autotqlayout {
+namespace Autolayout {
/**
@author Dimitri Ognibene <ognibened @yahoo.it>
*/
-class DotAutolayouter : virtual public Autotqlayout::GraphvizAutolayouter
+class DotAutolayouter : virtual public Autolayout::GraphvizAutolayouter
{
public:
DotAutolayouter();
diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
index da075642..8defc5ef 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
@@ -15,10 +15,10 @@
#include <graphviz/graph.h>
-namespace Autotqlayout {
+namespace Autolayout {
GraphvizAutolayouter::GraphvizAutolayouter()
- : Autotqlayout::AutolayouterAdapter()
+ : Autolayout::AutolayouterAdapter()
{
gg = new GraphvizGraph();
}
@@ -44,7 +44,7 @@ void GraphvizAutolayouter::setShapeSeparation( int i )
gg->setShapeSeparation(i);
}
-Autotqlayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view )
+Autolayout::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 95fa46ba..114ae63f 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.h
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.h
@@ -15,13 +15,13 @@
#include "autolayouteradapter.h"
#include "graphvizgraph.h"
-namespace Autotqlayout
+namespace Autolayout
{
/**
@author Dimitri Ognibene <ognibened @yahoo.it>
*/
-class GraphvizAutolayouter : virtual public Autotqlayout::AutolayouterAdapter
+class GraphvizAutolayouter : virtual public Autolayout::AutolayouterAdapter
{
public:
GraphvizAutolayouter();
diff --git a/umbrello/umbrello/autolayout/graphvizgraph.cpp b/umbrello/umbrello/autolayout/graphvizgraph.cpp
index 36a50170..716f9223 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 Autotqlayout
+namespace Autolayout
{
/**
@@ -31,7 +31,7 @@ namespace Autotqlayout
* @return
*/
GraphvizGraph::GraphvizGraph()
- : Autotqlayout::Graph()
+ : Autolayout::Graph()
{
aginit();
empty_flag=true;
@@ -96,7 +96,7 @@ void GraphvizGraph::addNode(const char* name, int width, int height)
}
-void Autotqlayout::GraphvizGraph::setCompressShapes( bool b )
+void Autolayout::GraphvizGraph::setCompressShapes( bool b )
{
if (empty())
{
@@ -105,7 +105,7 @@ void Autotqlayout::GraphvizGraph::setCompressShapes( bool b )
}
}
-void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b )
+void Autolayout::GraphvizGraph::setCenterDiagram( bool b )
{
if (empty())
{
@@ -114,7 +114,7 @@ void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b )
}
}
-void Autotqlayout::GraphvizGraph::setShapeSeparation( int i )
+void Autolayout::GraphvizGraph::setShapeSeparation( int i )
{
char* a;
asprintf(&a,"%f",((float) i)/10.0);
@@ -122,22 +122,22 @@ void Autotqlayout::GraphvizGraph::setShapeSeparation( int i )
free (a);
}
-bool Autotqlayout::GraphvizGraph::empty( )
+bool Autolayout::GraphvizGraph::empty( )
{
return empty_flag;
}
-Autotqlayout::Node* Autotqlayout::GraphvizGraph::getNode( const char * arg1 )
+Autolayout::Node* Autolayout::GraphvizGraph::getNode( const char * arg1 )
{
char *a = _strcpy(arg1);
- Autotqlayout::GraphvizNode* b=
- new Autotqlayout::GraphvizNode(agnode(_agraph,a));
+ Autolayout::GraphvizNode* b=
+ new Autolayout::GraphvizNode(agnode(_agraph,a));
delete[](a);
nodelist.push_back(b);
return b;
}
-void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas)
+void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas)
{
char buf[100];
sprintf(buf,"%f,%f",((float)canvas->getMaxX()/DPI),((float)canvas->getMaxY()/DPI));
@@ -146,5 +146,5 @@ void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas)
agraphattr(_agraph, "page", buf);
}
-} // end namespace Autotqlayout
+} // end namespace Autolayout
diff --git a/umbrello/umbrello/autolayout/graphvizgraph.h b/umbrello/umbrello/autolayout/graphvizgraph.h
index 1be57139..dfbf323d 100644
--- a/umbrello/umbrello/autolayout/graphvizgraph.h
+++ b/umbrello/umbrello/autolayout/graphvizgraph.h
@@ -21,13 +21,13 @@
#include <deque>
#include <graphviz/types.h>
-namespace Autotqlayout
+namespace Autolayout
{
/**
@author Dimitri Ognibene <ognibened @yahoo.it>
*/
-class GraphvizGraph : virtual public Autotqlayout::Graph
+class GraphvizGraph : virtual public Autolayout::Graph
{
public:
GraphvizGraph();
diff --git a/umbrello/umbrello/autolayout/graphviznode.cpp b/umbrello/umbrello/autolayout/graphviznode.cpp
index 430e176c..ea3510cf 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 Autotqlayout {
+namespace Autolayout {
@@ -40,7 +40,7 @@ int GraphvizNode::getY()
}
-Autotqlayout::GraphvizNode::GraphvizNode( Agnode_t * node )
+Autolayout::GraphvizNode::GraphvizNode( Agnode_t * node )
{
n=node;
}
diff --git a/umbrello/umbrello/autolayout/graphviznode.h b/umbrello/umbrello/autolayout/graphviznode.h
index 1190f5af..0efcb6d8 100644
--- a/umbrello/umbrello/autolayout/graphviznode.h
+++ b/umbrello/umbrello/autolayout/graphviznode.h
@@ -18,12 +18,12 @@
class Agnode_t;
-namespace Autotqlayout {
+namespace Autolayout {
/**
@author Dimitri Ognibene <ognibened @yahoo.it>
*/
-class GraphvizNode : virtual public Autotqlayout::Node
+class GraphvizNode : virtual public Autolayout::Node
{
GraphvizNode (Agnode_t* n);
diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
index af2e3db5..7213c164 100644
--- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui
+++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
@@ -203,7 +203,7 @@
<string>Weight</string>
</property>
<property name="whatsThis" stdset="0">
- <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+ <string>Select the weight that the autolayout 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 autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+ <string>Select the weight that the autolayout 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 autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+ <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
</property>
</widget>
</widget>
@@ -339,7 +339,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -513,7 +513,7 @@
<sender>buttonOk</sender>
<signal>clicked()</signal>
<receiver>MyDialog1</receiver>
- <slot>slotDoAutotqlayout()</slot>
+ <slot>slotDoAutolayout()</slot>
</connection>
<connection>
<sender>restoreDefaultsBTN</sender>
@@ -535,7 +535,7 @@
</connection>
</connections>
<Q_SLOTS>
- <slot>slotDoAutotqlayout()</slot>
+ <slot>slotDoAutolayout()</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 74259233..c2532b8b 100644
--- a/umbrello/umbrello/autolayout/node.h
+++ b/umbrello/umbrello/autolayout/node.h
@@ -15,7 +15,7 @@
#ifndef AUTOLAYOUTNODE_H
#define AUTOLAYOUTNODE_H
-namespace Autotqlayout {
+namespace Autolayout {
/**
@author Umbrello UML Modeller Authors
diff --git a/umbrello/umbrello/autolayout/simplecanvas.cpp b/umbrello/umbrello/autolayout/simplecanvas.cpp
index 38832962..0598c15e 100644
--- a/umbrello/umbrello/autolayout/simplecanvas.cpp
+++ b/umbrello/umbrello/autolayout/simplecanvas.cpp
@@ -13,7 +13,7 @@
***************************************************************************/
#include "simplecanvas.h"
-namespace Autotqlayout {
+namespace Autolayout {
diff --git a/umbrello/umbrello/autolayout/simplecanvas.h b/umbrello/umbrello/autolayout/simplecanvas.h
index 90cecea5..29712b9e 100644
--- a/umbrello/umbrello/autolayout/simplecanvas.h
+++ b/umbrello/umbrello/autolayout/simplecanvas.h
@@ -17,7 +17,7 @@
#include "canvas.h"
#include <tqrect.h>
-namespace Autotqlayout {
+namespace Autolayout {
/**
@author Dimitri Ognibene <ognibened @yahoo.it>