aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquicktransition.cpp
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-10-07 14:40:12 +0300
committerAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-10-07 13:48:52 +0000
commitb6412090f37aa855525ec7615c5d28e94b4d40c9 (patch)
tree3b5e90c6e43a94cdba155334e4b55a2dcea7f89f /src/quick/util/qquicktransition.cpp
parentd9b6b259068a5c6d32db8c32b60ea4903587103b (diff)
Quick: add missing 'override'
... and drop redundant 'virtual' Change-Id: Ifb887b149226769d3168f349ddccf0ee1d51bb1c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quick/util/qquicktransition.cpp')
-rw-r--r--src/quick/util/qquicktransition.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp
index c8b5482c87..1d258d84bf 100644
--- a/src/quick/util/qquicktransition.cpp
+++ b/src/quick/util/qquicktransition.cpp
@@ -106,7 +106,7 @@ public:
QQuickTransitionManager *manager;
protected:
- virtual void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState);
+ void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState) override;
};
class QQuickTransitionPrivate : public QObjectPrivate, QAnimationJobChangeListener
@@ -134,7 +134,7 @@ public:
bool reversible;
bool enabled;
protected:
- virtual void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State, QAbstractAnimationJob::State);
+ void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State, QAbstractAnimationJob::State) override;
static void append_animation(QQmlListProperty<QQuickAbstractAnimation> *list, QQuickAbstractAnimation *a);
static int animation_count(QQmlListProperty<QQuickAbstractAnimation> *list);