headers: Add missing override and remove redundant virtual

Change-Id: Ifa816ebcd79372afca42dbd0dc0ecde006bb688a
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

12 files changed, 88 insertions, 88 deletions

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;
 
diff --git a/src/qml/jit/qv4isel_masm_p.h b/src/qml/jit/qv4isel_masm_p.h
index 5c693e0736..012745c5f2 100644
--- a/src/qml/jit/qv4isel_masm_p.h
+++ b/src/qml/jit/qv4isel_masm_p.h
@@ -80,61 +80,61 @@ public:
     InstructionSelection(QQmlEnginePrivate *qmlEngine, QV4::ExecutableAllocator *execAllocator, IR::Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator, EvalISelFactory *iselFactory);
     ~InstructionSelection();
 
-    virtual void run(int functionIndex);
+    void run(int functionIndex) override;
 
 protected:
-    virtual QQmlRefPointer<QV4::CompiledData::CompilationUnit> backendCompileStep();
-
-    virtual void callBuiltinInvalid(IR::Name *func, IR::ExprList *args, IR::Expr *result);
-    virtual void callBuiltinTypeofQmlContextProperty(IR::Expr *base, IR::Member::MemberKind kind, int propertyIndex, IR::Expr *result);
-    virtual void callBuiltinTypeofMember(IR::Expr *base, const QString &name, IR::Expr *result);
-    virtual void callBuiltinTypeofSubscript(IR::Expr *base, IR::Expr *index, IR::Expr *result);
-    virtual void callBuiltinTypeofName(const QString &name, IR::Expr *result);
-    virtual void callBuiltinTypeofValue(IR::Expr *value, IR::Expr *result);
-    virtual void callBuiltinDeleteMember(IR::Expr *base, const QString &name, IR::Expr *result);
-    virtual void callBuiltinDeleteSubscript(IR::Expr *base, IR::Expr *index, IR::Expr *result);
-    virtual void callBuiltinDeleteName(const QString &name, IR::Expr *result);
-    virtual void callBuiltinDeleteValue(IR::Expr *result);
-    virtual void callBuiltinThrow(IR::Expr *arg);
-    virtual void callBuiltinReThrow();
-    virtual void callBuiltinUnwindException(IR::Expr *);
-    virtual void callBuiltinPushCatchScope(const QString &exceptionName);
-    virtual void callBuiltinForeachIteratorObject(IR::Expr *arg, IR::Expr *result);
-    virtual void callBuiltinForeachNextPropertyname(IR::Expr *arg, IR::Expr *result);
-    virtual void callBuiltinPushWithScope(IR::Expr *arg);
-    virtual void callBuiltinPopScope();
-    virtual void callBuiltinDeclareVar(bool deletable, const QString &name);
-    virtual void callBuiltinDefineArray(IR::Expr *result, IR::ExprList *args);
-    virtual void callBuiltinDefineObjectLiteral(IR::Expr *result, int keyValuePairCount, IR::ExprList *keyValuePairs, IR::ExprList *arrayEntries, bool needSparseArray);
-    virtual void callBuiltinSetupArgumentObject(IR::Expr *result);
-    virtual void callBuiltinConvertThisToObject();
-    virtual void callValue(IR::Expr *value, IR::ExprList *args, IR::Expr *result);
-    virtual void callQmlContextProperty(IR::Expr *base, IR::Member::MemberKind kind, int propertyIndex, IR::ExprList *args, IR::Expr *result);
-    virtual void callProperty(IR::Expr *base, const QString &name, IR::ExprList *args, IR::Expr *result);
-    virtual void callSubscript(IR::Expr *base, IR::Expr *index, IR::ExprList *args, IR::Expr *result);
-    virtual void convertType(IR::Expr *source, IR::Expr *target);
-    virtual void loadThisObject(IR::Expr *temp);
-    virtual void loadQmlContext(IR::Expr *target);
-    virtual void loadQmlImportedScripts(IR::Expr *target);
-    virtual void loadQmlSingleton(const QString &name, IR::Expr *target);
-    virtual void loadConst(IR::Const *sourceConst, IR::Expr *target);
-    virtual void loadString(const QString &str, IR::Expr *target);
-    virtual void loadRegexp(IR::RegExp *sourceRegexp, IR::Expr *target);
-    virtual void getActivationProperty(const IR::Name *name, IR::Expr *target);
-    virtual void setActivationProperty(IR::Expr *source, const QString &targetName);
-    virtual void initClosure(IR::Closure *closure, IR::Expr *target);
-    virtual void getProperty(IR::Expr *base, const QString &name, IR::Expr *target);
-    virtual void getQmlContextProperty(IR::Expr *source, IR::Member::MemberKind kind, int index, bool captureRequired, IR::Expr *target);
-    virtual void getQObjectProperty(IR::Expr *base, int propertyIndex, bool captureRequired, bool isSingleton, int attachedPropertiesId, IR::Expr *target);
-    virtual void setProperty(IR::Expr *source, IR::Expr *targetBase, const QString &targetName);
-    virtual void setQmlContextProperty(IR::Expr *source, IR::Expr *targetBase, IR::Member::MemberKind kind, int propertyIndex);
-    virtual void setQObjectProperty(IR::Expr *source, IR::Expr *targetBase, int propertyIndex);
-    virtual void getElement(IR::Expr *base, IR::Expr *index, IR::Expr *target);
-    virtual void setElement(IR::Expr *source, IR::Expr *targetBase, IR::Expr *targetIndex);
-    virtual void copyValue(IR::Expr *source, IR::Expr *target);
-    virtual void swapValues(IR::Expr *source, IR::Expr *target);
-    virtual void unop(IR::AluOp oper, IR::Expr *sourceTemp, IR::Expr *target);
-    virtual void binop(IR::AluOp oper, IR::Expr *leftSource, IR::Expr *rightSource, IR::Expr *target);
+    QQmlRefPointer<QV4::CompiledData::CompilationUnit> backendCompileStep() override;
+
+    void callBuiltinInvalid(IR::Name *func, IR::ExprList *args, IR::Expr *result) override;
+    void callBuiltinTypeofQmlContextProperty(IR::Expr *base, IR::Member::MemberKind kind, int propertyIndex, IR::Expr *result) override;
+    void callBuiltinTypeofMember(IR::Expr *base, const QString &name, IR::Expr *result) override;
+    void callBuiltinTypeofSubscript(IR::Expr *base, IR::Expr *index, IR::Expr *result) override;
+    void callBuiltinTypeofName(const QString &name, IR::Expr *result) override;
+    void callBuiltinTypeofValue(IR::Expr *value, IR::Expr *result) override;
+    void callBuiltinDeleteMember(IR::Expr *base, const QString &name, IR::Expr *result) override;
+    void callBuiltinDeleteSubscript(IR::Expr *base, IR::Expr *index, IR::Expr *result) override;
+    void callBuiltinDeleteName(const QString &name, IR::Expr *result) override;
+    void callBuiltinDeleteValue(IR::Expr *result) override;
+    void callBuiltinThrow(IR::Expr *arg) override;
+    void callBuiltinReThrow() override;
+    void callBuiltinUnwindException(IR::Expr *) override;
+    void callBuiltinPushCatchScope(const QString &exceptionName) override;
+    void callBuiltinForeachIteratorObject(IR::Expr *arg, IR::Expr *result) override;
+    void callBuiltinForeachNextPropertyname(IR::Expr *arg, IR::Expr *result) override;
+    void callBuiltinPushWithScope(IR::Expr *arg) override;
+    void callBuiltinPopScope() override;
+    void callBuiltinDeclareVar(bool deletable, const QString &name) override;
+    void callBuiltinDefineArray(IR::Expr *result, IR::ExprList *args) override;
+    void callBuiltinDefineObjectLiteral(IR::Expr *result, int keyValuePairCount, IR::ExprList *keyValuePairs, IR::ExprList *arrayEntries, bool needSparseArray) override;
+    void callBuiltinSetupArgumentObject(IR::Expr *result) override;
+    void callBuiltinConvertThisToObject() override;
+    void callValue(IR::Expr *value, IR::ExprList *args, IR::Expr *result) override;
+    void callQmlContextProperty(IR::Expr *base, IR::Member::MemberKind kind, int propertyIndex, IR::ExprList *args, IR::Expr *result) override;
+    void callProperty(IR::Expr *base, const QString &name, IR::ExprList *args, IR::Expr *result) override;
+    void callSubscript(IR::Expr *base, IR::Expr *index, IR::ExprList *args, IR::Expr *result) override;
+    void convertType(IR::Expr *source, IR::Expr *target) override;
+    void loadThisObject(IR::Expr *temp) override;
+    void loadQmlContext(IR::Expr *target) override;
+    void loadQmlImportedScripts(IR::Expr *target) override;
+    void loadQmlSingleton(const QString &name, IR::Expr *target) override;
+    void loadConst(IR::Const *sourceConst, IR::Expr *target) override;
+    void loadString(const QString &str, IR::Expr *target) override;
+    void loadRegexp(IR::RegExp *sourceRegexp, IR::Expr *target) override;
+    void getActivationProperty(const IR::Name *name, IR::Expr *target) override;
+    void setActivationProperty(IR::Expr *source, const QString &targetName) override;
+    void initClosure(IR::Closure *closure, IR::Expr *target) override;
+    void getProperty(IR::Expr *base, const QString &name, IR::Expr *target) override;
+    void getQmlContextProperty(IR::Expr *source, IR::Member::MemberKind kind, int index, bool captureRequired, IR::Expr *target) override;
+    void getQObjectProperty(IR::Expr *base, int propertyIndex, bool captureRequired, bool isSingleton, int attachedPropertiesId, IR::Expr *target) override;
+    void setProperty(IR::Expr *source, IR::Expr *targetBase, const QString &targetName) override;
+    void setQmlContextProperty(IR::Expr *source, IR::Expr *targetBase, IR::Member::MemberKind kind, int propertyIndex) override;
+    void setQObjectProperty(IR::Expr *source, IR::Expr *targetBase, int propertyIndex) override;
+    void getElement(IR::Expr *base, IR::Expr *index, IR::Expr *target) override;
+    void setElement(IR::Expr *source, IR::Expr *targetBase, IR::Expr *targetIndex) override;
+    void copyValue(IR::Expr *source, IR::Expr *target) override;
+    void swapValues(IR::Expr *source, IR::Expr *target) override;
+    void unop(IR::AluOp oper, IR::Expr *sourceTemp, IR::Expr *target) override;
+    void binop(IR::AluOp oper, IR::Expr *leftSource, IR::Expr *rightSource, IR::Expr *target) override;
 
     typedef Assembler::Address Address;
     typedef Assembler::Pointer Pointer;
@@ -159,13 +159,13 @@ protected:
         return _as->stackLayout().callDataAddress();
     }
 
-    virtual void constructActivationProperty(IR::Name *func, IR::ExprList *args, IR::Expr *result);
-    virtual void constructProperty(IR::Expr *base, const QString &name, IR::ExprList *args, IR::Expr*result);
-    virtual void constructValue(IR::Expr *value, IR::ExprList *args, IR::Expr *result);
+    void constructActivationProperty(IR::Name *func, IR::ExprList *args, IR::Expr *result) override;
+    void constructProperty(IR::Expr *base, const QString &name, IR::ExprList *args, IR::Expr*result) override;
+    void constructValue(IR::Expr *value, IR::ExprList *args, IR::Expr *result) override;
 
-    virtual void visitJump(IR::Jump *);
-    virtual void visitCJump(IR::CJump *);
-    virtual void visitRet(IR::Ret *);
+    void visitJump(IR::Jump *) override;
+    void visitCJump(IR::CJump *) override;
+    void visitRet(IR::Ret *) override;
 
     bool visitCJumpDouble(IR::AluOp op, IR::Expr *left, IR::Expr *right,
                           IR::BasicBlock *iftrue, IR::BasicBlock *iffalse);
diff --git a/src/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h
index 846ea42571..d31e464e99 100644
--- a/src/qml/parser/qqmljsast_p.h
+++ b/src/qml/parser/qqmljsast_p.h
@@ -253,7 +253,7 @@ class QML_PARSER_EXPORT ExpressionNode: public Node
 public:
     ExpressionNode() {}
 
-    virtual ExpressionNode *expressionCast();
+    ExpressionNode *expressionCast() override;
 };
 
 class QML_PARSER_EXPORT Statement: public Node
@@ -261,7 +261,7 @@ class QML_PARSER_EXPORT Statement: public Node
 public:
     Statement() {}
 
-    virtual Statement *statementCast();
+    Statement *statementCast() override;
 };
 
 class QML_PARSER_EXPORT NestedExpression: public ExpressionNode
diff --git a/src/qml/qml/qqmlcontext_p.h b/src/qml/qml/qqmlcontext_p.h
index 162fbcc8f6..4d2bb72352 100644
--- a/src/qml/qml/qqmlcontext_p.h
+++ b/src/qml/qml/qqmlcontext_p.h
@@ -197,7 +197,7 @@ public:
     {
         inline ContextGuard();
         inline ContextGuard &operator=(QObject *obj);
-        inline void objectDestroyed(QObject *);
+        inline void objectDestroyed(QObject *) override;
 
         inline bool wasSet() const;
 
diff --git a/src/qml/qml/qqmlopenmetaobject_p.h b/src/qml/qml/qqmlopenmetaobject_p.h
index 183baec941..4bb92489a5 100644
--- a/src/qml/qml/qqmlopenmetaobject_p.h
+++ b/src/qml/qml/qqmlopenmetaobject_p.h
@@ -83,7 +83,7 @@ public:
 
 protected:
     virtual void propertyCreated(int, QMetaPropertyBuilder &);
-    virtual void clear();
+    void clear() override;
 
 private:
     QQmlOpenMetaObjectTypePrivate *d;
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index abbbf89ea2..b1d6451974 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -577,8 +577,8 @@ public:
     void setPriority(int);
 
 protected:
-    virtual void dataReceived(const Data &);
-    virtual void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*);
+    void dataReceived(const Data &) override;
+    void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*) override;
 
 private:
     QString m_content;
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h
index 9a13e0047d..bb6fede7c8 100644
--- a/src/qml/qml/qqmlvmemetaobject_p.h
+++ b/src/qml/qml/qqmlvmemetaobject_p.h
@@ -83,7 +83,7 @@ public:
     inline QQmlVMEVariantQObjectPtr();
     inline ~QQmlVMEVariantQObjectPtr();
 
-    inline void objectDestroyed(QObject *);
+    inline void objectDestroyed(QObject *) override;
     inline void setGuardedValue(QObject *obj, QQmlVMEMetaObject *target, int index);
 
     QQmlVMEMetaObject *m_target;
diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h
index f4ffdf38aa..07e35d3fd7 100644
--- a/src/qml/types/qqmldelegatemodel_p_p.h
+++ b/src/qml/types/qqmldelegatemodel_p_p.h
@@ -294,7 +294,7 @@ public:
             const QVector<Compositor::Remove> &removes, const QVector<Compositor::Insert> &inserts);
     void itemsChanged(const QVector<Compositor::Change> &changes);
     void emitChanges();
-    void emitModelUpdated(const QQmlChangeSet &changeSet, bool reset);
+    void emitModelUpdated(const QQmlChangeSet &changeSet, bool reset) override;
 
     bool insert(Compositor::insert_iterator &before, const QV4::Value &object, int groups);
 
diff --git a/src/qml/util/qqmladaptormodel_p.h b/src/qml/util/qqmladaptormodel_p.h
index 8e400f9146..78d964236e 100644
--- a/src/qml/util/qqmladaptormodel_p.h
+++ b/src/qml/util/qqmladaptormodel_p.h
@@ -143,7 +143,7 @@ public:
     inline void fetchMore() { return accessors->fetchMore(*this); }
 
 protected:
-    void objectDestroyed(QObject *);
+    void objectDestroyed(QObject *) override;
 };
 
 class QQmlAdaptorModelProxyInterface