[kgraphviewer-devel] [KGraphViewer] 5e6b543: Introduce KGraphViz namespace

Kevin Funk krf at electrostorm.net
Fri Dec 10 21:42:32 CET 2010


commit 5e6b543d2900d55f8a2f400064fd4fcfaf491c03
branch libkgraphviz
Author: Kevin Funk <krf at electrostorm.net>
Date:   Fri Dec 10 21:20:38 2010 +0100

    Introduce KGraphViz namespace

diff --git a/src/kgrapheditor.cpp b/src/kgrapheditor.cpp
index e3d3251..40e2ff1 100644
--- a/src/kgrapheditor.cpp
+++ b/src/kgrapheditor.cpp
@@ -57,6 +57,7 @@
 #include <iostream>
 
 using namespace KGraphViewer;
+using namespace KGraphViz;
 
 KGraphEditor::KGraphEditor() :
     KXmlGuiWindow(), 
@@ -162,7 +163,7 @@ void KGraphEditor::reloadPreviousFiles()
   
 }
 
-DotGraphView*  KGraphEditor::slotNewGraph()
+DotGraphView* KGraphEditor::slotNewGraph()
 {
   kDebug();
   DotGraphView* view = new DotGraphView(actionCollection(), m_widget);
diff --git a/src/kgrapheditor.h b/src/kgrapheditor.h
index 9a745d8..f083913 100644
--- a/src/kgrapheditor.h
+++ b/src/kgrapheditor.h
@@ -34,11 +34,12 @@ class KToggleAction;
 class KGraphEditorNodesTreeWidget;
 class KGraphEditorElementTreeWidget;
 
-namespace KGraphViewer
+namespace KGraphViz
 {
-  class DotGraphView;
+class DotGraphView;
 }
-  /**
+
+/**
  * This is the application "Shell".  It has a menubar, toolbar, and
  * statusbar but relies on the "Part" to do all the real work.
  *
@@ -70,7 +71,7 @@ protected:
   bool queryExit(); 
 
 Q_SIGNALS:
-  void hide(KGraphViewer::DotGraphView* part);
+  void hide(KGraphViz::DotGraphView* part);
   void prepareAddNewElement(QMap<QString,QString> attribs);
   void prepareAddNewEdge(QMap<QString,QString> attribs);
   void setReadWrite();
@@ -92,7 +93,7 @@ public Q_SLOTS:
     */
   void openUrl(const QString& url) {openUrl(KUrl(url));}
 
-  void slotSetActiveGraph( KGraphViewer::DotGraphView* part);
+  void slotSetActiveGraph( KGraphViz::DotGraphView* part);
 
   void slotGraphLoaded();
   
@@ -141,7 +142,7 @@ private Q_SLOTS:
   void slotHoverEnter(const QString&);
   void slotHoverLeave(const QString&);
 
-  KGraphViewer::DotGraphView* slotNewGraph();
+  KGraphViz::DotGraphView* slotNewGraph();
   
 private:
   void setupAccel();
@@ -158,9 +159,9 @@ private:
 
   QStringList m_openedFiles;
   
-  QMap<QWidget*, KGraphViewer::DotGraphView*> m_tabsPartsMap;
+  QMap<QWidget*, KGraphViz::DotGraphView*> m_tabsPartsMap;
   QMap<QWidget*, QString> m_tabsFilesMap;
-  KGraphViewer::DotGraphView* m_currentPart;
+  KGraphViz::DotGraphView* m_currentPart;
 
   QMap<QString, QString> m_newElementAttributes;
 
diff --git a/src/kgrapheditormain.cpp b/src/kgrapheditormain.cpp
index bdaee9d..a4a4f11 100644
--- a/src/kgrapheditormain.cpp
+++ b/src/kgrapheditormain.cpp
@@ -34,8 +34,6 @@
 
 #include "kgrapheditoradaptor.h"
 
-using namespace KGraphViewer;
-
 static const char description[] =
 I18N_NOOP("A Graphviz dot graph viewer for KDE");
 
diff --git a/src/kgraphviz/canvasedge.cpp b/src/kgraphviz/canvasedge.cpp
index 1104b9b..bded6e2 100644
--- a/src/kgraphviz/canvasedge.cpp
+++ b/src/kgraphviz/canvasedge.cpp
@@ -44,12 +44,7 @@
 #include <math.h>
 #include <iostream>
 
-//
-// CanvasEdge
-//
-
-namespace KGraphViewer
-{
+using namespace KGraphViz;
 
 CanvasEdge::CanvasEdge(DotGraphView* view,
                        GraphEdge* e,
@@ -588,6 +583,4 @@ void CanvasEdge::hoverLeaveEvent( QGraphicsSceneHoverEvent * event )
   emit hoverLeave(this);
 }
 
-}
-
 #include "canvasedge.moc"
diff --git a/src/kgraphviz/canvasedge.h b/src/kgraphviz/canvasedge.h
index f2e4b70..f4f0afe 100644
--- a/src/kgraphviz/canvasedge.h
+++ b/src/kgraphviz/canvasedge.h
@@ -43,7 +43,7 @@ class QMenu;
  * - CanvasEdgeLabel  (Label for edges)
  * - CanvasEdgeArrow  (Arrows at the end of the edge spline)
  */
-namespace KGraphViewer
+namespace KGraphViz
 {
 
 class CanvasNode;
diff --git a/src/kgraphviz/canvaselement.cpp b/src/kgraphviz/canvaselement.cpp
index f5aa2c7..fed0af5 100644
--- a/src/kgraphviz/canvaselement.cpp
+++ b/src/kgraphviz/canvaselement.cpp
@@ -37,10 +37,8 @@
 #include <klocale.h>
 #include <KAction>
 
-namespace KGraphViewer
-{
-  
-  
+using namespace KGraphViz;
+
 CanvasElement::CanvasElement(
                               DotGraphView* v,
                               GraphElement* gelement,
@@ -570,6 +568,4 @@ void CanvasElement::hoverLeaveEvent( QGraphicsSceneHoverEvent * event )
   emit hoverLeave(this);
 }
 
-}
-
 #include "canvaselement.moc"
diff --git a/src/kgraphviz/canvaselement.h b/src/kgraphviz/canvaselement.h
index b0205f2..59df361 100644
--- a/src/kgraphviz/canvaselement.h
+++ b/src/kgraphviz/canvaselement.h
@@ -30,9 +30,9 @@
 class QMenu;
 class QGraphicsScene;
 
-
-namespace KGraphViewer
+namespace KGraphViz
 {
+
 class GraphElement;
 class DotGraphView;
 
diff --git a/src/kgraphviz/canvasnode.cpp b/src/kgraphviz/canvasnode.cpp
index c84e518..7c897d9 100644
--- a/src/kgraphviz/canvasnode.cpp
+++ b/src/kgraphviz/canvasnode.cpp
@@ -49,7 +49,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
 CanvasNode::CanvasNode(DotGraphView* v,
diff --git a/src/kgraphviz/canvasnode.h b/src/kgraphviz/canvasnode.h
index fdb8436..a27643d 100644
--- a/src/kgraphviz/canvasnode.h
+++ b/src/kgraphviz/canvasnode.h
@@ -33,7 +33,7 @@
 
 #include "canvaselement.h"
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
 class GraphNode;
diff --git a/src/kgraphviz/canvassubgraph.cpp b/src/kgraphviz/canvassubgraph.cpp
index a0ea4b4..f5ed540 100644
--- a/src/kgraphviz/canvassubgraph.cpp
+++ b/src/kgraphviz/canvassubgraph.cpp
@@ -19,7 +19,7 @@
 
 #include "canvassubgraph.h"
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
   
diff --git a/src/kgraphviz/canvassubgraph.h b/src/kgraphviz/canvassubgraph.h
index 868a516..b5b6027 100644
--- a/src/kgraphviz/canvassubgraph.h
+++ b/src/kgraphviz/canvassubgraph.h
@@ -27,7 +27,7 @@
 
 class QGraphicsScene;
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
 class GraphSubgraph;
diff --git a/src/kgraphviz/dotgraph.cpp b/src/kgraphviz/dotgraph.cpp
index 4d7bf01..c8f1b8b 100644
--- a/src/kgraphviz/dotgraph.cpp
+++ b/src/kgraphviz/dotgraph.cpp
@@ -50,10 +50,9 @@
 using namespace boost;
 using namespace boost::spirit::classic;
 
-extern KGraphViewer::DotGraphParsingHelper* phelper;
+extern KGraphViz::DotGraphParsingHelper* phelper;
 
-
-namespace KGraphViewer
+namespace KGraphViz
 {
 
 const distinct_parser<> keyword_p("0-9a-zA-Z_");
diff --git a/src/kgraphviz/dotgraph.h b/src/kgraphviz/dotgraph.h
index 571b22d..02a35e6 100644
--- a/src/kgraphviz/dotgraph.h
+++ b/src/kgraphviz/dotgraph.h
@@ -38,7 +38,7 @@
 
 class Agraph_t;
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
 /**
diff --git a/src/kgraphviz/dotgraphview.cpp b/src/kgraphviz/dotgraphview.cpp
index 4f25fa4..b523ca5 100644
--- a/src/kgraphviz/dotgraphview.cpp
+++ b/src/kgraphviz/dotgraphview.cpp
@@ -84,11 +84,10 @@
 #include <kactionmenu.h>
 
 // DotGraphView defaults
-
 #define DEFAULT_ZOOMPOS      KGraphViewerInterface::Auto
 #define KGV_MAX_PANNER_NODES 100
 
-namespace KGraphViewer
+namespace KGraphViz
 {
 
 class DotGraphViewPrivate
diff --git a/src/kgraphviz/dotgraphview.h b/src/kgraphviz/dotgraphview.h
index dafd20d..a05b1f8 100644
--- a/src/kgraphviz/dotgraphview.h
+++ b/src/kgraphviz/dotgraphview.h
@@ -57,7 +57,9 @@ class QWheelEvent;
 class QContextMenuEvent;
 class QWidget;
 
-namespace KGraphViewer
+using namespace KGraphViewer;
+
+namespace KGraphViz
 {
 
 class GraphElement;
diff --git a/src/kgraphviz/graphedge.cpp b/src/kgraphviz/graphedge.cpp
index 18e3862..aeec168 100644
--- a/src/kgraphviz/graphedge.cpp
+++ b/src/kgraphviz/graphedge.cpp
@@ -35,7 +35,7 @@
 
 #include <KDebug>
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
 /*
diff --git a/src/kgraphviz/graphedge.h b/src/kgraphviz/graphedge.h
index 67d27f1..b5c896f 100644
--- a/src/kgraphviz/graphedge.h
+++ b/src/kgraphviz/graphedge.h
@@ -42,7 +42,7 @@
 
 class Agedge_t;
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
 class CanvasEdge;
diff --git a/src/kgraphviz/graphelement.cpp b/src/kgraphviz/graphelement.cpp
index d3899d8..9e24ca1 100644
--- a/src/kgraphviz/graphelement.cpp
+++ b/src/kgraphviz/graphelement.cpp
@@ -27,7 +27,7 @@
 #include <QRegExp>
 #include <graphviz/gvc.h>
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
 GraphElement::GraphElement() :
diff --git a/src/kgraphviz/graphelement.h b/src/kgraphviz/graphelement.h
index 8703325..c78d134 100644
--- a/src/kgraphviz/graphelement.h
+++ b/src/kgraphviz/graphelement.h
@@ -27,7 +27,7 @@
 #include <QMap>
 #include <QtCore/QTextStream>
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
 class CanvasElement;
diff --git a/src/kgraphviz/graphexporter.cpp b/src/kgraphviz/graphexporter.cpp
index 4192bf1..4e79eb3 100644
--- a/src/kgraphviz/graphexporter.cpp
+++ b/src/kgraphviz/graphexporter.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <ktemporaryfile.h>
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
 GraphExporter::GraphExporter()
diff --git a/src/kgraphviz/graphexporter.h b/src/kgraphviz/graphexporter.h
index f6b223e..4623849 100644
--- a/src/kgraphviz/graphexporter.h
+++ b/src/kgraphviz/graphexporter.h
@@ -37,7 +37,7 @@ class Agraph_t;
 
 class KTemporaryFile;
 
-namespace KGraphViewer
+namespace KGraphViz
 {
 class DotGraph;
   
diff --git a/src/kgraphviz/graphnode.cpp b/src/kgraphviz/graphnode.cpp
index 883474d..377b0cb 100644
--- a/src/kgraphviz/graphnode.cpp
+++ b/src/kgraphviz/graphnode.cpp
@@ -41,7 +41,7 @@
 
 #include <kdebug.h>
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
 //
diff --git a/src/kgraphviz/graphnode.h b/src/kgraphviz/graphnode.h
index 2758c78..7b6150a 100644
--- a/src/kgraphviz/graphnode.h
+++ b/src/kgraphviz/graphnode.h
@@ -43,7 +43,7 @@
 
 class Agnode_t;
 
-namespace KGraphViewer
+namespace KGraphViz
 {
 
 class CanvasElement;
diff --git a/src/kgraphviz/graphsubgraph.cpp b/src/kgraphviz/graphsubgraph.cpp
index 44b115f..a19122b 100644
--- a/src/kgraphviz/graphsubgraph.cpp
+++ b/src/kgraphviz/graphsubgraph.cpp
@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 
-namespace KGraphViewer
+namespace KGraphViz
 {
   
 //
diff --git a/src/kgraphviz/graphsubgraph.h b/src/kgraphviz/graphsubgraph.h
index 2606579..02dfaf2 100644
--- a/src/kgraphviz/graphsubgraph.h
+++ b/src/kgraphviz/graphsubgraph.h
@@ -31,7 +31,7 @@
 
 class Agraph_t;
 
-namespace KGraphViewer
+namespace KGraphViz
 {
 
 class CanvasSubgraph;
diff --git a/src/kgraphviz/pannerview.cpp b/src/kgraphviz/pannerview.cpp
index de7b1a2..8ce812e 100644
--- a/src/kgraphviz/pannerview.cpp
+++ b/src/kgraphviz/pannerview.cpp
@@ -44,7 +44,7 @@
 
 #include "dotgraphview.h"
 
-namespace KGraphViewer
+namespace KGraphViz
 {
 //
 // PannerView
diff --git a/src/kgraphviz/pannerview.h b/src/kgraphviz/pannerview.h
index c55a703..e2fc7c2 100644
--- a/src/kgraphviz/pannerview.h
+++ b/src/kgraphviz/pannerview.h
@@ -37,7 +37,7 @@
 //Added by qt3to4:
 #include <QMouseEvent>
 
-namespace KGraphViewer
+namespace KGraphViz
 {
 
 class DotGraphView;
diff --git a/src/kgraphviz/support/dotgrammar.cpp b/src/kgraphviz/support/dotgrammar.cpp
index f5965ea..5c7b0f5 100644
--- a/src/kgraphviz/support/dotgrammar.cpp
+++ b/src/kgraphviz/support/dotgrammar.cpp
@@ -45,7 +45,7 @@ using namespace std;
 using namespace boost;
 using namespace boost::spirit::classic;
 
-using namespace KGraphViewer;
+using namespace KGraphViz;
 
 #define KGV_MAX_ITEMS_TO_LOAD std::numeric_limits<size_t>::max()
 #define BOOST_SPIRIT_DEBUG 1
diff --git a/src/kgraphviz/support/dotgraphparsinghelper.cpp b/src/kgraphviz/support/dotgraphparsinghelper.cpp
index dfb4e7f..79732e5 100644
--- a/src/kgraphviz/support/dotgraphparsinghelper.cpp
+++ b/src/kgraphviz/support/dotgraphparsinghelper.cpp
@@ -31,12 +31,12 @@
 
 #include <QUuid>
 
-extern KGraphViewer::DotGraphParsingHelper* phelper;
+#define KGV_MAX_ITEMS_TO_LOAD std::numeric_limits<int>::max()
 
-namespace KGraphViewer
-{
+extern KGraphViz::DotGraphParsingHelper* phelper;
 
-#define KGV_MAX_ITEMS_TO_LOAD std::numeric_limits<int>::max()
+namespace KGraphViz
+{
 
 DotGraphParsingHelper::DotGraphParsingHelper():
   attrid(),
diff --git a/src/kgraphviz/support/dotgraphparsinghelper.h b/src/kgraphviz/support/dotgraphparsinghelper.h
index 6c1904f..6bb2915 100644
--- a/src/kgraphviz/support/dotgraphparsinghelper.h
+++ b/src/kgraphviz/support/dotgraphparsinghelper.h
@@ -23,7 +23,7 @@
 #include <list>
 #include <string>
 
-namespace KGraphViewer
+namespace KGraphViz
 {
 
 class DotGraph;
diff --git a/src/part/kgraphviewer_part.cpp b/src/part/kgraphviewer_part.cpp
index 7c12f38..3f66c7b 100644
--- a/src/part/kgraphviewer_part.cpp
+++ b/src/part/kgraphviewer_part.cpp
@@ -57,7 +57,7 @@ public:
     delete m_watch;
   }
   
-  DotGraphView *m_widget;
+  KGraphViz::DotGraphView *m_widget;
   KDirWatch* m_watch;
   KGraphViewerPart::LayoutMethod m_layoutMethod;
   
@@ -71,7 +71,7 @@ KGraphViewerPart::KGraphViewerPart( QWidget *parentWidget, QObject *parent)
   setComponentData( KGraphViewerPartFactory::componentData() );
 
   // this should be your custom internal widget
-  d->m_widget = new DotGraphView( actionCollection(), parentWidget);
+  d->m_widget = new KGraphViz::DotGraphView( actionCollection(), parentWidget);
   d->m_widget->initEmpty();
   d->m_widget->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
   connect( d->m_widget, SIGNAL( graphLoaded() ),
diff --git a/src/part/simpleprintingcommand.cpp b/src/part/simpleprintingcommand.cpp
index 5c89ecc..c1a6c34 100644
--- a/src/part/simpleprintingcommand.cpp
+++ b/src/part/simpleprintingcommand.cpp
@@ -34,6 +34,8 @@
 // #include <kexiutils/utils.h>
 // #include <kexi_version.h>
 
+#include <kgraphviz/dotgraphview.h>
+
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
@@ -63,16 +65,19 @@
 
 namespace KGraphViewer
 {
+
 KGVSimplePrintingCommand::KGVSimplePrintingCommand(
-  DotGraphView* mainWin, int objectId, QObject* parent)
- : QObject(parent, "KGVSimplePrintCommand")
- , m_previewEngine(0)
- , m_graphView(mainWin)
- , m_objectId(objectId)
- , m_settings(new KGVSimplePrintingSettings(KGVSimplePrintingSettings::load()))
- , m_previewWindow(0)
- , m_printPreviewNeedsReloading(true)
- , m_pageSetupDialog(0)
+  KGraphViz::DotGraphView* mainWin,
+  int objectId,
+  QObject* parent)
+  : QObject(parent, "KGVSimplePrintCommand")
+  , m_previewEngine(0)
+  , m_graphView(mainWin)
+  , m_objectId(objectId)
+  , m_settings(new KGVSimplePrintingSettings(KGVSimplePrintingSettings::load()))
+  , m_previewWindow(0)
+  , m_printPreviewNeedsReloading(true)
+  , m_pageSetupDialog(0)
 {
   connect(this, SIGNAL(showPageSetupRequested()), 
     this, SLOT(slotShowPageSetupRequested()));
diff --git a/src/part/simpleprintingcommand.h b/src/part/simpleprintingcommand.h
index a764f5e..2f61892 100644
--- a/src/part/simpleprintingcommand.h
+++ b/src/part/simpleprintingcommand.h
@@ -30,13 +30,18 @@
 
 #include "simpleprintingengine.h"
 
-#include <kgraphviz/dotgraphview.h>
-
 #include <kgraphviewer_part.h>
 
+namespace KGraphViz
+{
+class DotGraphView;
+}
+
 namespace KGraphViewer
 {
 class KGVSimplePrintPreviewWindow;
+class KGVSimplePrintingEngine;
+class KGVSimplePrintingSettings;
 
 /*! @short A command for simple printing and print preview. 
  This class is instantiated in KGVMainWindowImpl so there's:
@@ -48,10 +53,10 @@ class KGVSimplePrintPreviewWindow;
 */
 class KGVSimplePrintingCommand : public QObject
 {
-Q_OBJECT
+  Q_OBJECT
 
 public:
-  KGVSimplePrintingCommand(DotGraphView* mainWin, int objectId, 
+  KGVSimplePrintingCommand(KGraphViz::DotGraphView* mainWin, int objectId, 
       QObject* parent = 0);
   ~KGVSimplePrintingCommand();
 
@@ -76,7 +81,7 @@ protected:
   bool init(const QString& aTitleText = QString());
 
   KGVSimplePrintingEngine* m_previewEngine;
-  DotGraphView* m_graphView;
+  KGraphViz::DotGraphView* m_graphView;
   int m_objectId;
   KGVSimplePrintingSettings* m_settings;
   KGVSimplePrintPreviewWindow *m_previewWindow;
diff --git a/src/part/simpleprintingengine.cpp b/src/part/simpleprintingengine.cpp
index 24a0ae1..5684759 100644
--- a/src/part/simpleprintingengine.cpp
+++ b/src/part/simpleprintingengine.cpp
@@ -65,7 +65,9 @@ KGVSimplePrintingEngine::~KGVSimplePrintingEngine()
   done();
 }
 
-bool KGVSimplePrintingEngine::init(DotGraphView& data, const QString& titleText, QString& errorMessage)
+bool KGVSimplePrintingEngine::init(KGraphViz::DotGraphView& data,
+                                   const QString& titleText,
+                                   QString& errorMessage)
 {
 	errorMessage.clear();
 	done();
diff --git a/src/part/simpleprintingengine.h b/src/part/simpleprintingengine.h
index 44d3f6a..4b8d956 100644
--- a/src/part/simpleprintingengine.h
+++ b/src/part/simpleprintingengine.h
@@ -39,6 +39,8 @@ class QPaintDevice;
 
 #include <kgraphviz/dotgraphview.h>
 
+
+
 namespace KGraphViewer
 {
 class KGVSimplePrintingSettings;
@@ -53,7 +55,7 @@ public:
   KGVSimplePrintingEngine( KGVSimplePrintingSettings* settings, QObject* parent );
   ~KGVSimplePrintingEngine();
 
-  bool init(DotGraphView& data,
+  bool init(KGraphViz::DotGraphView& data,
     const QString& titleText, QString& errorMessage);
 
   void setTitleText(const QString& titleText);
@@ -75,7 +77,7 @@ public:
   uint maxHorizFit() const;
   uint maxVertFit() const;
 
-	inline DotGraphView* data() {return m_data;}
+  inline KGraphViz::DotGraphView* data() {return m_data;}
 
 
 public slots:
@@ -92,7 +94,7 @@ protected:
   int m_dpiX, m_dpiY;
   uint m_pageWidth, m_pageHeight;
   //QFontMetrics m_headerFM, m_mainFM;
-  DotGraphView* m_data;
+  KGraphViz::DotGraphView* m_data;
   QString m_headerText;
   QString m_dateTimeText;
   uint m_dateTimeWidth;
diff --git a/src/part/simpleprintingpagesetup.cpp b/src/part/simpleprintingpagesetup.cpp
index cb27453..23505cc 100644
--- a/src/part/simpleprintingpagesetup.cpp
+++ b/src/part/simpleprintingpagesetup.cpp
@@ -66,7 +66,7 @@ namespace KGraphViewer
   
 
 KGVSimplePrintingPageSetup::KGVSimplePrintingPageSetup(
-    KGVSimplePrintingCommand* command, DotGraphView *mainWin, QWidget *parent, 
+    KGVSimplePrintingCommand* command, KGraphViz::DotGraphView *mainWin, QWidget *parent, 
 	  QMap<QString,QString>* args )
 	: QWidget( parent, "KGVSimplePrintingPageSetup" )
 	, m_settings( command->engine()->settings() )
diff --git a/src/part/simpleprintingpagesetup.h b/src/part/simpleprintingpagesetup.h
index b7f5f1b..c0d5209 100644
--- a/src/part/simpleprintingpagesetup.h
+++ b/src/part/simpleprintingpagesetup.h
@@ -32,13 +32,16 @@
 
 #include <QButtonGroup>
 
-namespace Ui {
+namespace KGraphViz
+{
+class DotGraphView;
+}
+namespace Ui
+{
   class KGVSimplePrintingPageSetupBase;
 }
 namespace KGraphViewer
 {
-
-class DotGraphView;
 class KGVSimplePrintingCommand;
 class KgvPageLayoutSize;
 
@@ -48,9 +51,11 @@ class KGVSimplePrintingPageSetup : public QWidget
 	Q_OBJECT
 
 	public:
-		KGVSimplePrintingPageSetup(KGVSimplePrintingCommand* command, 
-      DotGraphView *mainWin, QWidget *parent, QMap<QString,QString>* args );
-		~KGVSimplePrintingPageSetup();
+      KGVSimplePrintingPageSetup(KGVSimplePrintingCommand* command, 
+                                   KGraphViz::DotGraphView *mainWin,
+                                   QWidget *parent,
+                                   QMap<QString,QString>* args);
+      ~KGVSimplePrintingPageSetup();
 
 	public slots:
 		void slotPrint();
@@ -90,7 +95,7 @@ class KGVSimplePrintingPageSetup : public QWidget
 		KgvUnit::Unit m_unit;
 		Ui::KGVSimplePrintingPageSetupBase *m_contents;
 		KgvPageLayoutSize *m_pageLayoutWidget;
-		DotGraphView *m_graphView;
+		KGraphViz::DotGraphView *m_graphView;
 		KGVSimplePrintingCommand *m_command;
 		bool m_printPreviewNeedsReloading : 1;
   


More information about the kgraphviewer-devel mailing list