diff options
author | hjk <hjk@theqtcompany.com> | 2016-06-15 10:12:35 +0200 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2016-06-15 09:32:30 +0000 |
commit | 40a54bf565079c007eada8755b9ff7224754949d (patch) | |
tree | ccd3bb45ca7369b79fc54d26955cf5b0dfc8ece1 /examples/widgets/tools/undo/commands.h | |
parent | 4d3ffae3d562e5b3b2748a2d92eb4ab2933422e7 (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/undo/commands.h')
-rw-r--r-- | examples/widgets/tools/undo/commands.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/examples/widgets/tools/undo/commands.h b/examples/widgets/tools/undo/commands.h index 1a14b3fa56..de3bebd740 100644 --- a/examples/widgets/tools/undo/commands.h +++ b/examples/widgets/tools/undo/commands.h @@ -58,8 +58,8 @@ class AddShapeCommand : public QUndoCommand { public: AddShapeCommand(Document *doc, const Shape &shape, QUndoCommand *parent = 0); - void undo() Q_DECL_OVERRIDE; - void redo() Q_DECL_OVERRIDE; + void undo() override; + void redo() override; private: Document *m_doc; @@ -71,8 +71,8 @@ class RemoveShapeCommand : public QUndoCommand { public: RemoveShapeCommand(Document *doc, const QString &shapeName, QUndoCommand *parent = 0); - void undo() Q_DECL_OVERRIDE; - void redo() Q_DECL_OVERRIDE; + void undo() override; + void redo() override; private: Document *m_doc; @@ -86,11 +86,11 @@ public: SetShapeColorCommand(Document *doc, const QString &shapeName, const QColor &color, QUndoCommand *parent = 0); - void undo() Q_DECL_OVERRIDE; - void redo() Q_DECL_OVERRIDE; + void undo() override; + void redo() override; - bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - int id() const Q_DECL_OVERRIDE; + bool mergeWith(const QUndoCommand *command) override; + int id() const override; private: Document *m_doc; @@ -105,11 +105,11 @@ public: SetShapeRectCommand(Document *doc, const QString &shapeName, const QRect &rect, QUndoCommand *parent = 0); - void undo() Q_DECL_OVERRIDE; - void redo() Q_DECL_OVERRIDE; + void undo() override; + void redo() override; - bool mergeWith(const QUndoCommand *command) Q_DECL_OVERRIDE; - int id() const Q_DECL_OVERRIDE; + bool mergeWith(const QUndoCommand *command) override; + int id() const override; private: Document *m_doc; |