Qml: add missing 'override'

... and drop redundant 'virtual'

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

10 files changed, 60 insertions, 60 deletions

diff --git a/src/qml/types/qqmlconnections_p.h b/src/qml/types/qqmlconnections_p.h
index d454affba8..580b6522de 100644
--- a/src/qml/types/qqmlconnections_p.h
+++ b/src/qml/types/qqmlconnections_p.h
@@ -91,15 +91,15 @@ Q_SIGNALS:
 
 private:
     void connectSignals();
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 };
 
 class QQmlConnectionsParser : public QQmlCustomParser
 {
 public:
-    virtual void verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &props);
-    virtual void applyBindings(QObject *object, QV4::CompiledData::CompilationUnit *compilationUnit, const QList<const QV4::CompiledData::Binding *> &bindings);
+    void verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &props) override;
+    void applyBindings(QObject *object, QV4::CompiledData::CompilationUnit *compilationUnit, const QList<const QV4::CompiledData::Binding *> &bindings) override;
 };
 
 
diff --git a/src/qml/types/qqmldelegatemodel_p.h b/src/qml/types/qqmldelegatemodel_p.h
index 2986ec7ce5..186144d107 100644
--- a/src/qml/types/qqmldelegatemodel_p.h
+++ b/src/qml/types/qqmldelegatemodel_p.h
@@ -90,10 +90,10 @@ class Q_QML_PRIVATE_EXPORT QQmlDelegateModel : public QQmlInstanceModel, public
 public:
     QQmlDelegateModel();
     QQmlDelegateModel(QQmlContext *, QObject *parent=0);
-    virtual ~QQmlDelegateModel();
+    ~QQmlDelegateModel();
 
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
     QVariant model() const;
     void setModel(const QVariant &);
@@ -107,15 +107,15 @@ public:
     Q_INVOKABLE QVariant modelIndex(int idx) const;
     Q_INVOKABLE QVariant parentModelIndex() const;
 
-    int count() const;
-    bool isValid() const { return delegate() != 0; }
-    QObject *object(int index, bool asynchronous=false);
-    ReleaseFlags release(QObject *object);
-    void cancel(int index);
-    virtual QString stringValue(int index, const QString &role);
-    virtual void setWatchedRoles(const QList<QByteArray> &roles);
+    int count() const override;
+    bool isValid() const override { return delegate() != 0; }
+    QObject *object(int index, bool asynchronous = false) override;
+    ReleaseFlags release(QObject *object) override;
+    void cancel(int index) override;
+    QString stringValue(int index, const QString &role) override;
+    void setWatchedRoles(const QList<QByteArray> &roles) override;
 
-    int indexOf(QObject *object, QObject *objectContext) const;
+    int indexOf(QObject *object, QObject *objectContext) const override;
 
     QString filterGroup() const;
     void setFilterGroup(const QString &group);
@@ -126,7 +126,7 @@ public:
     QQmlListProperty<QQmlDelegateModelGroup> groups();
     QObject *parts();
 
-    bool event(QEvent *);
+    bool event(QEvent *) override;
 
     static QQmlDelegateModelAttached *qmlAttachedProperties(QObject *obj);
 
diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h
index bf9fd99f19..62c45d77f9 100644
--- a/src/qml/types/qqmldelegatemodel_p_p.h
+++ b/src/qml/types/qqmldelegatemodel_p_p.h
@@ -353,21 +353,21 @@ public:
     void updateFilterGroup();
     void updateFilterGroup(Compositor::Group group, const QQmlChangeSet &changeSet);
 
-    int count() const;
-    bool isValid() const;
-    QObject *object(int index, bool asynchronous=false);
-    ReleaseFlags release(QObject *item);
-    QString stringValue(int index, const QString &role);
+    int count() const override;
+    bool isValid() const override;
+    QObject *object(int index, bool asynchronous = false) override;
+    ReleaseFlags release(QObject *item) override;
+    QString stringValue(int index, const QString &role) override;
     QList<QByteArray> watchedRoles() const { return m_watchedRoles; }
-    void setWatchedRoles(const QList<QByteArray> &roles);
+    void setWatchedRoles(const QList<QByteArray> &roles) override;
 
-    int indexOf(QObject *item, QObject *objectContext) const;
+    int indexOf(QObject *item, QObject *objectContext) const override;
 
-    void emitModelUpdated(const QQmlChangeSet &changeSet, bool reset);
+    void emitModelUpdated(const QQmlChangeSet &changeSet, bool reset) override;
 
-    void createdPackage(int index, QQuickPackage *package);
-    void initPackage(int index, QQuickPackage *package);
-    void destroyingPackage(QQuickPackage *package);
+    void createdPackage(int index, QQuickPackage *package) override;
+    void initPackage(int index, QQuickPackage *package) override;
+    void destroyingPackage(QQuickPackage *package) override;
 
 Q_SIGNALS:
     void filterGroupChanged();
@@ -390,8 +390,8 @@ public:
     QQmlDelegateModelPartsMetaObject(QObject *parent)
     : QQmlOpenMetaObject(parent) {}
 
-    virtual void propertyCreated(int, QMetaPropertyBuilder &);
-    virtual QVariant initialValue(int);
+    void propertyCreated(int, QMetaPropertyBuilder &) override;
+    QVariant initialValue(int) override;
 };
 
 class QQmlDelegateModelParts : public QObject
@@ -411,8 +411,8 @@ public:
             QQmlDelegateModelItemMetaType *metaType, QMetaObject *metaObject);
     ~QQmlDelegateModelAttachedMetaObject();
 
-    void objectDestroyed(QObject *);
-    int metaCall(QObject *, QMetaObject::Call, int _id, void **);
+    void objectDestroyed(QObject *) override;
+    int metaCall(QObject *, QMetaObject::Call, int _id, void **) override;
 
 private:
     QQmlDelegateModelItemMetaType * const metaType;
diff --git a/src/qml/types/qqmlinstantiator_p.h b/src/qml/types/qqmlinstantiator_p.h
index dff69ee6b3..ee18daa48c 100644
--- a/src/qml/types/qqmlinstantiator_p.h
+++ b/src/qml/types/qqmlinstantiator_p.h
@@ -72,7 +72,7 @@ class Q_AUTOTEST_EXPORT QQmlInstantiator : public QObject, public QQmlParserStat
 
 public:
     QQmlInstantiator(QObject *parent = 0);
-    virtual ~QQmlInstantiator();
+    ~QQmlInstantiator();
 
     bool isActive() const;
     void setActive(bool newVal);
@@ -92,8 +92,8 @@ public:
 
     Q_INVOKABLE QObject *objectAt(int index) const;
 
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
 Q_SIGNALS:
     void modelChanged();
diff --git a/src/qml/types/qqmllistmodel_p.h b/src/qml/types/qqmllistmodel_p.h
index 220b0e54b5..29b392f71e 100644
--- a/src/qml/types/qqmllistmodel_p.h
+++ b/src/qml/types/qqmllistmodel_p.h
@@ -85,11 +85,11 @@ public:
     QQmlListModel(QObject *parent=0);
     ~QQmlListModel();
 
-    QModelIndex index(int row, int column, const QModelIndex &parent) const;
-    int rowCount(const QModelIndex &parent) const;
-    QVariant data(const QModelIndex &index, int role) const;
-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
-    QHash<int,QByteArray> roleNames() const;
+    QModelIndex index(int row, int column, const QModelIndex &parent) const override;
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+    QHash<int,QByteArray> roleNames() const override;
 
     QVariant data(int index, int role) const;
     int count() const;
diff --git a/src/qml/types/qqmllistmodel_p_p.h b/src/qml/types/qqmllistmodel_p_p.h
index 3628372f50..a6e6aaea90 100644
--- a/src/qml/types/qqmllistmodel_p_p.h
+++ b/src/qml/types/qqmllistmodel_p_p.h
@@ -71,8 +71,8 @@ public:
     bool m_enabled;
 
 protected:
-    void propertyWrite(int index);
-    void propertyWritten(int index);
+    void propertyWrite(int index) override;
+    void propertyWritten(int index) override;
 
 private:
     DynamicRoleModelNode *m_owner;
@@ -138,7 +138,7 @@ public:
     bool initialized() const { return m_initialized; }
 
 protected:
-    void propertyWritten(int index);
+    void propertyWritten(int index) override;
 
 private:
     using QQmlOpenMetaObject::setValue;
diff --git a/src/qml/types/qqmllistmodelworkeragent_p.h b/src/qml/types/qqmllistmodelworkeragent_p.h
index 1a891c0f25..5a39651bf7 100644
--- a/src/qml/types/qqmllistmodelworkeragent_p.h
+++ b/src/qml/types/qqmllistmodelworkeragent_p.h
@@ -108,7 +108,7 @@ public:
 
     void modelDestroyed();
 protected:
-    virtual bool event(QEvent *);
+    bool event(QEvent *) override;
 
 private:
     friend class QQuickWorkerScriptEnginePrivate;
diff --git a/src/qml/types/qqmlobjectmodel_p.h b/src/qml/types/qqmlobjectmodel_p.h
index 97a56344d4..fc4c03874f 100644
--- a/src/qml/types/qqmlobjectmodel_p.h
+++ b/src/qml/types/qqmlobjectmodel_p.h
@@ -109,16 +109,16 @@ class Q_QML_PRIVATE_EXPORT QQmlObjectModel : public QQmlInstanceModel
 
 public:
     QQmlObjectModel(QObject *parent=0);
-    virtual ~QQmlObjectModel() {}
+    ~QQmlObjectModel() {}
 
-    virtual int count() const;
-    virtual bool isValid() const;
-    virtual QObject *object(int index, bool asynchronous=false);
-    virtual ReleaseFlags release(QObject *object);
-    virtual QString stringValue(int index, const QString &role);
-    virtual void setWatchedRoles(const QList<QByteArray> &) {}
+    int count() const override;
+    bool isValid() const override;
+    QObject *object(int index, bool asynchronous = false) override;
+    ReleaseFlags release(QObject *object) override;
+    QString stringValue(int index, const QString &role) override;
+    void setWatchedRoles(const QList<QByteArray> &) override {}
 
-    virtual int indexOf(QObject *object, QObject *objectContext) const;
+    int indexOf(QObject *object, QObject *objectContext) const override;
 
     QQmlListProperty<QObject> children();
 
diff --git a/src/qml/types/qqmltimer_p.h b/src/qml/types/qqmltimer_p.h
index 7ea2f098bf..7739dad2a6 100644
--- a/src/qml/types/qqmltimer_p.h
+++ b/src/qml/types/qqmltimer_p.h
@@ -87,10 +87,10 @@ public:
     void setTriggeredOnStart(bool triggeredOnStart);
 
 protected:
-    void classBegin();
-    void componentComplete();
+    void classBegin() override;
+    void componentComplete() override;
 
-    bool event(QEvent *);
+    bool event(QEvent *) override;
 
 public Q_SLOTS:
     void start();
diff --git a/src/qml/types/qquickworkerscript_p.h b/src/qml/types/qquickworkerscript_p.h
index de6f3dc324..dce3acc3e1 100644
--- a/src/qml/types/qquickworkerscript_p.h
+++ b/src/qml/types/qquickworkerscript_p.h
@@ -68,7 +68,7 @@ class QQuickWorkerScriptEngine : public QThread
 Q_OBJECT
 public:
     QQuickWorkerScriptEngine(QQmlEngine *parent = 0);
-    virtual ~QQuickWorkerScriptEngine();
+    ~QQuickWorkerScriptEngine();
 
     int registerWorkerScript(QQuickWorkerScript *);
     void removeWorkerScript(int);
@@ -76,7 +76,7 @@ public:
     void sendMessage(int, const QByteArray &);
 
 protected:
-    virtual void run();
+    void run() override;
 
 private:
     QQuickWorkerScriptEnginePrivate *d;
@@ -92,7 +92,7 @@ class Q_AUTOTEST_EXPORT QQuickWorkerScript : public QObject, public QQmlParserSt
     Q_INTERFACES(QQmlParserStatus)
 public:
     QQuickWorkerScript(QObject *parent = 0);
-    virtual ~QQuickWorkerScript();
+    ~QQuickWorkerScript();
 
     QUrl source() const;
     void setSource(const QUrl &);
@@ -105,9 +105,9 @@ Q_SIGNALS:
     void message(const QQmlV4Handle &messageObject);
 
 protected:
-    virtual void classBegin();
-    virtual void componentComplete();
-    virtual bool event(QEvent *);
+    void classBegin() override;
+    void componentComplete() override;
+    bool event(QEvent *) override;
 
 private:
     QQuickWorkerScriptEngine *engine();