QmlDesigner.FormEditor: Add QTC_OVERRIDE to tools

Change-Id: I59e70e69df25f88c8a34f4e43e18d1fa2de09587
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

@@ -4,8 +4,8 @@
 
 namespace QmlDesigner {
 
-AbstractCustomTool::AbstractCustomTool(FormEditorView* view)
-    : AbstractFormEditorTool(view)
+AbstractCustomTool::AbstractCustomTool()
+    : AbstractFormEditorTool(0)
 {
 }
 

src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h

@@ -8,11 +8,11 @@ namespace QmlDesigner {
 class QMLDESIGNERCORE_EXPORT AbstractCustomTool : public QmlDesigner::AbstractFormEditorTool
 {
 public:
-    AbstractCustomTool(FormEditorView* view);
+    AbstractCustomTool();
 
-    void selectedItemsChanged(const QList<FormEditorItem *> &itemList);
+    void selectedItemsChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
 
-    virtual bool wantHandleItem(const ModelNode &modelNode) const = 0;
+    virtual int wantHandleItem(const ModelNode &modelNode) const QTC_OVERRIDE = 0;
 };
 
 } // namespace QmlDesigner

src/plugins/qmldesigner/components/formeditor/dragtool.h

@@ -67,23 +67,23 @@ public:
     virtual ~DragTool();
 
     void mousePressEvent(const QList<QGraphicsItem*> &itemList,
-                         QGraphicsSceneMouseEvent *event);
+                         QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseMoveEvent(const QList<QGraphicsItem*> &itemList,
-                        QGraphicsSceneMouseEvent *event);
+                        QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList,
-                           QGraphicsSceneMouseEvent *event);
+                           QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList,
-                               QGraphicsSceneMouseEvent *event);
+                               QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void hoverMoveEvent(const QList<QGraphicsItem*> &itemList,
-                        QGraphicsSceneMouseEvent *event);
+                        QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
 
-    void keyPressEvent(QKeyEvent *event);
-    void keyReleaseEvent(QKeyEvent *keyEvent);
+    void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
 
-    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList);
+    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
 
-    void selectedItemsChanged(const QList<FormEditorItem*> &itemList);
-    void instancesParentChanged(const QList<FormEditorItem *> &itemList);
+    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
     void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
 
     void updateMoveManipulator();
@@ -91,18 +91,18 @@ public:
     void beginWithPoint(const QPointF &beginPoint);
 
 
-    virtual void dropEvent(QGraphicsSceneDragDropEvent * event);
-    virtual void dragEnterEvent(QGraphicsSceneDragDropEvent * event);
-    virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
-    virtual void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
+    virtual void dropEvent(QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+    virtual void dragEnterEvent(QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+    virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+    virtual void dragMoveEvent(QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
 
     //void beginWithPoint(const QPointF &beginPoint);
 
-    void clear();
+    void clear() QTC_OVERRIDE;
 
-    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList);
+    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
 
-    void instancesCompleted(const QList<FormEditorItem*> &itemList);
+    void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
 
     void clearMoveDelay();
 

src/plugins/qmldesigner/components/formeditor/movetool.h

@@ -48,36 +48,36 @@ public:
     ~MoveTool();
 
     void mousePressEvent(const QList<QGraphicsItem*> &itemList,
-                         QGraphicsSceneMouseEvent *event);
+                         QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseMoveEvent(const QList<QGraphicsItem*> &itemList,
-                        QGraphicsSceneMouseEvent *event);
+                        QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList,
-                           QGraphicsSceneMouseEvent *event);
+                           QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList,
-                               QGraphicsSceneMouseEvent *event);
+                               QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void hoverMoveEvent(const QList<QGraphicsItem*> &itemList,
-                        QGraphicsSceneMouseEvent *event);
-    void keyPressEvent(QKeyEvent *event);
-    void keyReleaseEvent(QKeyEvent *keyEvent);
+                        QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
 
-    void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
-    void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+    void dragMoveEvent(QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
 
-    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList);
+    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
 
-    void selectedItemsChanged(const QList<FormEditorItem*> &itemList);
+    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
 
-    void instancesCompleted(const QList<FormEditorItem*> &itemList);
-    void instancesParentChanged(const QList<FormEditorItem *> &itemList);
+    void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
     void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
 
     void updateMoveManipulator();
 
-    void beginWithPoint(const QPointF &beginPoint);
+    void beginWithPoint(const QPointF &beginPoint) QTC_OVERRIDE;
 
-    void clear();
+    void clear() QTC_OVERRIDE;
 
-    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList);
+    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
 
 protected:
     static bool haveSameParent(const QList<FormEditorItem*> &itemList);

src/plugins/qmldesigner/components/formeditor/resizetool.h

@@ -45,32 +45,32 @@ public:
     ~ResizeTool();
 
     void mousePressEvent(const QList<QGraphicsItem*> &itemList,
-                         QGraphicsSceneMouseEvent *event);
+                         QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseMoveEvent(const QList<QGraphicsItem*> &itemList,
-                        QGraphicsSceneMouseEvent *event);
+                        QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList,
-                           QGraphicsSceneMouseEvent *event);
+                           QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList,
-                                       QGraphicsSceneMouseEvent *event);
+                                       QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void hoverMoveEvent(const QList<QGraphicsItem*> &itemList,
-                        QGraphicsSceneMouseEvent *event);
+                        QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
 
-    void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
-    void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+    void dragMoveEvent(QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
 
-    void keyPressEvent(QKeyEvent *event);
-    void keyReleaseEvent(QKeyEvent *keyEvent);
+    void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
 
-    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList);
+    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
 
-    void selectedItemsChanged(const QList<FormEditorItem*> &itemList);
+    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
 
-    void clear();
+    void clear() QTC_OVERRIDE;
 
-    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList);
-    void instancesParentChanged(const QList<FormEditorItem *> &itemList);
+    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
 
-    void instancesCompleted(const QList<FormEditorItem*> &itemList);
+    void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
     void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
 
 

src/plugins/qmldesigner/components/formeditor/selectiontool.h

@@ -51,37 +51,36 @@ public:
     ~SelectionTool();
 
     void mousePressEvent(const QList<QGraphicsItem*> &itemList,
-                         QGraphicsSceneMouseEvent *event);
+                         QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseMoveEvent(const QList<QGraphicsItem*> &itemList,
-                        QGraphicsSceneMouseEvent *event);
+                        QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList,
-                           QGraphicsSceneMouseEvent *event);
+                           QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList,
-                                       QGraphicsSceneMouseEvent *event);
+                                       QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
     void hoverMoveEvent(const QList<QGraphicsItem*> &itemList,
-                        QGraphicsSceneMouseEvent *event);
-    void keyPressEvent(QKeyEvent *event);
-    void keyReleaseEvent(QKeyEvent *keyEvent);
+                        QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
 
-    void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
-    void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+    void dragMoveEvent(QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
 
-     void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList);
+    void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
     //    QVariant itemChange(const QList<QGraphicsItem*> &itemList,
 //                        QGraphicsItem::GraphicsItemChange change,
 //                        const QVariant &value );
 
 //    void update();
 
-    void clear();
+    void clear() QTC_OVERRIDE;
 
-    void selectedItemsChanged(const QList<FormEditorItem*> &itemList);
+    void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
 
-    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList);
-
-    void instancesCompleted(const QList<FormEditorItem*> &itemList);
-    void instancesParentChanged(const QList<FormEditorItem *> &itemList);
+    void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
 
+    void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+    void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
     void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
 
     void selectUnderPoint(QGraphicsSceneMouseEvent *event);