summaryrefslogtreecommitdiffstats
path: root/examples/widgets/tools/undoframework
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2016-06-15 10:12:35 +0200
committerhjk <hjk@theqtcompany.com>2016-06-15 09:32:30 +0000
commit40a54bf565079c007eada8755b9ff7224754949d (patch)
treeccd3bb45ca7369b79fc54d26955cf5b0dfc8ece1 /examples/widgets/tools/undoframework
parent4d3ffae3d562e5b3b2748a2d92eb4ab2933422e7 (diff)
Examples: Replace 'Q_DECL_OVERRIDE' by 'override'
Examples should demonstrate best practice, and we can use the keyword directly nowadays. Change-Id: I1f122e5caceca17290757ffbaf3d660e7daa9ae4 Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
Diffstat (limited to 'examples/widgets/tools/undoframework')
-rw-r--r--examples/widgets/tools/undoframework/commands.h16
-rw-r--r--examples/widgets/tools/undoframework/diagramitem.h2
-rw-r--r--examples/widgets/tools/undoframework/diagramscene.h4
3 files changed, 11 insertions, 11 deletions
diff --git a/examples/widgets/tools/undoframework/commands.h b/examples/widgets/tools/undoframework/commands.h
index 22c62fe9fd..dc53c14557 100644
--- a/examples/widgets/tools/undoframework/commands.h
+++ b/examples/widgets/tools/undoframework/commands.h
@@ -64,10 +64,10 @@ public:
MoveCommand(DiagramItem *diagramItem, const QPointF &oldPos,
QUndoCommand *parent = 0);
- void undo() Q_DECL_OVERRIDE;
- void redo() Q_DECL_OVERRIDE;
- bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE;
- int id() const Q_DECL_OVERRIDE { return Id; }
+ void undo() override;
+ void redo() override;
+ bool mergeWith(const QUndoCommand *command) override;
+ int id() const override { return Id; }
private:
DiagramItem *myDiagramItem;
@@ -82,8 +82,8 @@ class DeleteCommand : public QUndoCommand
public:
explicit DeleteCommand(QGraphicsScene *graphicsScene, QUndoCommand *parent = 0);
- void undo() Q_DECL_OVERRIDE;
- void redo() Q_DECL_OVERRIDE;
+ void undo() override;
+ void redo() override;
private:
DiagramItem *myDiagramItem;
@@ -99,8 +99,8 @@ public:
QUndoCommand *parent = 0);
~AddCommand();
- void undo() Q_DECL_OVERRIDE;
- void redo() Q_DECL_OVERRIDE;
+ void undo() override;
+ void redo() override;
private:
DiagramItem *myDiagramItem;
diff --git a/examples/widgets/tools/undoframework/diagramitem.h b/examples/widgets/tools/undoframework/diagramitem.h
index 246443b64d..1638dcbea8 100644
--- a/examples/widgets/tools/undoframework/diagramitem.h
+++ b/examples/widgets/tools/undoframework/diagramitem.h
@@ -71,7 +71,7 @@ public:
DiagramType diagramType() const {
return polygon() == boxPolygon ? Box : Triangle;
}
- int type() const Q_DECL_OVERRIDE { return Type; }
+ int type() const override { return Type; }
private:
QPolygonF boxPolygon;
diff --git a/examples/widgets/tools/undoframework/diagramscene.h b/examples/widgets/tools/undoframework/diagramscene.h
index 6b275ce5d3..b1e2804ba6 100644
--- a/examples/widgets/tools/undoframework/diagramscene.h
+++ b/examples/widgets/tools/undoframework/diagramscene.h
@@ -72,8 +72,8 @@ signals:
void itemMoved(DiagramItem *movedItem, const QPointF &movedFromPosition);
protected:
- void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
- void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
+ void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
private:
QGraphicsItem *movingItem;