aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickanimatorjob_p.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-07-18 21:33:33 -0700
committerThiago Macieira <thiago.macieira@intel.com>2015-07-19 19:18:08 +0000
commit74e2ed4841ac35c9af806eeb0555d492ffc82cb8 (patch)
treebe4e8e4334f443001283346648b2e86264d70d95 /src/quick/util/qquickanimatorjob_p.h
parent7da45b21b76965e021e8a049715b1dee34081f7c (diff)
Consistently use the override keyword
Clang doesn't like when it's inconsistent. Change-Id: Ib306f8f647014b399b87ffff13f23eebda07757b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/quick/util/qquickanimatorjob_p.h')
-rw-r--r--src/quick/util/qquickanimatorjob_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h
index 1cffae17db..f8f40b4705 100644
--- a/src/quick/util/qquickanimatorjob_p.h
+++ b/src/quick/util/qquickanimatorjob_p.h
@@ -63,7 +63,7 @@ public:
QQuickAnimatorProxyJob(QAbstractAnimationJob *job, QObject *item);
~QQuickAnimatorProxyJob();
- int duration() const { return m_duration; }
+ int duration() const Q_DECL_OVERRIDE { return m_duration; }
QAbstractAnimationJob *job() const { return m_job; }
@@ -72,8 +72,8 @@ public:
void markJobManagedByController() { m_jobManagedByController = true; }
protected:
- void updateCurrentTime(int);
- void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState);
+ void updateCurrentTime(int) Q_DECL_OVERRIDE;
+ void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState) Q_DECL_OVERRIDE;
void debugAnimation(QDebug d) const Q_DECL_OVERRIDE;
public Q_SLOTS:
@@ -116,7 +116,7 @@ public:
qreal to() const { return m_to; }
void setDuration(int duration) { m_duration = duration; }
- int duration() const { return m_duration; }
+ int duration() const Q_DECL_OVERRIDE { return m_duration; }
QEasingCurve easingCurve() const { return m_easing; }
void setEasingCurve(const QEasingCurve &curve) { m_easing = curve; }