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-17 13:38:45 +0000 |
| commit | f16e0838d19e0bb67562d4015f887743842dd4b0 (patch) | |
| tree | c6693728e4257c45016c7590facc892dda8dcbd5 /src/quick/util/qquickanimator_p.h | |
| parent | 67fe97be1580058ec06de60ab4db7337ba30ff32 (diff) | |
qquickanimator_p.h: add missing 'override'
Change-Id: I509a8f8e6d03b25d939ecf6dac45350a9ed1fb00
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quick/util/qquickanimator_p.h')
| -rw-r--r-- | src/quick/util/qquickanimator_p.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/quick/util/qquickanimator_p.h b/src/quick/util/qquickanimator_p.h index f1e2d4e1d9..807ed6da58 100644 --- a/src/quick/util/qquickanimator_p.h +++ b/src/quick/util/qquickanimator_p.h @@ -86,13 +86,13 @@ public: void setFrom(qreal from); protected: - ThreadingModel threadingModel() const { return RenderThread; } + ThreadingModel threadingModel() const override { return RenderThread; } virtual QQuickAnimatorJob *createJob() const = 0; virtual QString propertyName() const = 0; QAbstractAnimationJob *transition(QQuickStateActions &actions, QQmlProperties &modified, TransitionDirection, - QObject *); + QObject *) override; QQuickAnimator(QQuickAnimatorPrivate &dd, QObject *parent = 0); QQuickAnimator(QObject *parent = 0); @@ -112,8 +112,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickScaleAnimator : public QQuickAnimator public: QQuickScaleAnimator(QObject *parent = 0); protected: - QQuickAnimatorJob *createJob() const; - QString propertyName() const { return QStringLiteral("scale"); } + QQuickAnimatorJob *createJob() const override; + QString propertyName() const override { return QStringLiteral("scale"); } }; class Q_QUICK_PRIVATE_EXPORT QQuickXAnimator : public QQuickAnimator @@ -122,8 +122,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickXAnimator : public QQuickAnimator public: QQuickXAnimator(QObject *parent = 0); protected: - QQuickAnimatorJob *createJob() const; - QString propertyName() const{ return QStringLiteral("x"); } + QQuickAnimatorJob *createJob() const override; + QString propertyName() const override { return QStringLiteral("x"); } }; class Q_QUICK_PRIVATE_EXPORT QQuickYAnimator : public QQuickAnimator @@ -132,8 +132,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickYAnimator : public QQuickAnimator public: QQuickYAnimator(QObject *parent = 0); protected: - QQuickAnimatorJob *createJob() const; - QString propertyName() const { return QStringLiteral("y"); } + QQuickAnimatorJob *createJob() const override; + QString propertyName() const override { return QStringLiteral("y"); } }; class Q_QUICK_PRIVATE_EXPORT QQuickOpacityAnimator : public QQuickAnimator @@ -142,8 +142,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickOpacityAnimator : public QQuickAnimator public: QQuickOpacityAnimator(QObject *parent = 0); protected: - QQuickAnimatorJob *createJob() const; - QString propertyName() const { return QStringLiteral("opacity"); } + QQuickAnimatorJob *createJob() const override; + QString propertyName() const override { return QStringLiteral("opacity"); } }; class QQuickRotationAnimatorPrivate; @@ -166,8 +166,8 @@ Q_SIGNALS: void directionChanged(RotationDirection dir); protected: - QQuickAnimatorJob *createJob() const; - QString propertyName() const { return QStringLiteral("rotation"); } + QQuickAnimatorJob *createJob() const override; + QString propertyName() const override { return QStringLiteral("rotation"); } }; #ifndef QT_NO_OPENGL class QQuickUniformAnimatorPrivate; @@ -187,8 +187,8 @@ Q_SIGNALS: void uniformChanged(const QString &); protected: - QQuickAnimatorJob *createJob() const; - QString propertyName() const; + QQuickAnimatorJob *createJob() const override; + QString propertyName() const override; }; #endif |