diff options
| author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-09-15 17:07:26 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-09-20 09:25:57 +0000 |
| commit | 2de792d92dd8af9465ba892e1cf9ab029ff18ad5 (patch) | |
| tree | 55102d0838e4f948a3a745d74b7e36753bdabfe2 /src/quick/util/qquicksmoothedanimation_p.h | |
| parent | 54212aae63f47732fd725fd011a4a6dee6121c83 (diff) | |
Quick utils: add missing 'override'
... and drop redundant 'virtual'
Change-Id: I348ac87776f39f06640534bccf852a624a3d0cd2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quick/util/qquicksmoothedanimation_p.h')
| -rw-r--r-- | src/quick/util/qquicksmoothedanimation_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/util/qquicksmoothedanimation_p.h b/src/quick/util/qquicksmoothedanimation_p.h index d640985b39..2f0e3bc0d8 100644 --- a/src/quick/util/qquicksmoothedanimation_p.h +++ b/src/quick/util/qquicksmoothedanimation_p.h @@ -79,8 +79,8 @@ public: ReversingMode reversingMode() const; void setReversingMode(ReversingMode); - virtual int duration() const; - virtual void setDuration(int); + int duration() const override; + void setDuration(int) override; qreal velocity() const; void setVelocity(qreal); @@ -88,10 +88,10 @@ public: int maximumEasingTime() const; void setMaximumEasingTime(int); - virtual QAbstractAnimationJob* transition(QQuickStateActions &actions, + QAbstractAnimationJob* transition(QQuickStateActions &actions, QQmlProperties &modified, TransitionDirection direction, - QObject *defaultTarget = 0); + QObject *defaultTarget = 0) override; Q_SIGNALS: void velocityChanged(); void reversingModeChanged(); |