From 40a54bf565079c007eada8755b9ff7224754949d Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 15 Jun 2016 10:12:35 +0200 Subject: Examples: Replace 'Q_DECL_OVERRIDE' by 'override' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Examples should demonstrate best practice, and we can use the keyword directly nowadays. Change-Id: I1f122e5caceca17290757ffbaf3d660e7daa9ae4 Reviewed-by: Topi Reiniö --- examples/widgets/tools/undo/commands.h | 24 ++++++++++++------------ examples/widgets/tools/undo/document.h | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'examples/widgets/tools/undo') 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; diff --git a/examples/widgets/tools/undo/document.h b/examples/widgets/tools/undo/document.h index 41e53a9a04..8076d7185c 100644 --- a/examples/widgets/tools/undo/document.h +++ b/examples/widgets/tools/undo/document.h @@ -110,10 +110,10 @@ signals: void currentShapeChanged(const QString &shapeName); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; private: void setCurrentShape(int index); -- cgit v1.2.3