diff options
Diffstat (limited to 'tests/auto/corelib/animation')
7 files changed, 24 insertions, 24 deletions
diff --git a/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp b/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp index 66a752df5d..b490e5ca72 100644 --- a/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp +++ b/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp @@ -58,8 +58,8 @@ public: TestableQAbstractAnimation() : m_duration(10) {} virtual ~TestableQAbstractAnimation() {}; - int duration() const { return m_duration; } - virtual void updateCurrentTime(int) {} + int duration() const override { return m_duration; } + virtual void updateCurrentTime(int) override {} void setDuration(int duration) { m_duration = duration; } private: @@ -70,8 +70,8 @@ class DummyQAnimationGroup : public QAnimationGroup { Q_OBJECT public: - int duration() const { return 10; } - virtual void updateCurrentTime(int) {} + int duration() const override { return 10; } + virtual void updateCurrentTime(int) override {} }; void tst_QAbstractAnimation::construction() diff --git a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp index 8fc6d1ac61..cf46d5c14e 100644 --- a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp +++ b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp @@ -79,9 +79,9 @@ class TestAnimation : public QVariantAnimation { Q_OBJECT public: - virtual void updateCurrentValue(const QVariant &value) { Q_UNUSED(value)}; + virtual void updateCurrentValue(const QVariant &value) override { Q_UNUSED(value)}; virtual void updateState(QAbstractAnimation::State oldState, - QAbstractAnimation::State newState) + QAbstractAnimation::State newState) override { Q_UNUSED(oldState); Q_UNUSED(newState); @@ -98,10 +98,10 @@ public: setDuration(250); } - int duration() const { return -1; /* not time driven */ } + int duration() const override { return -1; /* not time driven */ } protected: - void timerEvent(QTimerEvent *event) + void timerEvent(QTimerEvent *event) override { if (event->timerId() == id) stop(); diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp index 8b36a7a246..fa30659d89 100644 --- a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp +++ b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp @@ -92,9 +92,9 @@ class TestAnimation : public QVariantAnimation { Q_OBJECT public: - virtual void updateCurrentValue(const QVariant &value) { Q_UNUSED(value)}; + virtual void updateCurrentValue(const QVariant &value) override { Q_UNUSED(value)}; virtual void updateState(QAbstractAnimation::State newState, - QAbstractAnimation::State oldState) + QAbstractAnimation::State oldState) override { Q_UNUSED(oldState); Q_UNUSED(newState); @@ -108,15 +108,15 @@ public: TestAnimation2(QAbstractAnimation *animation) : QVariantAnimation(animation) {} TestAnimation2(int duration, QAbstractAnimation *animation) : QVariantAnimation(animation), m_duration(duration) {} - virtual void updateCurrentValue(const QVariant &value) { Q_UNUSED(value)}; + virtual void updateCurrentValue(const QVariant &value) override { Q_UNUSED(value)}; virtual void updateState(QAbstractAnimation::State newState, - QAbstractAnimation::State oldState) + QAbstractAnimation::State oldState) override { Q_UNUSED(oldState); Q_UNUSED(newState); }; - virtual int duration() const { + virtual int duration() const override { return m_duration; } private: @@ -134,10 +134,10 @@ public: setEndValue(0); } - int duration() const { return -1; /* not time driven */ } + int duration() const override { return -1; /* not time driven */ } protected: - void timerEvent(QTimerEvent *event) + void timerEvent(QTimerEvent *event) override { if (event->timerId() == id) stop(); diff --git a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp index 290c2abc98..a38f3d221d 100644 --- a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp +++ b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp @@ -64,7 +64,7 @@ public: int m_updateCurrentTimeCount; protected: - void updateCurrentTime(int currentTime) + void updateCurrentTime(int currentTime) override { QPauseAnimation::updateCurrentTime(currentTime); ++m_updateCurrentTimeCount; diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp index e1377ab2a3..5add27bbee 100644 --- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp @@ -39,10 +39,10 @@ class UncontrolledAnimation : public QPropertyAnimation { Q_OBJECT public: - int duration() const { return -1; /* not time driven */ } + int duration() const override { return -1; /* not time driven */ } protected: - void updateCurrentTime(int currentTime) + void updateCurrentTime(int currentTime) override { QPropertyAnimation::updateCurrentTime(currentTime); if (currentTime >= QPropertyAnimation::duration() || currentLoop() >= 1) @@ -1283,7 +1283,7 @@ public: innerAnim->start(); } - void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) + void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override { QPropertyAnimation::updateState(newState, oldState); if (newState == QAbstractAnimation::Stopped) diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp index 1ea2ab7bd2..008ac696fc 100644 --- a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp @@ -96,9 +96,9 @@ class TestAnimation : public QVariantAnimation { Q_OBJECT public: - virtual void updateCurrentValue(const QVariant &value) { Q_UNUSED(value)}; + virtual void updateCurrentValue(const QVariant &value) override { Q_UNUSED(value)}; virtual void updateState(QAbstractAnimation::State newState, - QAbstractAnimation::State oldState) + QAbstractAnimation::State oldState) override { Q_UNUSED(oldState); Q_UNUSED(newState); @@ -129,10 +129,10 @@ public: setEndValue(0); } - int duration() const { return -1; /* not time driven */ } + int duration() const override { return -1; /* not time driven */ } protected: - void updateCurrentTime(int currentTime) + void updateCurrentTime(int currentTime) override { QPropertyAnimation::updateCurrentTime(currentTime); if (currentTime >= QPropertyAnimation::duration()) diff --git a/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp b/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp index ac20fb35ec..724db5ae21 100644 --- a/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp +++ b/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp @@ -50,7 +50,7 @@ class TestableQVariantAnimation : public QVariantAnimation { Q_OBJECT public: - void updateCurrentValue(const QVariant&) {} + void updateCurrentValue(const QVariant&) override {} }; void tst_QVariantAnimation::construction() |