summaryrefslogtreecommitdiffstats
path: root/umbrello
diff options
context:
space:
mode:
Diffstat (limited to 'umbrello')
-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
-rw-r--r--umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui4
-rw-r--r--umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/javacodegenerationformbase.ui8
-rw-r--r--umbrello/umbrello/codegenerators/pythonwriter.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui8
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp8
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp6
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp2
-rw-r--r--umbrello/umbrello/dialog_utils.cpp6
-rw-r--r--umbrello/umbrello/dialog_utils.h4
-rw-r--r--umbrello/umbrello/dialogs/activitypage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/assocpage.cpp8
-rw-r--r--umbrello/umbrello/dialogs/assocrolepage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/classifierlistpage.cpp4
-rw-r--r--umbrello/umbrello/dialogs/codegenerationoptionsbase.ui4
-rw-r--r--umbrello/umbrello/dialogs/codeviewerdialogbase.ui2
-rw-r--r--umbrello/umbrello/dialogs/codevieweroptionsbase.ui4
-rw-r--r--umbrello/umbrello/dialogs/diagrampropertiespage.ui12
-rw-r--r--umbrello/umbrello/dialogs/overwritedialogue.cpp6
-rw-r--r--umbrello/umbrello/dialogs/pkgcontentspage.cpp8
-rw-r--r--umbrello/umbrello/dialogs/umlrolepropertiesbase.ui6
-rw-r--r--umbrello/umbrello/uml.cpp14
-rw-r--r--umbrello/umbrello/uml.h4
45 files changed, 149 insertions, 149 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>
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
index 86cee729..dee5c9f4 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
@@ -41,7 +41,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@@ -166,7 +166,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<grid>
<property name="name">
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
index 1587c265..426c6d9a 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
@@ -428,7 +428,7 @@ void JavaClassifierCodeDocument::updateContent( )
// NOW create document in sections..
// now we want to populate the body of our class
- // our tqlayout is the following general groupings of code blocks:
+ // our layout is the following general groupings of code blocks:
// start java classifier document
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
index a9ba6a89..60764673 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<grid>
<property name="name">
@@ -74,7 +74,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -117,7 +117,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@@ -163,7 +163,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
diff --git a/umbrello/umbrello/codegenerators/pythonwriter.cpp b/umbrello/umbrello/codegenerators/pythonwriter.cpp
index 8c913022..f243ab2c 100644
--- a/umbrello/umbrello/codegenerators/pythonwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pythonwriter.cpp
@@ -418,7 +418,7 @@ const TQStringList PythonWriter::reservedKeywords() const {
<< "TypeError"
<< "UnboundLocalError"
<< "unichr"
- << "tqunicode"
+ << "unicode"
<< "UnicodeError"
<< "UserWarning"
<< "ValueError"
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
index 22fa56fc..ada4b0bb 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
@@ -435,7 +435,7 @@ void RubyClassifierCodeDocument::updateContent( )
// NOW create document in sections..
// now we want to populate the body of our class
- // our tqlayout is the following general groupings of code blocks:
+ // our layout is the following general groupings of code blocks:
// start ruby classifier document
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
index c47dc97f..28f74fd0 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<grid>
<property name="name">
@@ -45,7 +45,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -88,7 +88,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@@ -134,7 +134,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index 38561d53..eb3c4b6a 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -175,7 +175,7 @@ int Lexer::toInt( const Token& token )
int i = s[0] == 'L' ? 2 : 1; // wide char ?
if( s[i] == '\\' ){
// escaped char
- int c = s[i+1].tqunicode();
+ int c = s[i+1].unicode();
switch( c ) {
case '0':
return 0;
@@ -186,7 +186,7 @@ int Lexer::toInt( const Token& token )
return c;
}
} else {
- return s[i].tqunicode();
+ return s[i].unicode();
}
} else {
return 0;
@@ -465,7 +465,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
tk.setStartPosition( startLine, startColumn );
tk.setEndPosition( m_currentLine, m_currentColumn );
} else {
- tk = CREATE_TOKEN( ch.tqunicode(), currentPosition(), 1 );
+ tk = CREATE_TOKEN( ch.unicode(), currentPosition(), 1 );
nextChar();
tk.setStartPosition( startLine, startColumn );
tk.setEndPosition( m_currentLine, m_currentColumn );
@@ -808,7 +808,7 @@ int Lexer::macroPrimary()
{
readWhiteSpaces( false );
int result = 0;
- switch( currentChar().tqunicode() ) {
+ switch( currentChar().unicode() ) {
case '(':
nextChar();
result = macroExpression();
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
index a05a7ddf..2d009294 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
@@ -71,7 +71,7 @@ const HashEntry* Lookup::findEntry( const struct HashTable *table,
const HashEntry* Lookup::findEntry( const struct HashTable *table,
const TQString &s )
{
- return findEntry( table, s.tqunicode(), s.length() );
+ return findEntry( table, s.unicode(), s.length() );
}
int Lookup::find(const struct HashTable *table,
@@ -85,7 +85,7 @@ int Lookup::find(const struct HashTable *table,
int Lookup::find(const struct HashTable *table, const TQString &s)
{
- return find(table, s.tqunicode(), s.length());
+ return find(table, s.unicode(), s.length());
}
unsigned int Lookup::hash(const TQChar *c, unsigned int len)
@@ -100,7 +100,7 @@ unsigned int Lookup::hash(const TQChar *c, unsigned int len)
unsigned int Lookup::hash(const TQString &key)
{
- return hash(key.tqunicode(), key.length());
+ return hash(key.unicode(), key.length());
}
unsigned int Lookup::hash(const char *s)
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
index 8b8cc8eb..3e6dde46 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
@@ -294,7 +294,7 @@ TQString URLUtil::envExpand ( const TQString& str )
if (pos < 0)
pos = len;
- char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() );
+ char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() );
if (ret)
{
diff --git a/umbrello/umbrello/dialog_utils.cpp b/umbrello/umbrello/dialog_utils.cpp
index 0e114082..2d6d904f 100644
--- a/umbrello/umbrello/dialog_utils.cpp
+++ b/umbrello/umbrello/dialog_utils.cpp
@@ -25,15 +25,15 @@
namespace Dialog_Utils {
-TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row,
+TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row,
TQLabel * &label, const TQString& labelText,
TQLineEdit * &editField,
const TQString& editFieldText /* = TQString() */)
{
label = new TQLabel(labelText, containingBox);
- tqlayout->addWidget(label, row, 0);
+ layout->addWidget(label, row, 0);
editField = new TQLineEdit(editFieldText, containingBox);
- tqlayout->addWidget(editField, row, 1 );
+ layout->addWidget(editField, row, 1 );
label->setBuddy(editField);
return editField;
}
diff --git a/umbrello/umbrello/dialog_utils.h b/umbrello/umbrello/dialog_utils.h
index 5588049e..59925d3e 100644
--- a/umbrello/umbrello/dialog_utils.h
+++ b/umbrello/umbrello/dialog_utils.h
@@ -31,7 +31,7 @@ namespace Dialog_Utils {
* Create a labeled text lineedit widget.
*
* @param containingBox The containing TQGroupBox.
- * @param tqlayout The TQGridLayout to use.
+ * @param layout The TQGridLayout to use.
* @param row The row number within the TQGridLayout.
* @param label The TQLabel object allocated (return value)
* @param labelText The label text.
@@ -39,7 +39,7 @@ namespace Dialog_Utils {
* @param editFieldText Initialization text in the editField (optional.)
* @return a pointer to the TQLineEdit so you can setFocus() if necessary
*/
-TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row,
+TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row,
TQLabel * &label, const TQString& labelText,
TQLineEdit * &editField,
const TQString& editFieldText = TQString());
diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp
index 10ccb04b..7eac7f69 100644
--- a/umbrello/umbrello/dialogs/activitypage.cpp
+++ b/umbrello/umbrello/dialogs/activitypage.cpp
@@ -37,7 +37,7 @@ void ActivityPage::setupPage() {
m_pActivityGB = new TQGroupBox(i18n("Activities"), this );
- // vertical box tqlayout for the activity lists, arrow buttons and the button box
+ // vertical box layout for the activity lists, arrow buttons and the button box
TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pActivityGB );
listVBoxLayout -> setMargin(margin);
listVBoxLayout -> setSpacing ( 10 );
diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp
index ec95f619..feb193eb 100644
--- a/umbrello/umbrello/dialogs/assocpage.cpp
+++ b/umbrello/umbrello/dialogs/assocpage.cpp
@@ -25,12 +25,12 @@ AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(pa
m_pAssocGB = new TQGroupBox(i18n("Associations"), this);
mainLayout -> addWidget(m_pAssocGB);
- TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pAssocGB);
- tqlayout -> setSpacing(10);
- tqlayout -> setMargin(margin);
+ TQHBoxLayout * layout = new TQHBoxLayout(m_pAssocGB);
+ layout -> setSpacing(10);
+ layout -> setMargin(margin);
m_pAssocLB = new TQListBox(m_pAssocGB);
- tqlayout -> addWidget(m_pAssocLB);
+ layout -> addWidget(m_pAssocLB);
setMinimumSize(310, 330);
fillListBox();
m_pMenu = 0;
diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp
index a44a5f05..adb7dcc3 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.cpp
+++ b/umbrello/umbrello/dialogs/assocrolepage.cpp
@@ -228,7 +228,7 @@ void AssocRolePage::constructWidget() {
// m_pDocB-> setEnabled(false);
m_pDocB->setWordWrap(TQMultiLineEdit::WidgetWidth);
- // add group boxes to main tqlayout
+ // add group boxes to main layout
mainLayout -> addWidget( propsAGB, 0, 0);
mainLayout -> addWidget( scopeABG, 1, 0);
mainLayout -> addWidget(changeABG, 2, 0);
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index a96cb645..2efff9cb 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -60,11 +60,11 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi
int margin = fontMetrics().height();
setMinimumSize(310,330);
- //main tqlayout contains our two group boxes, the list and the documentation
+ //main layout contains our two group boxes, the list and the documentation
TQVBoxLayout* mainLayout = new TQVBoxLayout( this );
mainLayout->setSpacing(10);
- //top group box, contains a vertical tqlayout with list box above and buttons below
+ //top group box, contains a vertical layout with list box above and buttons below
m_pItemListGB = new TQGroupBox(typeName, this );
TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pItemListGB );
listVBoxLayout->setMargin(margin);
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
index 48ee0ff7..0adc90c3 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
@@ -55,7 +55,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -270,7 +270,7 @@ generator wants to use as output file already exists:</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<grid>
<property name="name">
diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
index 665d6ccf..1a283200 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
+++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
index 1c44f8cb..346dc44d 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
@@ -161,7 +161,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@@ -192,7 +192,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="4">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
index da0482fa..c7e430cb 100644
--- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui
+++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
@@ -70,7 +70,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout20</cstring>
+ <cstring>layout20</cstring>
</property>
<hbox>
<property name="name">
@@ -78,7 +78,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -164,7 +164,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -172,7 +172,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -229,7 +229,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -318,7 +318,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp
index 0c7aabd3..c9cb8b92 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.cpp
+++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp
@@ -26,14 +26,14 @@ OverwriteDialogue::OverwriteDialogue(
bool applyToAllRemaining, TQWidget* parent, const char* name) :
KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) {
- TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
+ TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() );
- tqlayout->addWidget(dialogueLabel);
+ layout->addWidget(dialogueLabel);
m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() );
m_applyToAllRemaining->setChecked(applyToAllRemaining);
- tqlayout->addWidget(m_applyToAllRemaining);
+ layout->addWidget(m_applyToAllRemaining);
setButtonText(KDialogBase::Ok, i18n("&Overwrite"));
setButtonText(KDialogBase::Apply, i18n("&Generate Similar File Name"));
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
index a5b742b1..dce7c98b 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
@@ -29,12 +29,12 @@ PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg)
m_pContentGB = new TQGroupBox(i18n("Contained Items"), this);
mainLayout -> addWidget(m_pContentGB);
- TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pContentGB);
- tqlayout -> setSpacing(10);
- tqlayout -> setMargin(margin);
+ TQHBoxLayout * layout = new TQHBoxLayout(m_pContentGB);
+ layout -> setSpacing(10);
+ layout -> setMargin(margin);
m_pContentLB = new TQListBox(m_pContentGB);
- tqlayout -> addWidget(m_pContentLB);
+ layout -> addWidget(m_pContentLB);
setMinimumSize(310, 330);
fillListBox();
m_pMenu = 0;
diff --git a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
index ecaa98ae..dde405a5 100644
--- a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
+++ b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
@@ -14,7 +14,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<property name="geometry">
<rect>
@@ -37,7 +37,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<property name="geometry">
<rect>
@@ -111,7 +111,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 7be8936a..bb876b60 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -225,8 +225,8 @@ void UMLApp::initActions() {
TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
#if defined (HAVE_DOT)
- autotqlayout = new KAction(i18n("&Autotqlayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutotqlayout()),
- actionCollection(),"autotqlayout");
+ autolayout = new KAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()),
+ actionCollection(),"autolayout");
#endif
sequenceDiagram= new KAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" );
@@ -842,7 +842,7 @@ void UMLApp::slotEditCopy() {
void UMLApp::slotEditPaste() {
slotStatusMsg(i18n("Inserting clipboard contents..."));
- TQMimeSource* data = TQApplication::tqclipboard()->data();
+ TQMimeSource* data = TQApplication::clipboard()->data();
UMLClipboard clipboard;
setCursor(KCursor::waitCursor());
if(!clipboard.paste(data)) {
@@ -977,7 +977,7 @@ void UMLApp::enableRedo(bool enable) {
/** initialize the QT's global clipboard support for the application */
void UMLApp::initClip() {
- TQClipboard* clip = TQApplication::tqclipboard();
+ TQClipboard* clip = TQApplication::clipboard();
connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged()));
// Don't poll the X11 clipboard every second. This is a little expensive and resulted
@@ -1007,7 +1007,7 @@ bool UMLApp::canDecode(const TQMimeSource* mimeSource) {
}
void UMLApp::slotClipDataChanged() {
- TQMimeSource * data = TQApplication::tqclipboard()->data();
+ TQMimeSource * data = TQApplication::clipboard()->data();
//Pass the MimeSource to the Doc
editPaste->setEnabled( data && canDecode(data) );
@@ -1075,7 +1075,7 @@ bool UMLApp::editCutCopy( bool bFromView ) {
TQMimeSource * clipdata = 0;
if ((clipdata = clipboard.copy(bFromView)) != 0) {
- TQClipboard* clip = TQApplication::tqclipboard();
+ TQClipboard* clip = TQApplication::clipboard();
clip->setData(clipdata);//the global clipboard takes ownership of the clipdata memory
connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged()));
return true;
@@ -1679,7 +1679,7 @@ void UMLApp::slotMoveTabRight() {
//m_tabWidget->moveTab( m_tabWidget->currentPageIndex(), m_tabWidget->currentPageIndex() + 1 );
}
-void UMLApp::slotAutotqlayout(){
+void UMLApp::slotAutolayout(){
#ifdef HAVE_DOT
/*
TQDialog* d = new AutolayoutDlg(getCurrentView());
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index d9bff6bc..f8e1be48 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -535,7 +535,7 @@ public slots:
/**
* Autolayouts the current class diagram
*/
- void slotAutotqlayout();
+ void slotAutolayout();
/**
* Changes the statusbar contents for the standard label
@@ -959,7 +959,7 @@ private:
KAction* deleteSelectedWidget;
KAction* deleteDiagram;
#ifdef HAVE_DOT
- KAction* autotqlayout;
+ KAction* autolayout;
#endif
KAction* changeTabLeft;