Qml: add missing 'override'

... and drop redundant 'virtual'

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

14 files changed, 50 insertions, 50 deletions

diff --git a/src/qml/qml/ftw/qqmlthread.cpp b/src/qml/qml/ftw/qqmlthread.cpp
index 1523817c9e..ffa6e29290 100644
--- a/src/qml/qml/ftw/qqmlthread.cpp
+++ b/src/qml/qml/ftw/qqmlthread.cpp
@@ -55,7 +55,7 @@ public:
     QQmlThreadPrivate(QQmlThread *);
     QQmlThread *q;
 
-    virtual void run();
+    void run() override;
 
     inline void lock() { _mutex.lock(); }
     inline void unlock() { _mutex.unlock(); }
@@ -81,12 +81,12 @@ public:
     void threadEvent();
 
 protected:
-    virtual bool event(QEvent *);
+    bool event(QEvent *) override;
 
 private:
     struct MainObject : public QObject {
         MainObject(QQmlThreadPrivate *p);
-        virtual bool event(QEvent *e);
+        bool event(QEvent *e) override;
         QQmlThreadPrivate *p;
     };
     MainObject m_mainObject;
diff --git a/src/qml/qml/ftw/qqmlthread_p.h b/src/qml/qml/ftw/qqmlthread_p.h
index 9f180b1f14..295235e255 100644
--- a/src/qml/qml/ftw/qqmlthread_p.h
+++ b/src/qml/qml/ftw/qqmlthread_p.h
@@ -142,7 +142,7 @@ void QQmlThread::callMethodInThread(void (O::*Member)())
     struct I : public Message {
         void (O::*Member)();
         I(void (O::*Member)()) : Member(Member) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)();
         }
@@ -157,7 +157,7 @@ void QQmlThread::callMethodInThread(void (O::*Member)(V), const T &arg)
         void (O::*Member)(V);
         T arg;
         I(void (O::*Member)(V), const T &arg) : Member(Member), arg(arg) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg);
         }
@@ -173,7 +173,7 @@ void QQmlThread::callMethodInThread(void (O::*Member)(V, V2), const T &arg, cons
         T arg;
         T2 arg2;
         I(void (O::*Member)(V, V2), const T &arg, const T2 &arg2) : Member(Member), arg(arg), arg2(arg2) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg, arg2);
         }
@@ -187,7 +187,7 @@ void QQmlThread::callMethodInMain(void (O::*Member)())
     struct I : public Message {
         void (O::*Member)();
         I(void (O::*Member)()) : Member(Member) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)();
         }
@@ -202,7 +202,7 @@ void QQmlThread::callMethodInMain(void (O::*Member)(V), const T &arg)
         void (O::*Member)(V);
         T arg;
         I(void (O::*Member)(V), const T &arg) : Member(Member), arg(arg) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg);
         }
@@ -218,7 +218,7 @@ void QQmlThread::callMethodInMain(void (O::*Member)(V, V2), const T &arg, const
         T arg;
         T2 arg2;
         I(void (O::*Member)(V, V2), const T &arg, const T2 &arg2) : Member(Member), arg(arg), arg2(arg2) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg, arg2);
         }
@@ -232,7 +232,7 @@ void QQmlThread::postMethodToThread(void (O::*Member)())
     struct I : public Message {
         void (O::*Member)();
         I(void (O::*Member)()) : Member(Member) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)();
         }
@@ -247,7 +247,7 @@ void QQmlThread::postMethodToThread(void (O::*Member)(V), const T &arg)
         void (O::*Member)(V);
         T arg;
         I(void (O::*Member)(V), const T &arg) : Member(Member), arg(arg) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg);
         }
@@ -263,7 +263,7 @@ void QQmlThread::postMethodToThread(void (O::*Member)(V, V2), const T &arg, cons
         T arg;
         T2 arg2;
         I(void (O::*Member)(V, V2), const T &arg, const T2 &arg2) : Member(Member), arg(arg), arg2(arg2) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg, arg2);
         }
@@ -277,7 +277,7 @@ void QQmlThread::postMethodToMain(void (O::*Member)())
     struct I : public Message {
         void (O::*Member)();
         I(void (O::*Member)()) : Member(Member) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)();
         }
@@ -292,7 +292,7 @@ void QQmlThread::postMethodToMain(void (O::*Member)(V), const T &arg)
         void (O::*Member)(V);
         T arg;
         I(void (O::*Member)(V), const T &arg) : Member(Member), arg(arg) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg);
         }
@@ -308,7 +308,7 @@ void QQmlThread::postMethodToMain(void (O::*Member)(V, V2), const T &arg, const
         T arg;
         T2 arg2;
         I(void (O::*Member)(V, V2), const T &arg, const T2 &arg2) : Member(Member), arg(arg), arg2(arg2) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg, arg2);
         }
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 6eda23c4c3..b78028dcf9 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1098,13 +1098,13 @@ public:
         , incubatorObject(inc)
     {}
 
-    virtual void statusChanged(Status s) {
+    void statusChanged(Status s) override {
         QV4::Scope scope(incubatorObject->internalClass->engine);
         QV4::Scoped<QV4::QmlIncubatorObject> i(scope, incubatorObject);
         i->statusChanged(s);
     }
 
-    virtual void setInitialState(QObject *o) {
+    void setInitialState(QObject *o) override {
         QV4::Scope scope(incubatorObject->internalClass->engine);
         QV4::Scoped<QV4::QmlIncubatorObject> i(scope, incubatorObject);
         i->setInitialState(o);
diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h
index bbb9c36ce9..3111d1013e 100644
--- a/src/qml/qml/qqmlengine.h
+++ b/src/qml/qml/qqmlengine.h
@@ -151,7 +151,7 @@ public:
     static ObjectOwnership objectOwnership(QObject *);
 protected:
     QQmlEngine(QQmlEnginePrivate &dd, QObject *p);
-    virtual bool event(QEvent *);
+    bool event(QEvent *) override;
 
 Q_SIGNALS:
     void quit();
diff --git a/src/qml/qml/qqmlexpression_p.h b/src/qml/qml/qqmlexpression_p.h
index 809a57b169..81a749e017 100644
--- a/src/qml/qml/qqmlexpression_p.h
+++ b/src/qml/qml/qqmlexpression_p.h
@@ -85,8 +85,8 @@ public:
     bool expressionFunctionValid:1;
 
     // Inherited from QQmlJavaScriptExpression
-    virtual QString expressionIdentifier();
-    virtual void expressionChanged();
+    QString expressionIdentifier() override;
+    void expressionChanged() override;
 
     QString expression;
 
diff --git a/src/qml/qml/qqmlextensionplugin.h b/src/qml/qml/qqmlextensionplugin.h
index de482d0352..934cf0f51a 100644
--- a/src/qml/qml/qqmlextensionplugin.h
+++ b/src/qml/qml/qqmlextensionplugin.h
@@ -64,7 +64,7 @@ public:
     QUrl baseUrl() const;
 
     virtual void registerTypes(const char *uri) = 0;
-    virtual void initializeEngine(QQmlEngine *engine, const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri) override;
 
 private:
     Q_DISABLE_COPY(QQmlExtensionPlugin)
diff --git a/src/qml/qml/qqmlfileselector_p.h b/src/qml/qml/qqmlfileselector_p.h
index 57ef194c10..a7360f83d9 100644
--- a/src/qml/qml/qqmlfileselector_p.h
+++ b/src/qml/qml/qqmlfileselector_p.h
@@ -80,7 +80,7 @@ public:
     QQmlFileSelectorInterceptor(QQmlFileSelectorPrivate* pd);
     QQmlFileSelectorPrivate* d;
 protected:
-    virtual QUrl intercept(const QUrl &path, DataType type);
+    QUrl intercept(const QUrl &path, DataType type) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp
index 0ce769aaea..963638ca34 100644
--- a/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@ -206,7 +206,7 @@ public:
     }
 
 protected:
-    virtual void timerEvent(QTimerEvent *) {
+    void timerEvent(QTimerEvent *) override {
         incubateFor(5);
     }
 };
diff --git a/src/qml/qml/qqmlopenmetaobject_p.h b/src/qml/qml/qqmlopenmetaobject_p.h
index f1562131fc..183baec941 100644
--- a/src/qml/qml/qqmlopenmetaobject_p.h
+++ b/src/qml/qml/qqmlopenmetaobject_p.h
@@ -122,8 +122,8 @@ public:
     void emitPropertyNotification(const QByteArray &propertyName);
 
 protected:
-    virtual int metaCall(QObject *o, QMetaObject::Call _c, int _id, void **_a);
-    virtual int createProperty(const char *, const char *);
+    int metaCall(QObject *o, QMetaObject::Call _c, int _id, void **_a) override;
+    int createProperty(const char *, const char *) override;
 
     virtual void propertyRead(int);
     virtual void propertyWrite(int);
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index 4da02037fa..c27ea796e0 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -437,8 +437,8 @@ public:
     QByteArray checksum(bool *ok);
 
 protected:
-    virtual void destroy();
-    virtual void clear();
+    void destroy() override;
+    void clear() override;
 
 private:
     friend class QQmlEnginePrivate;
diff --git a/src/qml/qml/qqmlproxymetaobject_p.h b/src/qml/qml/qqmlproxymetaobject_p.h
index 7083f88fa7..2b7a980361 100644
--- a/src/qml/qml/qqmlproxymetaobject_p.h
+++ b/src/qml/qml/qqmlproxymetaobject_p.h
@@ -74,10 +74,10 @@ public:
     };
 
     QQmlProxyMetaObject(QObject *, QList<ProxyData> *);
-    virtual ~QQmlProxyMetaObject();
+    ~QQmlProxyMetaObject();
 
 protected:
-    virtual int metaCall(QObject *o, QMetaObject::Call _c, int _id, void **_a);
+    int metaCall(QObject *o, QMetaObject::Call _c, int _id, void **_a) override;
 
 private:
     QList<ProxyData> *metaObjects;
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 7730233a93..b576366abf 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -166,7 +166,7 @@ public:
     void initializeEngine(QQmlExtensionInterface *, const char *);
 
 protected:
-    virtual void shutdownThread();
+    void shutdownThread() override;
 
 private:
     void loadThread(QQmlDataBlob *b);
@@ -2891,7 +2891,7 @@ QQmlScriptData *QQmlScriptBlob::scriptData() const
 
 struct EmptyCompilationUnit : public QV4::CompiledData::CompilationUnit
 {
-    virtual void linkBackendToEngine(QV4::ExecutionEngine *) {}
+    void linkBackendToEngine(QV4::ExecutionEngine *) override {}
 };
 
 void QQmlScriptBlob::dataReceived(const Data &data)
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index 5c779e450d..12c55e9179 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -242,8 +242,8 @@ public:
 
         virtual void scriptImported(QQmlScriptBlob *, const QV4::CompiledData::Location &, const QString &, const QString &) {}
 
-        virtual void dependencyError(QQmlDataBlob *);
-        virtual void dependencyComplete(QQmlDataBlob *);
+        void dependencyError(QQmlDataBlob *) override;
+        void dependencyComplete(QQmlDataBlob *) override;
 
     protected:
         virtual QString stringAt(int) const { return QString(); }
@@ -433,14 +433,14 @@ public:
     void unregisterCallback(TypeDataCallback *);
 
 protected:
-    virtual void done();
-    virtual void completed();
-    virtual void dataReceived(const Data &);
-    virtual void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit);
-    virtual void allDependenciesDone();
-    virtual void downloadProgressChanged(qreal);
+    void done() override;
+    void completed() override;
+    void dataReceived(const Data &) override;
+    void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit) override;
+    void allDependenciesDone() override;
+    void downloadProgressChanged(qreal) override;
 
-    virtual QString stringAt(int index) const;
+    QString stringAt(int index) const override;
 
 private:
     bool tryLoadFromDiskCache();
@@ -457,7 +457,7 @@ private:
                                       const QV4::CompiledData::ResolvedTypeReferenceMap &resolvedTypeCache);
     bool resolveType(const QString &typeName, int &majorVersion, int &minorVersion, TypeReference &ref);
 
-    virtual void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace);
+    void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace) override;
 
 
     qint64 m_sourceTimeStamp = 0;
@@ -509,7 +509,7 @@ public:
     QV4::ReturnedValue scriptValueForContext(QQmlContextData *parentCtxt);
 
 protected:
-    virtual void clear(); // From QQmlCleanup
+    void clear() override; // From QQmlCleanup
 
 private:
     friend class QQmlScriptBlob;
@@ -545,14 +545,14 @@ public:
     QQmlScriptData *scriptData() const;
 
 protected:
-    virtual void dataReceived(const Data &);
-    virtual void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit);
-    virtual void done();
+    void dataReceived(const Data &) override;
+    void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit) override;
+    void done() override;
 
-    virtual QString stringAt(int index) const;
+    QString stringAt(int index) const override;
 
 private:
-    virtual void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace);
+    void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace) override;
     void initializeFromCompilationUnit(QV4::CompiledData::CompilationUnit *unit);
 
     QList<ScriptReference> m_scripts;
diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h
index 11e1dfdb00..0502a5d665 100644
--- a/src/qml/qml/qqmlvaluetype_p.h
+++ b/src/qml/qml/qqmlvaluetype_p.h
@@ -74,9 +74,9 @@ public:
     void setValue(const QVariant &);
 
     // ---- dynamic meta object data interface
-    virtual QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *);
-    virtual void objectDestroyed(QObject *);
-    virtual int metaCall(QObject *obj, QMetaObject::Call type, int _id, void **argv);
+    QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) override;
+    void objectDestroyed(QObject *) override;
+    int metaCall(QObject *obj, QMetaObject::Call type, int _id, void **argv) override;
     // ----
 
 private: