aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/components/formeditor/movetool.h
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2014-09-24 12:49:32 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2014-09-25 12:16:47 +0200
commit48f19e925b9af6fb0b22c8bd6c34a4778fe280a8 (patch)
treeb929e23cd0487100fa7f21234400b616231e4143 /src/plugins/qmldesigner/components/formeditor/movetool.h
parent652c53bf06826bc347d5384b3da01c8a083b2118 (diff)
Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE
This patch removes src/libs/utils/qtcoverride.h and uses Q_DECL_OVERRIDE from Qt 5 instead. Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/components/formeditor/movetool.h')
-rw-r--r--src/plugins/qmldesigner/components/formeditor/movetool.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.h b/src/plugins/qmldesigner/components/formeditor/movetool.h
index 9947037ea1..1cbe637b5b 100644
--- a/src/plugins/qmldesigner/components/formeditor/movetool.h
+++ b/src/plugins/qmldesigner/components/formeditor/movetool.h
@@ -47,32 +47,32 @@ public:
MoveTool(FormEditorView* editorView);
~MoveTool();
- void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
- void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
+ void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
+ void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE;
- void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
- void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+ void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE;
+ void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE;
- void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
- void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_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 instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
+ void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
void updateMoveManipulator();
void beginWithPoint(const QPointF &beginPoint);
- void clear() QTC_OVERRIDE;
+ void clear() Q_DECL_OVERRIDE;
- void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
protected:
static bool haveSameParent(const QList<FormEditorItem*> &itemList);