cleanup

svn path=/trunk/kdenlive/; revision=4985

diff --git a/src/monitorscene.cpp b/src/monitorscene.cpp
index 7396cf861d2b5065f248988d8f6845acd0123f34..3a305d87aea7e6706c6652f1315a4580648d5198 100644 (file)
--- a/src/monitorscene.cpp
+++ b/src/monitorscene.cpp
@@ -139,20 +139,6 @@ void MonitorScene::slotZoomIn()
     slotZoom(qMin(300, newzoom));
 }
 
-void MonitorScene::addItem(QGraphicsItem* item)
-{
-    QGraphicsScene::addItem(item);
-
-    /*OnMonitorRectItem *rect = qgraphicsitem_cast<OnMonitorRectItem*>(item);
-    if (rect) {
-        connect(this, SIGNAL(mousePressed(QGraphicsSceneMouseEvent*)), rect, SLOT(slotMousePressed(QGraphicsSceneMouseEvent*)));
-        connect(this, SIGNAL(mouseReleased(QGraphicsSceneMouseEvent*)), rect, SLOT(slotMouseReleased(QGraphicsSceneMouseEvent*)));
-        connect(this, SIGNAL(mouseMoved(QGraphicsSceneMouseEvent*)), rect, SLOT(slotMouseMoved(QGraphicsSceneMouseEvent*)));
-        connect(rect, SIGNAL(actionFinished()), this, SIGNAL(actionFinished()));
-        connect(rect, SIGNAL(setCursor(const QCursor &)), this, SLOT(slotSetCursor(const QCursor &)));
-    }*/
-}
-
 void MonitorScene::slotSetCursor(const QCursor &cursor)
 {
     if (m_view)
@@ -164,7 +150,7 @@ void MonitorScene::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     emit mousePressed(event);
 
-    if (!event->isAccepted() && m_enabled)
+    if (!event->isAccepted())
         QGraphicsScene::mousePressEvent(event);
 }
 
@@ -172,7 +158,7 @@ void MonitorScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     emit mouseMoved(event);
 
-    if (!event->isAccepted() && m_enabled)
+    if (!event->isAccepted())
         QGraphicsScene::mouseMoveEvent(event);
 }
 
@@ -180,7 +166,7 @@ void MonitorScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     emit mouseReleased(event);
 
-    if (!event->isAccepted() && m_enabled)
+    if (!event->isAccepted())
         QGraphicsScene::mouseReleaseEvent(event);
 }
 

diff --git a/src/monitorscene.h b/src/monitorscene.h
index 081537ceaad50acd1c7633fc58420fcef8e0887f..67d7c170f1c5937ea8e513ab80a7752c04b1652c 100644 (file)
--- a/src/monitorscene.h
+++ b/src/monitorscene.h
@@ -43,9 +43,6 @@ public:
     /** @brief Makes the background frame fit again after the profile changed (and therefore the resolution might have changed). */
     void resetProfile();
 
-    /** @brief Adds an item to the scene and connects mouse events + change signals if it is a onmonitor item. */
-    void addItem(QGraphicsItem *item);
-
 protected:
     /** @brief Emits signal mousePressed to be used in onmonitor items. */
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);

diff --git a/src/onmonitoritems/abstractonmonitoritem.h b/src/onmonitoritems/abstractonmonitoritem.h
index 1832fa4aa1a42d9431232d0d1e3f71e34ad4a5e0..0c61e09c42ffaf657ebadab8476993d4c611a25c 100644 (file)
--- a/src/onmonitoritems/abstractonmonitoritem.h
+++ b/src/onmonitoritems/abstractonmonitoritem.h
@@ -32,7 +32,7 @@ class AbstractOnMonitorItem : public QObject
     Q_OBJECT
 public:
     AbstractOnMonitorItem(MonitorScene *scene);
-    //virtual ~AbstractOnMonitorItem() = 0;
+    virtual ~AbstractOnMonitorItem() {};
 
 protected slots:
     virtual void slotMousePressed(QGraphicsSceneMouseEvent *event) = 0;
@@ -46,7 +46,6 @@ protected:
 signals:
     void actionFinished();
     void requestCursor(const QCursor &);
-    //void modified();
 };
 
 #endif

diff --git a/src/onmonitoritems/onmonitorrectitem.h b/src/onmonitoritems/onmonitorrectitem.h
index c5d20c5f09157bb2f1dd989f11045ca39e0e7489..96e3db366f0613cc9a053c6711ef3c92e74b8273 100644 (file)
--- a/src/onmonitoritems/onmonitorrectitem.h
+++ b/src/onmonitoritems/onmonitorrectitem.h
@@ -39,7 +39,7 @@ public:
     rectActions getMode(QPoint pos);
     
     /*enum { Type = UserType + 1};
-    /** @brief Reimplemented to make sure casting works. * /
+    / ** @brief Reimplemented to make sure casting works. * /
     int type() const;*/
 
     /** @brief Reimplemented to draw the handles. */