From 3dd96630a2823ff9723a399c84303f565abce455 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Mon, 5 Dec 2016 00:03:04 +0300 Subject: headers: Add missing override and remove redundant virtual Change-Id: Ifa816ebcd79372afca42dbd0dc0ecde006bb688a Reviewed-by: Anton Kudryavtsev Reviewed-by: Simon Hausmann --- src/qml/animations/qabstractanimationjob_p.h | 6 +++--- src/qml/animations/qcontinuinganimationgroupjob_p.h | 12 ++++++------ src/qml/animations/qpauseanimationjob_p.h | 6 +++--- src/qml/animations/qsequentialanimationgroupjob_p.h | 16 ++++++++-------- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/qml/animations') diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h index efc86a5823..95a39b1301 100644 --- a/src/qml/animations/qabstractanimationjob_p.h +++ b/src/qml/animations/qabstractanimationjob_p.h @@ -218,11 +218,11 @@ public: */ static void updateAnimationTimer(); - void restartAnimationTimer(); - void updateAnimationsTime(qint64 timeStep); + void restartAnimationTimer() override; + void updateAnimationsTime(qint64 timeStep) override; //useful for profiling/debugging - int runningAnimationCount() { return animations.count(); } + int runningAnimationCount() override { return animations.count(); } bool hasStartAnimationPending() const { return startAnimationPending; } diff --git a/src/qml/animations/qcontinuinganimationgroupjob_p.h b/src/qml/animations/qcontinuinganimationgroupjob_p.h index f34a118cad..baf4ff1ae5 100644 --- a/src/qml/animations/qcontinuinganimationgroupjob_p.h +++ b/src/qml/animations/qcontinuinganimationgroupjob_p.h @@ -62,14 +62,14 @@ public: QContinuingAnimationGroupJob(); ~QContinuingAnimationGroupJob(); - int duration() const { return -1; } + int duration() const override { return -1; } protected: - void updateCurrentTime(int currentTime); - void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState); - void updateDirection(QAbstractAnimationJob::Direction direction); - void uncontrolledAnimationFinished(QAbstractAnimationJob *animation); - void debugAnimation(QDebug d) const; + void updateCurrentTime(int currentTime) override; + void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState) override; + void updateDirection(QAbstractAnimationJob::Direction direction) override; + void uncontrolledAnimationFinished(QAbstractAnimationJob *animation) override; + void debugAnimation(QDebug d) const override; }; QT_END_NAMESPACE diff --git a/src/qml/animations/qpauseanimationjob_p.h b/src/qml/animations/qpauseanimationjob_p.h index 2967e1cf60..e228f46daa 100644 --- a/src/qml/animations/qpauseanimationjob_p.h +++ b/src/qml/animations/qpauseanimationjob_p.h @@ -62,12 +62,12 @@ public: explicit QPauseAnimationJob(int duration = 250); ~QPauseAnimationJob(); - int duration() const; + int duration() const override; void setDuration(int msecs); protected: - void updateCurrentTime(int); - void debugAnimation(QDebug d) const; + void updateCurrentTime(int) override; + void debugAnimation(QDebug d) const override; private: //definition diff --git a/src/qml/animations/qsequentialanimationgroupjob_p.h b/src/qml/animations/qsequentialanimationgroupjob_p.h index bb481d1322..5fbafcb9ac 100644 --- a/src/qml/animations/qsequentialanimationgroupjob_p.h +++ b/src/qml/animations/qsequentialanimationgroupjob_p.h @@ -63,16 +63,16 @@ public: QSequentialAnimationGroupJob(); ~QSequentialAnimationGroupJob(); - int duration() const; + int duration() const override; QAbstractAnimationJob *currentAnimation() const { return m_currentAnimation; } protected: - void updateCurrentTime(int); - void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState); - void updateDirection(QAbstractAnimationJob::Direction direction); - void uncontrolledAnimationFinished(QAbstractAnimationJob *animation); - void debugAnimation(QDebug d) const; + void updateCurrentTime(int) override; + void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState) override; + void updateDirection(QAbstractAnimationJob::Direction direction) override; + void uncontrolledAnimationFinished(QAbstractAnimationJob *animation) override; + void debugAnimation(QDebug d) const override; private: struct AnimationIndex @@ -91,8 +91,8 @@ private: void setCurrentAnimation(QAbstractAnimationJob *anim, bool intermediate = false); void activateCurrentAnimation(bool intermediate = false); - void animationInserted(QAbstractAnimationJob *anim); - void animationRemoved(QAbstractAnimationJob *anim,QAbstractAnimationJob*,QAbstractAnimationJob*); + void animationInserted(QAbstractAnimationJob *anim) override; + void animationRemoved(QAbstractAnimationJob *anim, QAbstractAnimationJob *, QAbstractAnimationJob *) override; bool atEnd() const; -- cgit v1.2.3