[kgraphviewer-devel] [KGraphViewer/libkgraphviz] 4fbc10c: Cleanup CanvasEdge constructor's signature

[Kevin Funk]

commit 4fbc10c4b19b51bc58f5cb1545b858d6eb2f1a89
branch libkgraphviz
Author: Kevin Funk <krf at electrostorm.net>
Date:   Mon Dec 20 16:38:55 2010 +0100

    Cleanup CanvasEdge constructor's signature
    
    Be consistent with base class constructor

diff --git a/src/kgraphviz/canvasedge.cpp b/src/kgraphviz/canvasedge.cpp
index 386c864..4276463 100644
--- a/src/kgraphviz/canvasedge.cpp
+++ b/src/kgraphviz/canvasedge.cpp
@@ -56,9 +56,6 @@ CanvasEdgePrivate::~CanvasEdgePrivate()
 CanvasEdge::CanvasEdge(DotGraphView* view,
                        GraphEdge* e,
                        QGraphicsScene* scene,
-                       qreal scaleX, qreal scaleY,
-                       qreal xMargin, qreal yMargin, qreal gh,
-                       qreal wdhcf, qreal hdvcf,
                        QGraphicsItem* parent) :
   CanvasElement(view, e, scene, parent),
   d_ptr(new CanvasEdgePrivate)
@@ -67,11 +64,8 @@ CanvasEdge::CanvasEdge(DotGraphView* view,
   setBoundingRegionGranularity(0.9);
   setFont(*FontsCache::changeable().fromName(e->fontName()));
 
-  kDebug() << scaleX << scaleY << xMargin << yMargin << /*gh*/0 << wdhcf << hdvcf << font();
-
-  initialize(scaleX, scaleY, xMargin, yMargin, /*gh*/0, wdhcf, hdvcf);
   kDebug() << "boundingRect computed: " << boundingRect();
-  
+
   QString tipStr = i18n("%1 -> %2\nlabel='%3'",
       edge()->fromNode()->id(),edge()->toNode()->id(),e->label());
   setToolTip(tipStr);
diff --git a/src/kgraphviz/canvasedge.h b/src/kgraphviz/canvasedge.h
index 170d36f..f44f74e 100644
--- a/src/kgraphviz/canvasedge.h
+++ b/src/kgraphviz/canvasedge.h
@@ -51,9 +51,6 @@ public:
   explicit CanvasEdge(DotGraphView* v,
                       GraphEdge*,
                       QGraphicsScene* scene,
-                      qreal scaleX, qreal scaleY,
-                      qreal xMargin, qreal yMargin, qreal gh,
-                      qreal wdhcf, qreal hdvcf,
                       QGraphicsItem* parent = 0);
 
   virtual ~CanvasEdge();
diff --git a/src/kgraphviz/canvaselement.cpp b/src/kgraphviz/canvaselement.cpp
index 512fd5c..d86952c 100644
--- a/src/kgraphviz/canvaselement.cpp
+++ b/src/kgraphviz/canvaselement.cpp
@@ -42,7 +42,9 @@ using namespace KGraphViz;
 
 CanvasElementPrivate::CanvasElementPrivate() :
   m_scaleX(0), m_scaleY(0),
-  m_xMargin(0), m_yMargin(0), m_gh(0), m_wdhcf(0), m_hdvcf(0),
+  m_xMargin(0), m_yMargin(0),
+  m_gh(0),
+  m_wdhcf(0), m_hdvcf(0),
   m_hovered(false)
 {
 }
@@ -51,12 +53,10 @@ CanvasElementPrivate::~CanvasElementPrivate()
 {
 }
 
-CanvasElement::CanvasElement(
-                              DotGraphView* v,
-                              GraphElement* gelement,
-                              QGraphicsScene* c,
-                              QGraphicsItem* parent
-                            )
+CanvasElement::CanvasElement(DotGraphView* v,
+                             GraphElement* gelement,
+                             QGraphicsScene* c,
+                             QGraphicsItem* parent)
   : QAbstractGraphicsShapeItem(parent)
   , d_ptr(new CanvasElementPrivate)
 {
diff --git a/src/kgraphviz/dotgraphview.cpp b/src/kgraphviz/dotgraphview.cpp
index 58f3e96..df7a4b4 100644
--- a/src/kgraphviz/dotgraphview.cpp
+++ b/src/kgraphviz/dotgraphview.cpp
@@ -759,8 +759,10 @@ bool DotGraphView::displayGraph()
       kDebug() << "              "<< gedge->fromNode()->id();
       kDebug() << "edge toNode=" << (void*)gedge->toNode();
       kDebug() << "              "<< gedge->toNode()->id();
-      CanvasEdge* cedge = new CanvasEdge(this, gedge, d->m_canvas, scaleX, scaleY, d->m_xMargin,
-          d->m_yMargin, gh, d->m_graph->wdhcf(), d->m_graph->hdvcf());
+      CanvasEdge* cedge = new CanvasEdge(this, gedge, d->m_canvas);
+      cedge->initialize(scaleX, scaleY,
+                        d->m_xMargin, d->m_yMargin, gh,
+                        d->m_graph->wdhcf(), d->m_graph->hdvcf());
 
       gedge->setCanvasElement(cedge);
   //     std::cerr << "setting z = " << gedge->z() << std::endl;