[kgraphviewer-devel] [KGraphViewer/libkgraphviz] 8108aa2: Remove redundant GraphSubgraph::canvasSubgraph()

[Kevin Funk]

commit 8108aa2cb9301844ccd1d0c585407e9e02b3f0f0
branch libkgraphviz
Author: Kevin Funk <krf at electrostorm.net>
Date:   Mon Dec 20 17:53:28 2010 +0100

    Remove redundant GraphSubgraph::canvasSubgraph()

diff --git a/src/kgraphviz/canvasedge.cpp b/src/kgraphviz/canvasedge.cpp
index 4276463..2f52ea0 100644
--- a/src/kgraphviz/canvasedge.cpp
+++ b/src/kgraphviz/canvasedge.cpp
@@ -502,5 +502,5 @@ void CanvasEdge::computeBoundingRect()
 
 GraphEdge* CanvasEdge::edge() const
 {
-  return qobject_cast<GraphEdge*>(element());
+  return dynamic_cast<GraphEdge*>(element());
 }
diff --git a/src/kgraphviz/canvassubgraph.cpp b/src/kgraphviz/canvassubgraph.cpp
index 6e3423a..acc7831 100644
--- a/src/kgraphviz/canvassubgraph.cpp
+++ b/src/kgraphviz/canvassubgraph.cpp
@@ -19,6 +19,8 @@
 
 #include "canvassubgraph.h"
 
+#include "graphsubgraph.h"
+
 namespace KGraphViz
 {
   
@@ -28,7 +30,8 @@ CanvasSubgraph::CanvasSubgraph(
                               GraphSubgraph* gsubgraph,
                               QGraphicsScene* c,
                               QGraphicsItem* parent
-                            ) : CanvasElement(v,(GraphElement*)gsubgraph,c,parent)
+                            )
+  : CanvasElement(v, gsubgraph, c, parent)
 {
 }
 
diff --git a/src/kgraphviz/dotgraph.cpp b/src/kgraphviz/dotgraph.cpp
index e4ae26f..82e1ef1 100644
--- a/src/kgraphviz/dotgraph.cpp
+++ b/src/kgraphviz/dotgraph.cpp
@@ -738,11 +738,11 @@ void DotGraph::removeSubgraphNamed(const QString& subgraphName)
     }
   }
 
-  if (subgraph->canvasSubgraph() != 0)
+  if (subgraph->canvasElement() != 0)
   {
-    subgraph->canvasSubgraph()->hide();
-    delete subgraph->canvasSubgraph();
-    subgraph->setCanvasSubgraph(0);
+    subgraph->canvasElement()->hide();
+    delete subgraph->canvasElement();
+    subgraph->setCanvasElement(0);
   }
   foreach(GraphElement* element, subgraph->content())
   {
diff --git a/src/kgraphviz/dotgraphview.cpp b/src/kgraphviz/dotgraphview.cpp
index df7a4b4..18fc010 100644
--- a/src/kgraphviz/dotgraphview.cpp
+++ b/src/kgraphviz/dotgraphview.cpp
@@ -279,14 +279,14 @@ int DotGraphViewPrivate::displaySubgraph(GraphSubgraph* gsubgraph, int zValue, C
   
   qreal gh = m_graph->height();
   
-  if (gsubgraph->canvasSubgraph() == 0)
+  if (gsubgraph->canvasElement() == 0)
   {
     kDebug() << "Creating canvas subgraph for" << gsubgraph->id();
     CanvasSubgraph* csubgraph = new CanvasSubgraph(q, gsubgraph, m_canvas, parent);
     csubgraph->initialize(
       scaleX, scaleY, m_xMargin, m_yMargin, gh,
       m_graph->wdhcf(), m_graph->hdvcf());
-    gsubgraph->setCanvasSubgraph(csubgraph);
+    gsubgraph->setCanvasElement(csubgraph);
     //       csubgraph->setZValue(gsubgraph->z());
     csubgraph->setZValue(zValue+=2);
     csubgraph->show();
@@ -312,12 +312,12 @@ int DotGraphViewPrivate::displaySubgraph(GraphSubgraph* gsubgraph, int zValue, C
     }
     gnode->canvasElement()->computeBoundingRect();
   }
-  gsubgraph->canvasSubgraph()->computeBoundingRect();
+  gsubgraph->canvasElement()->computeBoundingRect();
   
   int newZvalue = zValue;
   foreach(GraphSubgraph* ssg, gsubgraph->subgraphs())
   {
-    int hereZvalue = displaySubgraph(ssg, zValue, gsubgraph->canvasSubgraph());
+    int hereZvalue = displaySubgraph(ssg, zValue, gsubgraph->canvasElement());
     if (hereZvalue > newZvalue)
       newZvalue = hereZvalue;
   }
diff --git a/src/kgraphviz/graphsubgraph.cpp b/src/kgraphviz/graphsubgraph.cpp
index 28d7f38..0b88cad 100644
--- a/src/kgraphviz/graphsubgraph.cpp
+++ b/src/kgraphviz/graphsubgraph.cpp
@@ -95,10 +95,10 @@ void GraphSubgraph::updateWithSubgraph(const GraphSubgraph& subgraph)
     }
   }
 
-  if (canvasSubgraph())
+  if (canvasElement())
   {
-    canvasSubgraph()->modelChanged();
-    canvasSubgraph()->computeBoundingRect();
+    canvasElement()->modelChanged();
+    canvasElement()->computeBoundingRect();
   }
 //   kDebug() << "done";
 }
diff --git a/src/kgraphviz/graphsubgraph.h b/src/kgraphviz/graphsubgraph.h
index 02dfaf2..f780104 100644
--- a/src/kgraphviz/graphsubgraph.h
+++ b/src/kgraphviz/graphsubgraph.h
@@ -58,9 +58,6 @@ public:
   
   void updateWithSubgraph(const GraphSubgraph& subgraph);
   void updateWithSubgraph(Agraph_t* subgraph);
-  
-  CanvasSubgraph* canvasSubgraph() { return (CanvasSubgraph*)canvasElement();  }
-  void setCanvasSubgraph(CanvasSubgraph* cs) { setCanvasElement((CanvasElement*)cs); }
 
   virtual QString backColor() const;