[kgraphviewer-devel] [KGraphViewer/libkgraphviz] de7e1ac: Header cleanup

[Kevin Funk]

commit de7e1acdae75c8ca0c2536cff3742efce4f74b6e
branch libkgraphviz
Author: Kevin Funk <krf at electrostorm.net>
Date:   Wed Dec 15 10:31:13 2010 +0100

    Header cleanup

diff --git a/src/kgraphviz/dotgraph.h b/src/kgraphviz/dotgraph.h
index 962888e..9bcfabf 100644
--- a/src/kgraphviz/dotgraph.h
+++ b/src/kgraphviz/dotgraph.h
@@ -23,11 +23,7 @@
 #ifndef DOT_GRAPH_H
 #define DOT_GRAPH_H
 
-#include <QList>
-#include <QSet>
-#include <QString>
-#include <QProcess>
-#include <QMutex>
+#include <QMap>
 
 #include "graphelement.h"
 #include "graphsubgraph.h"
@@ -62,9 +58,7 @@ public:
   const GraphEdgeMap& edges() const;
   const GraphSubgraphMap& subgraphs() const;
 
-  /** Constant accessor to the nodes of this graph */
   GraphNodeMap& nodes();
-  /** Constant accessor to the edges of this graph */
   GraphEdgeMap& edges();
   GraphSubgraphMap& subgraphs();
 
diff --git a/src/kgraphviz/dotgraphview.cpp b/src/kgraphviz/dotgraphview.cpp
index 1a03668..2337ed8 100644
--- a/src/kgraphviz/dotgraphview.cpp
+++ b/src/kgraphviz/dotgraphview.cpp
@@ -52,8 +52,6 @@
 
 #include <QMatrix>
 #include <QPainter>
-#include <QStyle>
-#include <QImage>
 #include <QContextMenuEvent>
 #include <QKeyEvent>
 #include <QPixmap>
@@ -67,6 +65,7 @@
 #include <QScrollBar>
 #include <QUuid>
 
+#include <kactioncollection.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kfiledialog.h>
@@ -78,7 +77,8 @@
 #include <kactionmenu.h>
 
 // DotGraphView defaults
-#define DEFAULT_ZOOMPOS      KGraphViewerInterface::Auto
+#define DEFAULT_DETAILLEVEL 1
+#define DEFAULT_ZOOMPOS KGraphViewerInterface::Auto
 #define KGV_MAX_PANNER_NODES 100
 
 using namespace KGraphViz;
diff --git a/src/kgraphviz/dotgraphview.h b/src/kgraphviz/dotgraphview.h
index 8fdb1b7..eafda6d 100644
--- a/src/kgraphviz/dotgraphview.h
+++ b/src/kgraphviz/dotgraphview.h
@@ -31,17 +31,12 @@
 
 #include "shared/kgraphviewer_interface.h"
 
-#include <kactioncollection.h>
-
 #include <QGraphicsView>
-#include <QSet>
 
 class Agraph_t;
 
+class KActionCollection;
 class KSelectAction;
-class KToggleAction;
-
-class QMenu;
 
 namespace KGraphViz
 {
@@ -50,11 +45,7 @@ class GraphElement;
 class GraphSubgraph;
 class CanvasElement;
 class CanvasEdge;
-class PannerView;
 class DotGraph;
-class KGVSimplePrintingCommand;
-
-#define DEFAULT_DETAILLEVEL 1
 
 class DotGraphViewPrivate;
 
@@ -209,13 +200,10 @@ protected:
 private Q_SLOTS:
   void slotAGraphReadFinished();
   void slotAGraphLayoutFinished();
-  
-protected:
-  DotGraphViewPrivate * const d_ptr;
 
 private:
   Q_DECLARE_PRIVATE(DotGraphView);
-  
+  DotGraphViewPrivate * const d_ptr;
 };
 
 }
diff --git a/src/kgraphviz/dotgraphview_p.h b/src/kgraphviz/dotgraphview_p.h
index 48fa140..d269790 100644
--- a/src/kgraphviz/dotgraphview_p.h
+++ b/src/kgraphviz/dotgraphview_p.h
@@ -26,9 +26,18 @@
 #include "support/loadagraphthread.h"
 #include "support/layoutagraphthread.h"
 
+#include <QSet>
+
+class QMenu;
+
+class KToggleAction;
+
 namespace KGraphViz
 {
 
+class PannerView;
+class KGVSimplePrintingCommand;
+
 class DotGraphViewPrivate
 {
 
diff --git a/src/kgraphviz/graphelement.h b/src/kgraphviz/graphelement.h
index bcdb1a7..9f4191a 100644
--- a/src/kgraphviz/graphelement.h
+++ b/src/kgraphviz/graphelement.h
@@ -22,7 +22,6 @@
 #include "kgraphviz_export.h"
 #include "support/dotrenderop.h"
 
-#include <QVector>
 #include <QList>
 #include <QMap>
 #include <QtCore/QTextStream>