[kgraphviewer-devel] [KGraphViewer] a58770b: More header cleanup

[Kevin Funk]

commit a58770baa1d24606f8aeb5c0171abf0e1506db12
branch libkgraphviz
Author: Kevin Funk <krf at electrostorm.net>
Date:   Wed Dec 8 11:35:31 2010 +0100

    More header cleanup

diff --git a/src/part/canvasedge.cpp b/src/part/canvasedge.cpp
index c2f9bc3..1d062fa 100644
--- a/src/part/canvasedge.cpp
+++ b/src/part/canvasedge.cpp
@@ -26,6 +26,7 @@
 
 
 #include "canvasedge.h"
+#include "canvaselement.h"
 #include "graphedge.h"
 #include "graphnode.h"
 #include "dotdefaults.h"
@@ -34,6 +35,8 @@
 #include "FontsCache.h"
 
 #include <KAction>
+#include <KDebug>
+#include <KLocale>
 
 #include <QPainter>
 #include <QGraphicsSceneMouseEvent>
diff --git a/src/part/canvaselement.h b/src/part/canvaselement.h
index 40aedb3..d37a208 100644
--- a/src/part/canvaselement.h
+++ b/src/part/canvaselement.h
@@ -27,8 +27,6 @@
 #include <QPen>
 #include <QBrush>
 
-#include "dotgrammar.h"
-
 class QMenu;
 class QGraphicsScene;
 
diff --git a/src/part/canvasnode.h b/src/part/canvasnode.h
index 5b6a3ee..fdb8436 100644
--- a/src/part/canvasnode.h
+++ b/src/part/canvasnode.h
@@ -31,9 +31,6 @@
 #ifndef CANVAS_NODE_H
 #define CANVAS_NODE_H
 
-#include <khtml_part.h>
-#include <khtmlview.h>
-
 #include "canvaselement.h"
 
 namespace KGraphViewer
diff --git a/src/part/dotgraph.cpp b/src/part/dotgraph.cpp
index b21ecd6..b80e957 100644
--- a/src/part/dotgraph.cpp
+++ b/src/part/dotgraph.cpp
@@ -21,6 +21,7 @@
 #include "graphexporter.h"
 #include "DotGraphParsingHelper.h"
 #include "canvasedge.h"
+#include "canvasnode.h"
 #include "canvassubgraph.h"
 
 #include <math.h>
@@ -35,7 +36,8 @@
 
 #include <graphviz/gvc.h>
 
-#include <kdebug.h>
+#include <KDebug>
+#include <KLocale>
 #include <KMessageBox>
 
 #include <QFile>
diff --git a/src/part/graphedge.cpp b/src/part/graphedge.cpp
index 1f99c18..0334e26 100644
--- a/src/part/graphedge.cpp
+++ b/src/part/graphedge.cpp
@@ -29,9 +29,12 @@
 #include "graphsubgraph.h"
 #include "canvasedge.h"
 #include "dotdefaults.h"
+#include "dotgrammar.h"
 
 #include <graphviz/gvc.h>
 
+#include <KDebug>
+
 namespace KGraphViewer
 {
   
diff --git a/src/part/graphedge.h b/src/part/graphedge.h
index 7206fa8..4970b0b 100644
--- a/src/part/graphedge.h
+++ b/src/part/graphedge.h
@@ -32,9 +32,7 @@
 #ifndef GRAPH_EDGE_H
 #define GRAPH_EDGE_H
 
-#include "canvasnode.h"
 #include "graphelement.h"
-#include "dotgrammar.h"
 #include "dotrenderop.h"
 
 #include <QStringList>
@@ -47,6 +45,7 @@ namespace KGraphViewer
 {
   
 class CanvasEdge;
+class CanvasNode;
 class GraphNode;
 
 class GraphEdge : public GraphElement
diff --git a/src/part/graphnode.cpp b/src/part/graphnode.cpp
index f713c87..516043a 100644
--- a/src/part/graphnode.cpp
+++ b/src/part/graphnode.cpp
@@ -30,6 +30,7 @@
  */
 
 #include "graphnode.h"
+#include "dotgrammar.h"
 #include "dotgraphview.h"
 #include "pannerview.h"
 #include "canvasnode.h"
@@ -106,6 +107,16 @@ void GraphNode::updateWithNode(node_t* node)
   }
 }
 
+CanvasNode* GraphNode::canvasNode()
+{
+    return dynamic_cast<CanvasNode*>(canvasElement());
+}
+
+const KGraphViewer::CanvasNode* GraphNode::canvasNode() const
+{
+    return dynamic_cast<const CanvasNode*>(canvasElement());
+}
+
 QTextStream& operator<<(QTextStream& s, const GraphNode& n)
 {
   s << n.id() << "  ["
diff --git a/src/part/graphnode.h b/src/part/graphnode.h
index 5072286..a2a4c24 100644
--- a/src/part/graphnode.h
+++ b/src/part/graphnode.h
@@ -38,16 +38,14 @@
 #include <QtCore/QTextStream>
 
 #include "dotrenderop.h"
-#include "dotgrammar.h"
 #include "graphelement.h"
-#include "canvaselement.h"
-#include "canvasnode.h"
 
 class Agnode_t;
 
 namespace KGraphViewer
 {
-  
+
+class CanvasElement;
 class CanvasNode;
 
 /**
@@ -63,8 +61,8 @@ public:
   
   virtual ~GraphNode() {}  
   
-  inline CanvasNode* canvasNode() { return dynamic_cast<CanvasNode*>(canvasElement()); }
-  inline const CanvasNode* canvasNode() const { return dynamic_cast<const CanvasNode*>(canvasElement()); }
+  CanvasNode* canvasNode();
+  const CanvasNode* canvasNode() const;
   inline void setCanvasNode(CanvasNode* cn) { setCanvasElement((CanvasElement*)cn); }
 
   virtual void updateWithNode(const GraphNode& node);
diff --git a/src/part/graphsubgraph.cpp b/src/part/graphsubgraph.cpp
index aa9f3cb..7c48097 100644
--- a/src/part/graphsubgraph.cpp
+++ b/src/part/graphsubgraph.cpp
@@ -24,6 +24,7 @@
 #include "graphnode.h"
 #include "canvassubgraph.h"
 #include "dotdefaults.h"
+#include "dotgrammar.h"
 
 #include "graphviz/gvc.h"
 
diff --git a/src/part/graphsubgraph.h b/src/part/graphsubgraph.h
index 4997375..2bb7128 100644
--- a/src/part/graphsubgraph.h
+++ b/src/part/graphsubgraph.h
@@ -26,9 +26,7 @@
 #include <QMap>
 #include <QTextStream>
 
-#include "dotgrammar.h"
 #include "graphelement.h"
-#include "dotrenderop.h"
 
 class Agraph_t;