Quick utils: add missing 'override'

... and drop redundant 'virtual'

Change-Id: I348ac87776f39f06640534bccf852a624a3d0cd2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

12 files changed, 62 insertions, 62 deletions

diff --git a/src/quick/util/qquickanimation_p.h b/src/quick/util/qquickanimation_p.h
index 145f2656d2..e27871dcaa 100644
--- a/src/quick/util/qquickanimation_p.h
+++ b/src/quick/util/qquickanimation_p.h
@@ -114,8 +114,8 @@ public:
     void setDisableUserControl();
     void setEnableUserControl();
     bool userControlDisabled() const;
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
     virtual ThreadingModel threadingModel() const;
 
@@ -150,7 +150,7 @@ public:
 private Q_SLOTS:
     void componentFinalized();
 private:
-    virtual void setTarget(const QQmlProperty &);
+    void setTarget(const QQmlProperty &) override;
     void notifyRunningChanged(bool running);
     friend class QQuickBehavior;
     friend class QQuickBehaviorPrivate;
@@ -179,7 +179,7 @@ protected:
     QAbstractAnimationJob* transition(QQuickStateActions &actions,
                                           QQmlProperties &modified,
                                           TransitionDirection direction,
-                                          QObject *defaultTarget = 0);
+                                          QObject *defaultTarget = 0) override;
 };
 
 class QQuickScriptActionPrivate;
@@ -202,10 +202,10 @@ public:
     void setStateChangeScriptName(const QString &);
 
 protected:
-    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+    QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0);
+                            QObject *defaultTarget = 0) override;
 };
 
 class QQuickPropertyActionPrivate;
@@ -247,10 +247,10 @@ Q_SIGNALS:
     void propertyChanged();
 
 protected:
-    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+    QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0);
+                            QObject *defaultTarget = 0) override;
 };
 
 class QQuickPropertyAnimationPrivate;
@@ -303,10 +303,10 @@ protected:
                                                      QObject *defaultTarget = 0);
 
     QQuickPropertyAnimation(QQuickPropertyAnimationPrivate &dd, QObject *parent);
-    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+    QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0);
+                            QObject *defaultTarget = 0) override;
 Q_SIGNALS:
     void durationChanged(int);
     void fromChanged(const QVariant &);
@@ -438,11 +438,11 @@ public:
     virtual ~QQuickSequentialAnimation();
 
 protected:
-    virtual ThreadingModel threadingModel() const;
-    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+    ThreadingModel threadingModel() const override;
+    QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0);
+                            QObject *defaultTarget = 0) override;
 };
 
 class Q_QUICK_PRIVATE_EXPORT QQuickParallelAnimation : public QQuickAnimationGroup
@@ -455,11 +455,11 @@ public:
     virtual ~QQuickParallelAnimation();
 
 protected:
-    virtual ThreadingModel threadingModel() const;
-    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+    ThreadingModel threadingModel() const override;
+    QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0);
+                            QObject *defaultTarget = 0) override;
 };
 
 
diff --git a/src/quick/util/qquickanimation_p_p.h b/src/quick/util/qquickanimation_p_p.h
index ea7bf62171..59e0e9821a 100644
--- a/src/quick/util/qquickanimation_p_p.h
+++ b/src/quick/util/qquickanimation_p_p.h
@@ -104,13 +104,13 @@ public:
     QActionAnimation(QAbstractAnimationAction *action);
     ~QActionAnimation();
 
-    virtual int duration() const;
+    int duration() const override;
     void setAnimAction(QAbstractAnimationAction *action);
 
 protected:
-    virtual void updateCurrentTime(int);
-    virtual void updateState(State newState, State oldState);
-    void debugAnimation(QDebug d) const;
+    void updateCurrentTime(int) override;
+    void updateState(State newState, State oldState) override;
+    void debugAnimation(QDebug d) const override;
 
 private:
     QAbstractAnimationAction *animAction;
@@ -137,16 +137,16 @@ public:
 
     void setFromSourcedValue(bool *value) { fromSourced = value; }
 
-    int duration() const { return m_duration; }
+    int duration() const override { return m_duration; }
     void setDuration(int msecs) { m_duration = msecs; }
 
     QEasingCurve easingCurve() const { return easing; }
     void setEasingCurve(const QEasingCurve &curve) { easing = curve; }
 
 protected:
-    void updateCurrentTime(int currentTime);
-    void topLevelAnimationLoopChanged();
-    void debugAnimation(QDebug d) const;
+    void updateCurrentTime(int currentTime) override;
+    void topLevelAnimationLoopChanged() override;
+    void debugAnimation(QDebug d) const override;
 
 private:
     QQuickBulkValueUpdater *animValue;
@@ -162,9 +162,9 @@ class QTickAnimationProxy : public QAbstractAnimationJob
     Q_DISABLE_COPY(QTickAnimationProxy)
 public:
     QTickAnimationProxy(T *instance) : QAbstractAnimationJob(), m_instance(instance) {}
-    virtual int duration() const { return -1; }
+    int duration() const override { return -1; }
 protected:
-    virtual void updateCurrentTime(int msec) { (m_instance->*method)(msec); }
+    void updateCurrentTime(int msec) override { (m_instance->*method)(msec); }
 
 private:
     T *m_instance;
@@ -192,7 +192,7 @@ public:
     int loopCount;
 
     void commence();
-    virtual void animationFinished(QAbstractAnimationJob *);
+    void animationFinished(QAbstractAnimationJob *) override;
 
     QQmlProperty defaultProperty;
 
@@ -309,9 +309,9 @@ public:
     QQuickAnimationPropertyUpdater() : interpolatorType(0), interpolator(0), prevInterpolatorType(0), reverse(false), fromSourced(false), fromDefined(false), wasDeleted(0) {}
     ~QQuickAnimationPropertyUpdater();
 
-    void setValue(qreal v);
+    void setValue(qreal v) override;
 
-    void debugUpdater(QDebug d, int indentLevel) const;
+    void debugUpdater(QDebug d, int indentLevel) const override;
 
     QQuickStateActions actions;
     int interpolatorType;       //for Number/ColorAnimation
diff --git a/src/quick/util/qquickanimatorcontroller_p.h b/src/quick/util/qquickanimatorcontroller_p.h
index 0a9902cc30..b63518abad 100644
--- a/src/quick/util/qquickanimatorcontroller_p.h
+++ b/src/quick/util/qquickanimatorcontroller_p.h
@@ -74,8 +74,8 @@ public:
     void beforeNodeSync();
     void afterNodeSync();
 
-    void animationFinished(QAbstractAnimationJob *job);
-    void animationStateChanged(QAbstractAnimationJob *job, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState);
+    void animationFinished(QAbstractAnimationJob *job) override;
+    void animationStateChanged(QAbstractAnimationJob *job, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState) override;
 
     void requestSync();
 
diff --git a/src/quick/util/qquickbehavior_p.h b/src/quick/util/qquickbehavior_p.h
index c3438d8c6d..b3fd2af400 100644
--- a/src/quick/util/qquickbehavior_p.h
+++ b/src/quick/util/qquickbehavior_p.h
@@ -75,8 +75,8 @@ public:
     QQuickBehavior(QObject *parent=0);
     ~QQuickBehavior();
 
-    virtual void setTarget(const QQmlProperty &);
-    virtual void write(const QVariant &value);
+    void setTarget(const QQmlProperty &) override;
+    void write(const QVariant &value) override;
 
     QQuickAbstractAnimation *animation();
     void setAnimation(QQuickAbstractAnimation *);
diff --git a/src/quick/util/qquickimageprovider.h b/src/quick/util/qquickimageprovider.h
index d4719a7f5b..879c4d0fcc 100644
--- a/src/quick/util/qquickimageprovider.h
+++ b/src/quick/util/qquickimageprovider.h
@@ -90,8 +90,8 @@ public:
     QQuickImageProvider(ImageType type, Flags flags = Flags());
     virtual ~QQuickImageProvider();
 
-    ImageType imageType() const;
-    Flags flags() const;
+    ImageType imageType() const override;
+    Flags flags() const override;
 
 #if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
     virtual QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize, bool requestedAutoTransform);
diff --git a/src/quick/util/qquickpath_p.h b/src/quick/util/qquickpath_p.h
index fa6cbc668a..59f1ff3c69 100644
--- a/src/quick/util/qquickpath_p.h
+++ b/src/quick/util/qquickpath_p.h
@@ -152,7 +152,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathLine : public QQuickCurve
 public:
     QQuickPathLine(QObject *parent=0) : QQuickCurve(parent) {}
 
-    void addToPath(QPainterPath &path, const QQuickPathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &) override;
 };
 
 class Q_QUICK_PRIVATE_EXPORT QQuickPathQuad : public QQuickCurve
@@ -180,7 +180,7 @@ public:
     void setRelativeControlY(qreal y);
     bool hasRelativeControlY();
 
-    void addToPath(QPainterPath &path, const QQuickPathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &) override;
 
 Q_SIGNALS:
     void controlXChanged();
@@ -238,7 +238,7 @@ public:
     void setRelativeControl2Y(qreal y);
     bool hasRelativeControl2Y();
 
-    void addToPath(QPainterPath &path, const QQuickPathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &) override;
 
 Q_SIGNALS:
     void control1XChanged();
@@ -267,7 +267,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathCatmullRomCurve : public QQuickCurve
 public:
     QQuickPathCatmullRomCurve(QObject *parent=0) : QQuickCurve(parent) {}
 
-    void addToPath(QPainterPath &path, const QQuickPathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &) override;
 };
 
 class Q_QUICK_PRIVATE_EXPORT QQuickPathArc : public QQuickCurve
@@ -297,7 +297,7 @@ public:
     ArcDirection direction() const;
     void setDirection(ArcDirection direction);
 
-    void addToPath(QPainterPath &path, const QQuickPathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &) override;
 
 Q_SIGNALS:
     void radiusXChanged();
@@ -322,7 +322,7 @@ public:
     QString path() const;
     void setPath(const QString &path);
 
-    void addToPath(QPainterPath &path, const QQuickPathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &) override;
 
 Q_SIGNALS:
     void pathChanged();
@@ -401,8 +401,8 @@ Q_SIGNALS:
     void startYChanged();
 
 protected:
-    virtual void componentComplete();
-    virtual void classBegin();
+    void componentComplete() override;
+    void classBegin() override;
     void disconnectPathElements();
     void connectPathElements();
     void gatherAttributes();
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();
diff --git a/src/quick/util/qquicksmoothedanimation_p_p.h b/src/quick/util/qquicksmoothedanimation_p_p.h
index 4a61599592..a415fdb55f 100644
--- a/src/quick/util/qquicksmoothedanimation_p_p.h
+++ b/src/quick/util/qquicksmoothedanimation_p_p.h
@@ -93,7 +93,7 @@ public:
 
     QQmlProperty target;
 
-    int duration() const;
+    int duration() const override;
     void restart();
     void init();
 
@@ -101,9 +101,9 @@ public:
     void clearTemplate() { animationTemplate = 0; }
 
 protected:
-    virtual void updateCurrentTime(int);
-    virtual void updateState(QAbstractAnimationJob::State, QAbstractAnimationJob::State);
-    void debugAnimation(QDebug d) const;
+    void updateCurrentTime(int) override;
+    void updateState(QAbstractAnimationJob::State, QAbstractAnimationJob::State) override;
+    void debugAnimation(QDebug d) const override;
 
 private:
     qreal easeFollow(qreal);
diff --git a/src/quick/util/qquickspringanimation_p.h b/src/quick/util/qquickspringanimation_p.h
index 141a2469d7..ffb2c41e6b 100644
--- a/src/quick/util/qquickspringanimation_p.h
+++ b/src/quick/util/qquickspringanimation_p.h
@@ -94,10 +94,10 @@ public:
     qreal modulus() const;
     void setModulus(qreal modulus);
 
-    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+    QAbstractAnimationJob* transition(QQuickStateActions &actions,
                             QQmlProperties &modified,
                             TransitionDirection direction,
-                            QObject *defaultTarget = 0);
+                            QObject *defaultTarget = 0) override;
 
 Q_SIGNALS:
     void modulusChanged();
diff --git a/src/quick/util/qquickstatechangescript_p.h b/src/quick/util/qquickstatechangescript_p.h
index 0c17b7c68c..a1315ae2ef 100644
--- a/src/quick/util/qquickstatechangescript_p.h
+++ b/src/quick/util/qquickstatechangescript_p.h
@@ -69,9 +69,9 @@ public:
     QQuickStateChangeScript(QObject *parent=0);
     ~QQuickStateChangeScript();
 
-    virtual ActionList actions();
+    ActionList actions() override;
 
-    virtual EventType type() const;
+    EventType type() const override;
 
     QQmlScriptString script() const;
     void setScript(const QQmlScriptString &);
@@ -79,7 +79,7 @@ public:
     QString name() const;
     void setName(const QString &);
 
-    virtual void execute();
+    void execute() override;
 };
 
 
diff --git a/src/quick/util/qquickstategroup_p.h b/src/quick/util/qquickstategroup_p.h
index 78508ac166..eebe3a9e56 100644
--- a/src/quick/util/qquickstategroup_p.h
+++ b/src/quick/util/qquickstategroup_p.h
@@ -81,8 +81,8 @@ public:
     QQuickState *findState(const QString &name) const;
     void removeState(QQuickState *state);
 
-    virtual void classBegin();
-    virtual void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 Q_SIGNALS:
     void stateChanged(const QString &);
 
diff --git a/src/quick/util/qquicktimeline_p_p.h b/src/quick/util/qquicktimeline_p_p.h
index 552f194b79..ae1087487b 100644
--- a/src/quick/util/qquicktimeline_p_p.h
+++ b/src/quick/util/qquicktimeline_p_p.h
@@ -100,14 +100,14 @@ public:
 
     int time() const;
 
-    virtual int duration() const;
+    int duration() const override;
 Q_SIGNALS:
     void updated();
     void completed();
 
 protected:
-    virtual void updateCurrentTime(int);
-    void debugAnimation(QDebug d) const;
+    void updateCurrentTime(int) override;
+    void debugAnimation(QDebug d) const override;
 
 private:
     void remove(QQuickTimeLineObject *);
@@ -181,7 +181,7 @@ public:
         Q_ASSERT(_class);
     }
 
-    virtual void setValue(qreal v)
+    void setValue(qreal v) override
     {
         QQuickTimeLineValue::setValue(v);
         if (_setFunctionReal) (_class->*_setFunctionReal)(v);