diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2014-07-14 09:13:02 +0200 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2014-07-15 08:44:44 +0200 |
commit | 3b0c2b7c1b3ccdfe6867884a7e210bfc63e10f84 (patch) | |
tree | 4c75a4fa9f023c4bfc6746a4412922a8efe3b017 /examples/widgets/animation/sub-attaq/states.h | |
parent | 6d87e3ed40173eac8c275d5926266359d53c74c7 (diff) |
Examples: Add Q_DECL_OVERRIDE to overridden functions
Q_DECL_OVERRIDE (which expands to 'override' for supported compiler)
helps to declare the intent (that it is an overridden function) and
force compilation error when there is no such virtual function in the
base class.
The examples should show the best practice of having it, as it may save
the programmer quite some time in case of change of API or typo in the
function name or arguments.
This change was done automatically with
clang-modernize -add-override -override-macros
And fixed MSVC compilation by removing inline for TorrentViewDelegate::paint
Change-Id: Ice66ae93fae571266f908703d5b8892b2c1ebb1a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'examples/widgets/animation/sub-attaq/states.h')
-rw-r--r-- | examples/widgets/animation/sub-attaq/states.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/examples/widgets/animation/sub-attaq/states.h b/examples/widgets/animation/sub-attaq/states.h index 3cd27be9a4..19016cb76e 100644 --- a/examples/widgets/animation/sub-attaq/states.h +++ b/examples/widgets/animation/sub-attaq/states.h @@ -63,7 +63,7 @@ public: ~PlayState(); protected: - void onEntry(QEvent *); + void onEntry(QEvent *) Q_DECL_OVERRIDE; private : GraphicsScene *scene; @@ -85,7 +85,7 @@ class LevelState : public QState public: LevelState(GraphicsScene *scene, PlayState *game, QState *parent = 0); protected: - void onEntry(QEvent *); + void onEntry(QEvent *) Q_DECL_OVERRIDE; private : void initializeLevel(); GraphicsScene *scene; @@ -98,8 +98,8 @@ public: explicit PauseState(GraphicsScene *scene, QState *parent = 0); protected: - void onEntry(QEvent *); - void onExit(QEvent *); + void onEntry(QEvent *) Q_DECL_OVERRIDE; + void onExit(QEvent *) Q_DECL_OVERRIDE; private : GraphicsScene *scene; }; @@ -110,8 +110,8 @@ public: LostState(GraphicsScene *scene, PlayState *game, QState *parent = 0); protected: - void onEntry(QEvent *); - void onExit(QEvent *); + void onEntry(QEvent *) Q_DECL_OVERRIDE; + void onExit(QEvent *) Q_DECL_OVERRIDE; private : GraphicsScene *scene; PlayState *game; @@ -123,8 +123,8 @@ public: WinState(GraphicsScene *scene, PlayState *game, QState *parent = 0); protected: - void onEntry(QEvent *); - void onExit(QEvent *); + void onEntry(QEvent *) Q_DECL_OVERRIDE; + void onExit(QEvent *) Q_DECL_OVERRIDE; private : GraphicsScene *scene; PlayState *game; @@ -143,7 +143,7 @@ class UpdateScoreTransition : public QSignalTransition public: UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target); protected: - virtual bool eventTest(QEvent *event); + virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE; private: PlayState * game; GraphicsScene *scene; @@ -155,7 +155,7 @@ class WinTransition : public QSignalTransition public: WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target); protected: - virtual bool eventTest(QEvent *event); + virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE; private: PlayState * game; GraphicsScene *scene; @@ -167,7 +167,7 @@ private: public: CustomSpaceTransition(QWidget *widget, PlayState *game, QEvent::Type type, int key); protected: - virtual bool eventTest(QEvent *event); + virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE; private: PlayState *game; }; |