[kgraphviewer-devel] [KGraphViewer/libkgraphviz] 941180b: Make QGraphicItem subclasses Q_OBJECT.

[Kevin Funk]

commit 941180bc171cabd45e0b644d0edbd4b525170fb3
branch libkgraphviz
Author: Kevin Funk <krf at electrostorm.net>
Date:   Thu Dec 16 17:52:14 2010 +0100

    Make QGraphicItem subclasses Q_OBJECT.
    
    The view handles the signal/slot stuff

diff --git a/src/kgraphviz/canvasedge.cpp b/src/kgraphviz/canvasedge.cpp
index b5e1072..386c864 100644
--- a/src/kgraphviz/canvasedge.cpp
+++ b/src/kgraphviz/canvasedge.cpp
@@ -510,5 +510,3 @@ GraphEdge* CanvasEdge::edge() const
 {
   return qobject_cast<GraphEdge*>(element());
 }
-
-#include "canvasedge.moc"
diff --git a/src/kgraphviz/canvasedge.h b/src/kgraphviz/canvasedge.h
index bddd0ed..a715b14 100644
--- a/src/kgraphviz/canvasedge.h
+++ b/src/kgraphviz/canvasedge.h
@@ -47,8 +47,6 @@ class GraphEdge;
 
 class CanvasEdge : public CanvasElement
 {
-  Q_OBJECT
-
 public:
   explicit CanvasEdge(DotGraphView* v,
                       GraphEdge*,
diff --git a/src/kgraphviz/canvaselement.cpp b/src/kgraphviz/canvaselement.cpp
index f63740d..512fd5c 100644
--- a/src/kgraphviz/canvaselement.cpp
+++ b/src/kgraphviz/canvaselement.cpp
@@ -97,11 +97,6 @@ CanvasElement::CanvasElement(
     d->m_brush = c->backgroundBrush();
   }
 
-  connect(this, SIGNAL(selected(CanvasElement*, Qt::KeyboardModifiers)), v, SLOT(slotElementSelected(CanvasElement*, Qt::KeyboardModifiers)));
-
-  connect(this, SIGNAL(hoverEnter(CanvasElement*)), v, SLOT(slotElementHoverEnter(CanvasElement*)));
-  connect(this, SIGNAL(hoverLeave(CanvasElement*)), v, SLOT(slotElementHoverLeave(CanvasElement*)));
-
   setAcceptHoverEvents ( true );
 }
 
@@ -602,7 +597,6 @@ void CanvasElement::mousePressEvent(QGraphicsSceneMouseEvent* event)
     if (d->m_element->isSelected())
     {
       kDebug() << "Element selected:" << d->m_element->id() << d->m_element;
-      emit(selected(this,event->modifiers()));
     }
     update();
   }
@@ -612,19 +606,11 @@ void CanvasElement::mousePressEvent(QGraphicsSceneMouseEvent* event)
     if (!d->m_element->isSelected())
     {
       d->m_element->setSelected(true);
-      emit(selected(this,event->modifiers()));
       update();
     }
   }
 }
 
-void CanvasElement::slotRemoveElement()
-{
-  Q_D(CanvasElement);
-  kDebug();
-  d->m_view->removeSelectedElements();
-}
-
 void CanvasElement::hoverEnterEvent( QGraphicsSceneHoverEvent * event )
 {
   Q_UNUSED(event)
@@ -632,7 +618,6 @@ void CanvasElement::hoverEnterEvent( QGraphicsSceneHoverEvent * event )
   kDebug() << "Element:" << element()->id();
   d->m_hovered = true;
   update();
-  emit hoverEnter(this);
 }
 
 void CanvasElement::hoverLeaveEvent( QGraphicsSceneHoverEvent * event )
@@ -642,7 +627,4 @@ void CanvasElement::hoverLeaveEvent( QGraphicsSceneHoverEvent * event )
   kDebug() << "Element:" << element()->id();
   d->m_hovered = false;
   update();
-  emit hoverLeave(this);
 }
-
-#include "canvaselement.moc"
diff --git a/src/kgraphviz/canvaselement.h b/src/kgraphviz/canvaselement.h
index 7a81614..63fecf9 100644
--- a/src/kgraphviz/canvaselement.h
+++ b/src/kgraphviz/canvaselement.h
@@ -37,8 +37,6 @@ class DotGraphView;
 
 class CanvasElement: public QObject, public QAbstractGraphicsShapeItem
 {
-  Q_OBJECT
-
 public:
   CanvasElement(
       DotGraphView* v, 
@@ -64,6 +62,8 @@ public:
   qreal gh() const;
   void setGh(qreal gh);
 
+  virtual void modelChanged();
+
 protected:
   virtual void mousePressEvent ( QGraphicsSceneMouseEvent * event );
   virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event );
@@ -82,15 +82,6 @@ protected:
 
   void setBoundingRect(const QRectF& rect);
 
-Q_SIGNALS:
-  void selected(CanvasElement*, Qt::KeyboardModifiers);
-  void hoverEnter(CanvasElement*);
-  void hoverLeave(CanvasElement*);
-  
-public Q_SLOTS:
-  void modelChanged();
-  void slotRemoveElement();
-
 private:
   Q_DECLARE_PRIVATE(CanvasElement)
   CanvasElementPrivate* const d_ptr;
diff --git a/src/kgraphviz/canvasnode.cpp b/src/kgraphviz/canvasnode.cpp
index 7c897d9..66fe6e4 100644
--- a/src/kgraphviz/canvasnode.cpp
+++ b/src/kgraphviz/canvasnode.cpp
@@ -60,8 +60,6 @@ CanvasNode::CanvasNode(DotGraphView* v,
 
 {
   kDebug() << s->id();
-  connect(s,SIGNAL(changed()),this,SLOT(modelChanged()));
-
   QString tipStr;
   QString id = s->id();
   QString label = s->label();
@@ -143,5 +141,3 @@ CanvasNode::CanvasNode(DotGraphView* v,
 // }
 
 }
-
-#include "canvasnode.moc"
diff --git a/src/kgraphviz/canvasnode.h b/src/kgraphviz/canvasnode.h
index a27643d..0b45f02 100644
--- a/src/kgraphviz/canvasnode.h
+++ b/src/kgraphviz/canvasnode.h
@@ -40,7 +40,6 @@ class GraphNode;
 
 class CanvasNode : public CanvasElement
 {
-  Q_OBJECT
 public:
   CanvasNode(DotGraphView* v,
             GraphNode* s,
diff --git a/src/kgraphviz/canvassubgraph.cpp b/src/kgraphviz/canvassubgraph.cpp
index f5ed540..6e3423a 100644
--- a/src/kgraphviz/canvassubgraph.cpp
+++ b/src/kgraphviz/canvassubgraph.cpp
@@ -33,5 +33,3 @@ CanvasSubgraph::CanvasSubgraph(
 }
 
 }
-
-#include "canvassubgraph.moc"
diff --git a/src/kgraphviz/canvassubgraph.h b/src/kgraphviz/canvassubgraph.h
index 594d3df..95486fb 100644
--- a/src/kgraphviz/canvassubgraph.h
+++ b/src/kgraphviz/canvassubgraph.h
@@ -35,8 +35,6 @@ class DotGraphView;
 
 class CanvasSubgraph: public CanvasElement
 {
-  Q_OBJECT
-
 public:
   CanvasSubgraph(
       DotGraphView* v,