summaryrefslogtreecommitdiffstats
path: root/umbrello/umbrello/autolayout
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commit9150603ad32928e9c514c0492a8518b742d82ac3 (patch)
tree6e3f83e2b94146bb42eed57eb6dd8f2fb0369e6f /umbrello/umbrello/autolayout
parent6b126a99d5eecef5cb96589ed5c2e522bcb06ca9 (diff)
downloadtdesdk-9150603ad32928e9c514c0492a8518b742d82ac3.tar.gz
tdesdk-9150603ad32928e9c514c0492a8518b742d82ac3.zip
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'umbrello/umbrello/autolayout')
-rw-r--r--umbrello/umbrello/autolayout/autolayout.h12
-rw-r--r--umbrello/umbrello/autolayout/autolayoutdlg.cpp56
-rw-r--r--umbrello/umbrello/autolayout/autolayoutdlg.h8
-rw-r--r--umbrello/umbrello/autolayout/autolayouter.cpp4
-rw-r--r--umbrello/umbrello/autolayout/autolayouter.h4
-rw-r--r--umbrello/umbrello/autolayout/autolayouteradapter.cpp40
-rw-r--r--umbrello/umbrello/autolayout/autolayouteradapter.h8
-rw-r--r--umbrello/umbrello/autolayout/dotautolayouter.cpp10
-rw-r--r--umbrello/umbrello/autolayout/dotautolayouter.h8
-rw-r--r--umbrello/umbrello/autolayout/graphvizautolayouter.cpp18
-rw-r--r--umbrello/umbrello/autolayout/graphvizautolayouter.h8
-rw-r--r--umbrello/umbrello/autolayout/graphvizgraph.h2
-rw-r--r--umbrello/umbrello/autolayout/newautolayoutdialog.ui2
13 files changed, 90 insertions, 90 deletions
diff --git a/umbrello/umbrello/autolayout/autolayout.h b/umbrello/umbrello/autolayout/autolayout.h
index fecb2c6f..9f34a1d8 100644
--- a/umbrello/umbrello/autolayout/autolayout.h
+++ b/umbrello/umbrello/autolayout/autolayout.h
@@ -31,12 +31,12 @@
-#include "autotqlayouter.h"
-#include "autotqlayouteradapter.h"
-#include "graphvizautotqlayouter.h"
-#include "dotautotqlayouter.h"
-#include "circoautotqlayouter.h"
-#include "neatoautotqlayouter.h"
+#include "autolayouter.h"
+#include "autolayouteradapter.h"
+#include "graphvizautolayouter.h"
+#include "dotautolayouter.h"
+#include "circoautolayouter.h"
+#include "neatoautolayouter.h"
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index 61bf16b6..7df110fb 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -9,18 +9,18 @@
* *
***************************************************************************/
-#include "autotqlayoutdlg.h"
+#include "autolayoutdlg.h"
#include "../associationwidget.h"
#include "../umlwidget.h"
#include "autotqlayout.h"
-#include "newautotqlayoutdialog.h"
+#include "newautolayoutdialog.h"
#include <tqcheckbox.h>
#include <tqspinbox.h>
#include <tqslider.h>
#include <kdebug.h>
-AutotqlayoutDlg::AutotqlayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const char *name)
+AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const char *name)
:MyDialog1(tqparent, name)
{
view=v;
@@ -28,81 +28,81 @@ AutotqlayoutDlg::AutotqlayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const
config=c;
}
-void AutotqlayoutDlg::slotSetAssociationWeight(int i)
+void AutolayoutDlg::slotSetAssociationWeight(int i)
{
associationWeight=i;
}
-void AutotqlayoutDlg::slotSetDependenciesWeight(int i)
+void AutolayoutDlg::slotSetDependenciesWeight(int i)
{
dependenciesWeight=i;
}
-void AutotqlayoutDlg::slotSetGeneralizationWeight(int i)
+void AutolayoutDlg::slotSetGeneralizationWeight(int i)
{
generalizationWeight=i;
}
-void AutotqlayoutDlg::slotSetGenralizationAsEdges(bool b)
+void AutolayoutDlg::slotSetGenralizationAsEdges(bool b)
{
genralizationAsEdges=b;
}
-void AutotqlayoutDlg::slotSetDependenciesAsEdges(bool b)
+void AutolayoutDlg::slotSetDependenciesAsEdges(bool b)
{
dependenciesAsEdges=b;
}
-void AutotqlayoutDlg::slotSetAssociationAsEdges(bool b)
+void AutolayoutDlg::slotSetAssociationAsEdges(bool b)
{
associationAsEdges=b;
}
-void AutotqlayoutDlg::slotSetCompressShapes(bool b)
+void AutolayoutDlg::slotSetCompressShapes(bool b)
{
compressShapes=b;
}
-void AutotqlayoutDlg::slotSetCenterDiagram(bool b)
+void AutolayoutDlg::slotSetCenterDiagram(bool b)
{
centerDiagram=b;
}
-void AutotqlayoutDlg::slotSetClusterizeHierarchies(bool b)
+void AutolayoutDlg::slotSetClusterizeHierarchies(bool b)
{
clusterizeHierarchies=b;
}
-void AutotqlayoutDlg::slotSetShapeSeparation(int i)
+void AutolayoutDlg::slotSetShapeSeparation(int i)
{
tqshapeSeparation=i;
}
-void AutotqlayoutDlg::slotReloadSettings()
+void AutolayoutDlg::slotReloadSettings()
{
readConfig(config);
}
-void AutotqlayoutDlg::slotSaveSettings()
+void AutolayoutDlg::slotSaveSettings()
{
writeConfig(config);
}
-void AutotqlayoutDlg::slotDoAutotqlayout()
+void AutolayoutDlg::slotDoAutotqlayout()
{
- Autotqlayout::Autotqlayouter* a=getAutotqlayouter();;
+ Autotqlayout::Autolayouter* a=getAutolayouter();;
a->setAssociationAsEdges( associationAsEdges);
a->setAssociationWeight( associationWeight );
@@ -122,9 +122,9 @@ void AutotqlayoutDlg::slotDoAutotqlayout()
accept();
}
-void AutotqlayoutDlg::readConfig( KConfig * conf)
+void AutolayoutDlg::readConfig( KConfig * conf)
{
- conf->setGroup("AutotqlayoutDlg");
+ conf->setGroup("AutolayoutDlg");
associationEdgesCB->setChecked((bool)(conf->readBoolEntry( "associationAsEdges",false)));
centerDiagramCB->setChecked((bool)(conf->readBoolEntry( "centerDiagram",true)));
dependenciesEdgesCB->setChecked((bool)(conf->readBoolEntry( "dependenciesAsEdges",false)));
@@ -138,10 +138,10 @@ void AutotqlayoutDlg::readConfig( KConfig * conf)
algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0)));
}
-void AutotqlayoutDlg::writeConfig( KConfig * conf)
+void AutolayoutDlg::writeConfig( KConfig * conf)
{
// conf=kapp->config();
- conf->setGroup("AutotqlayoutDlg");
+ conf->setGroup("AutolayoutDlg");
conf->writeEntry( "associationAsEdges",associationEdgesCB->isChecked());
conf->writeEntry( "centerDiagram", centerDiagramCB->isChecked());
conf->writeEntry("dependenciesAsEdges",dependenciesEdgesCB->isChecked());
@@ -159,26 +159,26 @@ void AutotqlayoutDlg::writeConfig( KConfig * conf)
}
-void AutotqlayoutDlg::slotSelectAlgorithm( const TQString& _algname)
+void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname)
{
algname=_algname;
}
-Autotqlayout::Autotqlayouter * AutotqlayoutDlg::getAutotqlayouter( )
+Autotqlayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
{
const TQString text = algorithmCOB->currentText();
kDebug() << "Autotqlayout Algorithm " << algname << " found " << text << endl;
if (text == "dot")
- return new Autotqlayout::DotAutotqlayouter();
+ return new Autotqlayout::DotAutolayouter();
if (text == "circo")
- return new Autotqlayout::CircoAutotqlayouter();
+ return new Autotqlayout::CircoAutolayouter();
if (text == "neato")
- return new Autotqlayout::NeatoAutotqlayouter();
+ return new Autotqlayout::NeatoAutolayouter();
kError() << "Autotqlayout Algorithm not found" << endl;
- return new Autotqlayout::DotAutotqlayouter();
+ return new Autotqlayout::DotAutolayouter();
}
-#include "autotqlayoutdlg.moc"
+#include "autolayoutdlg.moc"
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index a664a7b7..ece6fc5f 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -12,18 +12,18 @@
#ifndef AUTOLAYOUTDLG_H
#define AUTOLAYOUTDLG_H
-#include "newautotqlayoutdialog.h"
+#include "newautolayoutdialog.h"
#include "../umlview.h"
#include <tqobject.h>
#include <kconfig.h>
#include "autotqlayout.h"
-class AutotqlayoutDlg : public MyDialog1
+class AutolayoutDlg : public MyDialog1
{
Q_OBJECT
TQ_OBJECT
public:
- AutotqlayoutDlg(KConfig* c,UMLView* v, TQWidget *tqparent = 0, const char *name = 0);
+ AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *tqparent = 0, const char *name = 0);
public slots:
virtual void slotSetAssociationWeight(int i);
virtual void slotSetDependenciesWeight(int i);
@@ -57,7 +57,7 @@ class AutotqlayoutDlg : public MyDialog1
int tqshapeSeparation;
KConfig* config;
TQString algname;
- Autotqlayout::Autotqlayouter* getAutotqlayouter();
+ Autotqlayout::Autolayouter* getAutolayouter();
};
diff --git a/umbrello/umbrello/autolayout/autolayouter.cpp b/umbrello/umbrello/autolayout/autolayouter.cpp
index caf852b7..802bc438 100644
--- a/umbrello/umbrello/autolayout/autolayouter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouter.cpp
@@ -11,13 +11,13 @@
* (at your option) any later version. *
* *
***************************************************************************/
-#include "autotqlayouter.h"
+#include "autolayouter.h"
namespace Autotqlayout {
-void Autotqlayouter::autotqlayout( UMLView * v )
+void Autolayouter::autotqlayout( UMLView * v )
{
setCanvas(v);
setGraph(v);
diff --git a/umbrello/umbrello/autolayout/autolayouter.h b/umbrello/umbrello/autolayout/autolayouter.h
index 40a24235..5d4645f9 100644
--- a/umbrello/umbrello/autolayout/autolayouter.h
+++ b/umbrello/umbrello/autolayout/autolayouter.h
@@ -21,9 +21,9 @@ This is the super class of any class which encapsulate an autotqlayout algorithm
@author Dimitri Ognibene <ognibened @yahoo.it>
*/
-class Autotqlayouter {
+class Autolayouter {
public:
- virtual ~Autotqlayouter() {}
+ virtual ~Autolayouter() {}
virtual void setNoteConnectionWeight(int i)=0;
virtual void setNoteConnectionsAsEdges(bool b)=0;
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
index 0bba19c7..3a245cbc 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
@@ -9,21 +9,21 @@
* *
***************************************************************************/
-#include "autotqlayouteradapter.h"
+#include "autolayouteradapter.h"
namespace Autotqlayout
{
- AutotqlayouterAdapter::AutotqlayouterAdapter()
- : Autotqlayout::Autotqlayouter()
+ AutolayouterAdapter::AutolayouterAdapter()
+ : Autotqlayout::Autolayouter()
{}
- AutotqlayouterAdapter::~AutotqlayouterAdapter()
+ AutolayouterAdapter::~AutolayouterAdapter()
{}}
-void Autotqlayout::AutotqlayouterAdapter::addRelationship( AssociationWidget * a )
+void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
{
int weight;
switch (a->getAssocType())
@@ -71,57 +71,57 @@ void Autotqlayout::AutotqlayouterAdapter::addRelationship( AssociationWidget * a
getGraph()->addEdge(a->getWidgetID(Uml::A).c_str(),a->getWidgetID(Uml::B).c_str(),weight);
}
-void Autotqlayout::AutotqlayouterAdapter::setAssociationWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setAssociationWeight( int i )
{
associationWeight=i;
}
-void Autotqlayout::AutotqlayouterAdapter::setDependenciesWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setDependenciesWeight( int i )
{
dependenciesWeight=i;
}
-void Autotqlayout::AutotqlayouterAdapter::setGeneralizationWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setGeneralizationWeight( int i )
{
generalizationWeight=i;
}
-void Autotqlayout::AutotqlayouterAdapter::setGeneralizationAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
{
genralizationAsEdges=b;
}
-void Autotqlayout::AutotqlayouterAdapter::setDependenciesAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
{
dependenciesAsEdges=b;
}
-void Autotqlayout::AutotqlayouterAdapter::setAssociationAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
{
associationAsEdges=b;
}
-void Autotqlayout::AutotqlayouterAdapter::setCompressShapes( bool b )
+void Autotqlayout::AutolayouterAdapter::setCompressShapes( bool b )
{
compressShapes=b;
}
-void Autotqlayout::AutotqlayouterAdapter::setCenterDiagram( bool b )
+void Autotqlayout::AutolayouterAdapter::setCenterDiagram( bool b )
{
centerDiagram=b;
}
-void Autotqlayout::AutotqlayouterAdapter::setClusterizeHierarchies( bool b )
+void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
{
clusterizeHierarchies=b;
}
-void Autotqlayout::AutotqlayouterAdapter::setShapeSeparation( int i )
+void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i )
{
tqshapeSeparation=i;
}
-Autotqlayout::Graph * Autotqlayout::AutotqlayouterAdapter::setGraph( UMLView * view )
+Autotqlayout::Graph * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view )
{
if (! view) return 0;
Autotqlayout::Graph * g=getGraph();
@@ -151,7 +151,7 @@ Autotqlayout::Graph * Autotqlayout::AutotqlayouterAdapter::setGraph( UMLView *
return g;
}
-void Autotqlayout::AutotqlayouterAdapter::updateView( UMLView* view )
+void Autotqlayout::AutolayouterAdapter::updateView( UMLView* view )
{
if (! view) return ;
UMLWidgetList list = view->getWidgetList();
@@ -175,17 +175,17 @@ UMLWidgetList list = view->getWidgetList();
}
}
-Autotqlayout::Canvas * Autotqlayout::AutotqlayouterAdapter::setCanvas( UMLView* view )
+Autotqlayout::Canvas * Autotqlayout::AutolayouterAdapter::setCanvas( UMLView* view )
{
return canvas=new Autotqlayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
}
-void Autotqlayout::AutotqlayouterAdapter::setNoteConnectionWeight( int i )
+void Autotqlayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
{
noteConnectionWeight=i;
}
-void Autotqlayout::AutotqlayouterAdapter::setNoteConnectionsAsEdges( bool b )
+void Autotqlayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
{
noteConnectionAsEdges=b;
}
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h
index 0d8e9021..1d05f0d2 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.h
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.h
@@ -13,7 +13,7 @@
#define AUTOLAYOUTAUTOLAYOUTERADAPTER_H
//#include "autotqlayout.h"
#include "baseinclude.h"
-#include "autotqlayouter.h"
+#include "autolayouter.h"
#include "../umlnamespace.h"
@@ -23,12 +23,12 @@ namespace Autotqlayout
/**
@author Dimitri Ognibene <ognibened @yahoo.it>
*/
-class AutotqlayouterAdapter : virtual public Autotqlayout::Autotqlayouter
+class AutolayouterAdapter : virtual public Autotqlayout::Autolayouter
{
public:
- AutotqlayouterAdapter();
+ AutolayouterAdapter();
- virtual ~AutotqlayouterAdapter();
+ virtual ~AutolayouterAdapter();
virtual void setAssociationWeight(int i);
virtual void setDependenciesWeight(int i);
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.cpp b/umbrello/umbrello/autolayout/dotautolayouter.cpp
index 20d5d34c..dea9b554 100644
--- a/umbrello/umbrello/autolayout/dotautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/dotautolayouter.cpp
@@ -11,25 +11,25 @@
* (at your option) any later version. *
* *
***************************************************************************/
-#include "dotautotqlayouter.h"
+#include "dotautolayouter.h"
#include <graphviz/dotprocs.h>
namespace Autotqlayout {
-DotAutotqlayouter::DotAutotqlayouter()
- : Autotqlayout::GraphvizAutotqlayouter()
+DotAutolayouter::DotAutolayouter()
+ : Autotqlayout::GraphvizAutolayouter()
{
}
-DotAutotqlayouter::~DotAutotqlayouter()
+DotAutolayouter::~DotAutolayouter()
{
dot_cleanup(gg->_agraph);
}
-void DotAutotqlayouter::run()
+void DotAutolayouter::run()
{
//#ifndef internal_renderizer
/* bind graph to GV context - currently must be done before tqlayout */
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.h b/umbrello/umbrello/autolayout/dotautolayouter.h
index 1ccb4bcc..4b8af212 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 "graphvizautotqlayouter.h"
+#include "graphvizautolayouter.h"
namespace Autotqlayout {
/**
@author Dimitri Ognibene <ognibened @yahoo.it>
*/
-class DotAutotqlayouter : virtual public Autotqlayout::GraphvizAutotqlayouter
+class DotAutolayouter : virtual public Autotqlayout::GraphvizAutolayouter
{
public:
- DotAutotqlayouter();
+ DotAutolayouter();
- virtual ~DotAutotqlayouter();
+ virtual ~DotAutolayouter();
virtual void run();
diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
index b8fe49d1..da075642 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
@@ -11,42 +11,42 @@
* (at your option) any later version. *
* *
***************************************************************************/
-#include "graphvizautotqlayouter.h"
+#include "graphvizautolayouter.h"
#include <graphviz/graph.h>
namespace Autotqlayout {
-GraphvizAutotqlayouter::GraphvizAutotqlayouter()
- : Autotqlayout::AutotqlayouterAdapter()
+GraphvizAutolayouter::GraphvizAutolayouter()
+ : Autotqlayout::AutolayouterAdapter()
{
gg = new GraphvizGraph();
}
-GraphvizAutotqlayouter::~GraphvizAutotqlayouter()
+GraphvizAutolayouter::~GraphvizAutolayouter()
{
agclose(gg->_agraph);
delete gg;
}
-void GraphvizAutotqlayouter::setCompressShapes( bool b )
+void GraphvizAutolayouter::setCompressShapes( bool b )
{
gg->setCompressShapes(b);
}
-void GraphvizAutotqlayouter::setCenterDiagram( bool b )
+void GraphvizAutolayouter::setCenterDiagram( bool b )
{
gg->setCenterDiagram(b);
}
-void GraphvizAutotqlayouter::setShapeSeparation( int i )
+void GraphvizAutolayouter::setShapeSeparation( int i )
{
gg->setShapeSeparation(i);
}
-Autotqlayout::Canvas * GraphvizAutotqlayouter::setCanvas( UMLView * view )
+Autotqlayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view )
{
- Canvas* canvas= AutotqlayouterAdapter::setCanvas(view);
+ Canvas* canvas= AutolayouterAdapter::setCanvas(view);
gg->setCanvas(canvas);
}
diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.h b/umbrello/umbrello/autolayout/graphvizautolayouter.h
index a2036749..95fa46ba 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.h
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.h
@@ -12,7 +12,7 @@
#ifndef AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H
#define AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H
#include "baseinclude.h"
-#include "autotqlayouteradapter.h"
+#include "autolayouteradapter.h"
#include "graphvizgraph.h"
namespace Autotqlayout
@@ -21,10 +21,10 @@ namespace Autotqlayout
/**
@author Dimitri Ognibene <ognibened @yahoo.it>
*/
-class GraphvizAutotqlayouter : virtual public Autotqlayout::AutotqlayouterAdapter
+class GraphvizAutolayouter : virtual public Autotqlayout::AutolayouterAdapter
{
public:
- GraphvizAutotqlayouter();
+ GraphvizAutolayouter();
virtual void setCompressShapes(bool b);
@@ -35,7 +35,7 @@ public:
virtual Canvas* setCanvas(UMLView* view);
- virtual ~GraphvizAutotqlayouter();
+ virtual ~GraphvizAutolayouter();
protected:
virtual Graph* getGraph(){if (!gg) gg=new GraphvizGraph(); return gg;}
diff --git a/umbrello/umbrello/autolayout/graphvizgraph.h b/umbrello/umbrello/autolayout/graphvizgraph.h
index 96ae6c31..1be57139 100644
--- a/umbrello/umbrello/autolayout/graphvizgraph.h
+++ b/umbrello/umbrello/autolayout/graphvizgraph.h
@@ -50,7 +50,7 @@ public:
std::deque<Node*> nodelist;
GVC_t* gvc;
bool empty_flag;
- friend class GraphvizAutotqlayouter;
+ friend class GraphvizAutolayouter;
};
}
diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
index 459f0e25..9301abe3 100644
--- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui
+++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
@@ -550,5 +550,5 @@
<slot>slotSetShapeSeparation(int i)</slot>
<slot specifier="pure virtual">slotSelectAlgorithm(const QString&amp;)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>