QmlDesigner.formEditor: use pure virtuel instead of assert

Asserting because of unexpected mouse events is evil.

Task-number: QTCREATORBUG-6042
Change-Id: Idc21b1cb6bfebead4eab80f6526235164b3f8d54
Reviewed-on: http://codereview.qt-project.org/5090
Reviewed-by: hjk <qthjk@ovi.com>

12 files changed, 67 insertions, 12 deletions

diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
index 27f2d0122f..224a598693 100644
--- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp
@@ -184,16 +184,6 @@ void AbstractFormEditorTool::dragEnterEvent(QGraphicsSceneDragDropEvent * event)
     }
 }
 
-void AbstractFormEditorTool::dragLeaveEvent(QGraphicsSceneDragDropEvent * /* event */)
-{
-    Q_ASSERT(false);
-}
-
-void AbstractFormEditorTool::dragMoveEvent(QGraphicsSceneDragDropEvent * /* event */)
-{
-    Q_ASSERT(false);
-}
-
 static inline bool checkIfNodeIsAView(const ModelNode &node)
 {
     return node.metaInfo().isValid() &&
diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h
index f61ef51631..8c1f829b32 100644
--- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h
+++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h
@@ -66,8 +66,8 @@ public:
 
     virtual void dropEvent(QGraphicsSceneDragDropEvent * event);
     virtual void dragEnterEvent(QGraphicsSceneDragDropEvent * event);
-    virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
-    virtual void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
+    virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent * event) = 0;
+    virtual void dragMoveEvent(QGraphicsSceneDragDropEvent * event) = 0;
 
     virtual void keyPressEvent(QKeyEvent *event) = 0;
     virtual void keyReleaseEvent(QKeyEvent *keyEvent) = 0;
diff --git a/src/plugins/qmldesigner/components/formeditor/anchortool.cpp b/src/plugins/qmldesigner/components/formeditor/anchortool.cpp
index b058a50249..13fbe84beb 100644
--- a/src/plugins/qmldesigner/components/formeditor/anchortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/anchortool.cpp
@@ -190,6 +190,16 @@ void AnchorTool::keyReleaseEvent(QKeyEvent *)
 {
 }
 
+void AnchorTool::dragLeaveEvent(QGraphicsSceneDragDropEvent *)
+{
+
+}
+
+void AnchorTool::dragMoveEvent(QGraphicsSceneDragDropEvent *)
+{
+
+}
+
 void AnchorTool::itemsAboutToRemoved(const QList<FormEditorItem*> &removedItems)
 {
     QList<FormEditorItem*> newItemList = items().toSet().subtract(removedItems.toSet()).toList();
diff --git a/src/plugins/qmldesigner/components/formeditor/anchortool.h b/src/plugins/qmldesigner/components/formeditor/anchortool.h
index 27fc531fca..0e98bb7be0 100644
--- a/src/plugins/qmldesigner/components/formeditor/anchortool.h
+++ b/src/plugins/qmldesigner/components/formeditor/anchortool.h
@@ -65,6 +65,9 @@ public:
     void keyPressEvent(QKeyEvent *event);
     void keyReleaseEvent(QKeyEvent *keyEvent);
 
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
+    void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
+
     void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList);
 
     void selectedItemsChanged(const QList<FormEditorItem*> &itemList);
diff --git a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
index 398dbe1f4d..440cf52798 100644
--- a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
@@ -123,6 +123,16 @@ void ItemCreatorTool::keyReleaseEvent(QKeyEvent * /*keyEvent*/)
 
 }
 
+void ItemCreatorTool::dragLeaveEvent(QGraphicsSceneDragDropEvent * /*event*/)
+{
+
+}
+
+void ItemCreatorTool::dragMoveEvent(QGraphicsSceneDragDropEvent * /*event*/)
+{
+
+}
+
 void ItemCreatorTool::itemsAboutToRemoved(const QList<FormEditorItem*> &/*itemList*/)
 {
 
diff --git a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h
index cd678b2647..8777ac0949 100644
--- a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h
+++ b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.h
@@ -62,6 +62,9 @@ public:
     void keyPressEvent(QKeyEvent *event);
     void keyReleaseEvent(QKeyEvent *keyEvent);
 
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
+    void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
+
     void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList);
 
     void clear();
diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
index 0b68938bc6..c51930d8cd 100644
--- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
@@ -203,6 +203,16 @@ void MoveTool::keyReleaseEvent(QKeyEvent *keyEvent)
     }
 }
 
+void  MoveTool::dragLeaveEvent(QGraphicsSceneDragDropEvent * /*event*/)
+{
+
+}
+
+void  MoveTool::dragMoveEvent(QGraphicsSceneDragDropEvent * /*event*/)
+{
+
+}
+
 void MoveTool::mouseReleaseEvent(const QList<QGraphicsItem*> &itemList,
                                  QGraphicsSceneMouseEvent *event)
 {
diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.h b/src/plugins/qmldesigner/components/formeditor/movetool.h
index 9225e09890..e3098d39a9 100644
--- a/src/plugins/qmldesigner/components/formeditor/movetool.h
+++ b/src/plugins/qmldesigner/components/formeditor/movetool.h
@@ -63,6 +63,9 @@ public:
     void keyPressEvent(QKeyEvent *event);
     void keyReleaseEvent(QKeyEvent *keyEvent);
 
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
+    void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
+
     void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList);
 
     void selectedItemsChanged(const QList<FormEditorItem*> &itemList);
diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
index fca319def1..2bcd37aec8 100644
--- a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp
@@ -112,6 +112,17 @@ void ResizeTool::hoverMoveEvent(const QList<QGraphicsItem*> &itemList,
     }
 }
 
+void ResizeTool::dragLeaveEvent(QGraphicsSceneDragDropEvent * /*event*/)
+{
+
+}
+
+void ResizeTool::dragMoveEvent(QGraphicsSceneDragDropEvent * /*event*/)
+{
+
+}
+
+
 void ResizeTool::mouseReleaseEvent(const QList<QGraphicsItem*> &itemList,
                                               QGraphicsSceneMouseEvent *event)
 {
diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.h b/src/plugins/qmldesigner/components/formeditor/resizetool.h
index 68c935b676..64698df0c0 100644
--- a/src/plugins/qmldesigner/components/formeditor/resizetool.h
+++ b/src/plugins/qmldesigner/components/formeditor/resizetool.h
@@ -57,6 +57,10 @@ public:
                                        QGraphicsSceneMouseEvent *event);
     void hoverMoveEvent(const QList<QGraphicsItem*> &itemList,
                         QGraphicsSceneMouseEvent *event);
+
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
+    void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
+
     void keyPressEvent(QKeyEvent *event);
     void keyReleaseEvent(QKeyEvent *keyEvent);
 
diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
index b79bf484ab..1067c0cdaf 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
@@ -225,6 +225,14 @@ void SelectionTool::keyReleaseEvent(QKeyEvent * /*keyEvent*/)
 
 }
 
+void SelectionTool::dragLeaveEvent(QGraphicsSceneDragDropEvent * /*event*/)
+{
+}
+
+void SelectionTool::dragMoveEvent(QGraphicsSceneDragDropEvent * /*event*/)
+{
+}
+
 void SelectionTool::setSelectOnlyContentItems(bool selectOnlyContentItems)
 {
     m_selectOnlyContentItems = selectOnlyContentItems;
diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.h b/src/plugins/qmldesigner/components/formeditor/selectiontool.h
index a08c38dcae..33810b820d 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectiontool.h
+++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.h
@@ -66,6 +66,9 @@ public:
     void keyPressEvent(QKeyEvent *event);
     void keyReleaseEvent(QKeyEvent *keyEvent);
 
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
+    void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
+
      void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList);
     //    QVariant itemChange(const QList<QGraphicsItem*> &itemList,
 //                        QGraphicsItem::GraphicsItemChange change,