Remove 'virtual' keyword when overriding methods

Change-Id: I7d124886c71093d2fc8405a7ec4157464e3c3333
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

13 files changed, 32 insertions, 32 deletions

diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterbackend.h b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterbackend.h
index f6f0a5c..9147dc2 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterbackend.h
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterbackend.h
@@ -64,7 +64,7 @@ public:
     InstrumentClusterBackend(QObject *parent = nullptr);
 
 public:
-    virtual void initialize() override;
+    void initialize() override;
 
     void setupConnection();
     void fetchSpeed();
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/demo_server/instrumentcluster.h b/examples/ivicore/qface-tutorial/chapter6-own-backend/demo_server/instrumentcluster.h
index 17ea567..b11115e 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/demo_server/instrumentcluster.h
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/demo_server/instrumentcluster.h
@@ -97,7 +97,7 @@ public slots:
     void setCurrentWarning(const Warning &currentWarning);
 
 protected:
-    virtual void timerEvent(QTimerEvent *event) override;
+    void timerEvent(QTimerEvent *event) override;
 
 private:
     int m_speed;
diff --git a/src/ivimedia/qivimediadevicediscoverymodel.h b/src/ivimedia/qivimediadevicediscoverymodel.h
index 414a38d..db950e6 100644
--- a/src/ivimedia/qivimediadevicediscoverymodel.h
+++ b/src/ivimedia/qivimediadevicediscoverymodel.h
@@ -68,11 +68,11 @@ public:
     explicit QIviMediaDeviceDiscoveryModel(QObject *parent = nullptr);
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    virtual QVariant data(const QModelIndex &index, int role) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
     Q_INVOKABLE QIviMediaDevice *get(int i) const;
     QIviMediaDevice *at(int i) const;
 
-    virtual QHash<int, QByteArray> roleNames() const override;
+    QHash<int, QByteArray> roleNames() const override;
 
 Q_SIGNALS:
     void countChanged();
@@ -82,8 +82,8 @@ Q_SIGNALS:
 protected:
     QIviMediaDeviceDiscoveryModel(QIviMediaDeviceDiscoveryModelPrivate &dd, QObject *parent = nullptr);
 
-    virtual void connectToServiceObject(QIviServiceObject *serviceObject) override;
-    virtual void clearServiceObject() override;
+    void connectToServiceObject(QIviServiceObject *serviceObject) override;
+    void clearServiceObject() override;
 
 private:
     Q_DECLARE_PRIVATE(QIviMediaDeviceDiscoveryModel)
diff --git a/src/ivimedia/qivimediadevicediscoverymodel_p.h b/src/ivimedia/qivimediadevicediscoverymodel_p.h
index fd3a0da..0e46be9 100644
--- a/src/ivimedia/qivimediadevicediscoverymodel_p.h
+++ b/src/ivimedia/qivimediadevicediscoverymodel_p.h
@@ -67,7 +67,7 @@ class QIviMediaDeviceDiscoveryModelPrivate : public QIviAbstractFeatureListModel
 public:
     QIviMediaDeviceDiscoveryModelPrivate(const QString &interface, QIviMediaDeviceDiscoveryModel *parent);
 
-    virtual void initialize() override;
+    void initialize() override;
     void clearToDefaults();
     void resetModel(const QList<QIviServiceObject *> &deviceList);
     void onDeviceAdded(QIviServiceObject *device);
diff --git a/src/ivimedia/qivimediaindexercontrol.h b/src/ivimedia/qivimediaindexercontrol.h
index 1673038..59dbc13 100644
--- a/src/ivimedia/qivimediaindexercontrol.h
+++ b/src/ivimedia/qivimediaindexercontrol.h
@@ -82,8 +82,8 @@ Q_SIGNALS:
 protected:
     QIviMediaIndexerControl(QIviMediaIndexerControlPrivate &dd, QObject *parent = nullptr);
 
-    virtual void connectToServiceObject(QIviServiceObject *serviceObject) override;
-    virtual void clearServiceObject() override;
+    void connectToServiceObject(QIviServiceObject *serviceObject) override;
+    void clearServiceObject() override;
 
 private:
     Q_DECLARE_PRIVATE(QIviMediaIndexerControl)
diff --git a/src/ivimedia/qivimediaplayer.h b/src/ivimedia/qivimediaplayer.h
index b38bda4..867b63e 100644
--- a/src/ivimedia/qivimediaplayer.h
+++ b/src/ivimedia/qivimediaplayer.h
@@ -117,8 +117,8 @@ Q_SIGNALS:
 protected:
     QIviMediaPlayer(QIviMediaPlayerPrivate &dd, QObject *parent = nullptr);
 
-    virtual void connectToServiceObject(QIviServiceObject *serviceObject) override;
-    virtual void clearServiceObject() override;
+    void connectToServiceObject(QIviServiceObject *serviceObject) override;
+    void clearServiceObject() override;
 
 private:
     Q_DECLARE_PRIVATE(QIviMediaPlayer)
diff --git a/src/ivimedia/qivimediaplayer_p.h b/src/ivimedia/qivimediaplayer_p.h
index 75fec08..6769504 100644
--- a/src/ivimedia/qivimediaplayer_p.h
+++ b/src/ivimedia/qivimediaplayer_p.h
@@ -67,7 +67,7 @@ class QIviMediaPlayerPrivate : public QIviAbstractFeaturePrivate
 public:
     QIviMediaPlayerPrivate(const QString &interface, QIviMediaPlayer *parent);
 
-    virtual void initialize() override;
+    void initialize() override;
     void clearToDefaults();
     void onPlayModeChanged(QIviMediaPlayer::PlayMode playMode);
     void onPlayStateChanged(QIviMediaPlayer::PlayState playState);
diff --git a/src/ivimedia/qiviplayableitem.h b/src/ivimedia/qiviplayableitem.h
index ff2de2f..a52236f 100644
--- a/src/ivimedia/qiviplayableitem.h
+++ b/src/ivimedia/qiviplayableitem.h
@@ -67,7 +67,7 @@ public:
 
     virtual QUrl url() const;
     virtual void setUrl(const QUrl &url);
-    virtual QString type() const override;
+    QString type() const override;
 
     bool operator==(const QIviPlayableItem &other) const;
     inline bool operator!=(const QIviPlayableItem &other) const { return !(*this == other); }
@@ -115,8 +115,8 @@ public:
     virtual void setCoverArtUrl(const QUrl &url);
     virtual int rating() const;
     virtual void setRating(int rating);
-    virtual QString name() const override;
-    virtual QString type() const override;
+    QString name() const override;
+    QString type() const override;
 
     bool operator==(const QIviAudioTrackItem &other) const;
     inline bool operator!=(const QIviAudioTrackItem &other) const { return !(*this == other); }
diff --git a/src/ivimedia/qivitunerstation.h b/src/ivimedia/qivitunerstation.h
index 715b62d..4169d0c 100644
--- a/src/ivimedia/qivitunerstation.h
+++ b/src/ivimedia/qivitunerstation.h
@@ -81,8 +81,8 @@ public:
     void setRadioText(const QString &radioText);
     int receptionQuality() const;
     void setReceptionQuality(int receptionQuality);
-    virtual QString name() const override;
-    virtual QString type() const override;
+    QString name() const override;
+    QString type() const override;
 
     bool operator==(const QIviTunerStation &other) const;
     inline bool operator!=(const QIviTunerStation &other) const { return !(*this == other); }
@@ -106,7 +106,7 @@ public:
 
     virtual QIviAmFmTuner::Band band() const;
     virtual void setBand(QIviAmFmTuner::Band band);
-    virtual QString type() const override;
+    QString type() const override;
 
     bool operator==(const QIviAmFmTunerStation &other) const;
     inline bool operator!=(const QIviAmFmTunerStation &other) const { return !(*this == other); }
diff --git a/src/tools/ivigenerator/templates/backend_qtro/backend.h.tpl b/src/tools/ivigenerator/templates/backend_qtro/backend.h.tpl
index 74ee93e..26934f5 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/backend.h.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/backend.h.tpl
@@ -116,17 +116,17 @@ public Q_SLOTS:
 {% for property in interface.properties %}
 {%   if not property.readonly and not property.const %}
 {%     if not property.is_model %}
-    virtual {{ivi.prop_setter(property, zoned=interface_zoned)}} override;
+    {{ivi.prop_setter(property, zoned=interface_zoned)}} override;
 {%     endif %}
 {%   endif %}
 {% endfor %}
 
 {% if interface_zoned %}
-    virtual QStringList availableZones() const override;
+    QStringList availableZones() const override;
 {% endif %}
 
 {% for operation in interface.operations %}
-    virtual {{ivi.operation(operation, zoned=interface_zoned)}} override;
+    {{ivi.operation(operation, zoned=interface_zoned)}} override;
 {% endfor %}
 
 protected Q_SLOTS:
diff --git a/src/tools/ivigenerator/templates/common/backend_simulation.h.tpl b/src/tools/ivigenerator/templates/common/backend_simulation.h.tpl
index 73dbd5c..e5012c2 100644
--- a/src/tools/ivigenerator/templates/common/backend_simulation.h.tpl
+++ b/src/tools/ivigenerator/templates/common/backend_simulation.h.tpl
@@ -156,14 +156,14 @@ public:
 public Q_SLOTS:
 {% for property in interface.properties %}
 {%   if not property.readonly and not property.const and not property.type.is_model %}
-    virtual {{ivi.prop_setter(property, zoned = interface_zoned, default_zone = true)}} override;
+    {{ivi.prop_setter(property, zoned = interface_zoned, default_zone = true)}} override;
 {%   else %}
     {{ivi.prop_setter(property, zoned = interface_zoned, model_interface = true, default_zone = true)}};
 {%   endif %}
 {% endfor %}
 
 {% for operation in interface.operations %}
-    virtual {{ivi.operation(operation, zoned = interface_zoned)}} override;
+    {{ivi.operation(operation, zoned = interface_zoned)}} override;
 {% endfor %}
 
 protected:
diff --git a/src/tools/ivigenerator/templates/test/tst_test.cpp.tpl b/src/tools/ivigenerator/templates/test/tst_test.cpp.tpl
index d725b8b..8141167 100644
--- a/src/tools/ivigenerator/templates/test/tst_test.cpp.tpl
+++ b/src/tools/ivigenerator/templates/test/tst_test.cpp.tpl
@@ -158,7 +158,7 @@ public:
 {% endfor %}
 
 {% for operation in interface.operations %}
-    virtual {{ivi.operation(operation, zoned = interface_zoned)}} override
+    {{ivi.operation(operation, zoned = interface_zoned)}} override
     {
         Q_EMIT {{operation}}Called({% if operation.parameters|length %}{{operation.parameters|join(', ')}}{% endif %}{%
         if interface_zoned %}{%if operation.parameters|length %}, {%endif%} zone{% endif %});
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h
index 3cd188b..8e53388 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h
@@ -45,14 +45,14 @@ public:
     virtual void setLastMessage(QString lastMessage) override;
 
 public Q_SLOTS:
-    virtual QVariant echo(const QString &msg) override;
-    virtual QVariant id() override;
-    virtual QVariant getCombo() override;
-    virtual QVariant voidSlot() override;
-    virtual QVariant voidSlot2(int param) override;
-    virtual QVariant timer(int interval) override;
-    virtual QVariant flagMethod(EchoModule::AirflowDirections direction) override;
-    virtual QVariant enumMethod(EchoModule::TestEnum testEnum) override;
+    QVariant echo(const QString &msg) override;
+    QVariant id() override;
+    QVariant getCombo() override;
+    QVariant voidSlot() override;
+    QVariant voidSlot2(int param) override;
+    QVariant timer(int interval) override;
+    QVariant flagMethod(EchoModule::AirflowDirections direction) override;
+    QVariant enumMethod(EchoModule::TestEnum testEnum) override;
 
 Q_SIGNALS:
     void echoSlotCalled(const QString &msg);