diff options
author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-10-07 14:48:46 +0300 |
---|---|---|
committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-10-07 13:49:02 +0000 |
commit | cc2bd9708b4134dcc04d0d84685622b113c0056a (patch) | |
tree | dc50e8d11ea82294152201c64c89088b337761f2 /src/qml/animations | |
parent | b6412090f37aa855525ec7615c5d28e94b4d40c9 (diff) |
Qml: add missing 'override'
... and drop redundant 'virtual'
Change-Id: Ib1f68c1ebd0468cb4a77eecc986bbf718f6bf789
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/animations')
-rw-r--r-- | src/qml/animations/qanimationgroupjob_p.h | 2 | ||||
-rw-r--r-- | src/qml/animations/qparallelanimationgroupjob_p.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/animations/qanimationgroupjob_p.h b/src/qml/animations/qanimationgroupjob_p.h index 9bcd63127a..26965c0264 100644 --- a/src/qml/animations/qanimationgroupjob_p.h +++ b/src/qml/animations/qanimationgroupjob_p.h @@ -75,7 +75,7 @@ public: //called by QAbstractAnimationJob virtual void uncontrolledAnimationFinished(QAbstractAnimationJob *animation); protected: - void topLevelAnimationLoopChanged(); + void topLevelAnimationLoopChanged() override; virtual void animationInserted(QAbstractAnimationJob*) { } virtual void animationRemoved(QAbstractAnimationJob*, QAbstractAnimationJob*, QAbstractAnimationJob*); diff --git a/src/qml/animations/qparallelanimationgroupjob_p.h b/src/qml/animations/qparallelanimationgroupjob_p.h index 3e914c3e76..358b95ce53 100644 --- a/src/qml/animations/qparallelanimationgroupjob_p.h +++ b/src/qml/animations/qparallelanimationgroupjob_p.h @@ -62,14 +62,14 @@ public: QParallelAnimationGroupJob(); ~QParallelAnimationGroupJob(); - int duration() const; + int duration() const override; protected: - void updateCurrentTime(int currentTime); - void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState); - void updateDirection(QAbstractAnimationJob::Direction direction); - void uncontrolledAnimationFinished(QAbstractAnimationJob *animation); - void debugAnimation(QDebug d) const; + void updateCurrentTime(int currentTime) override; + void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState) override; + void updateDirection(QAbstractAnimationJob::Direction direction) override; + void uncontrolledAnimationFinished(QAbstractAnimationJob *animation) override; + void debugAnimation(QDebug d) const override; private: bool shouldAnimationStart(QAbstractAnimationJob *animation, bool startIfAtEnd) const; |