diff options
author | Dominik Holland <dominik.holland@qt.io> | 2021-03-30 13:28:38 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@qt.io> | 2021-05-10 11:23:00 +0200 |
commit | 51dcf5becc4aa85f6b556de95c5627cfe8d40043 (patch) | |
tree | bdc35be9330698b2d89fcf2ca34177e8610ddcff | |
parent | a6de9bc1fba4b4c5afe50ea2168ae6134f8cee5f (diff) |
Fix missing override keywords backend plugins
Change-Id: I87e69d96d9c1234bc89b923811da912055d5bfc0
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
10 files changed, 28 insertions, 28 deletions
diff --git a/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl b/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl index ea9cd6b..355583f 100644 --- a/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl +++ b/src/tools/ivigenerator/templates/backend_qtro/plugin.h.tpl @@ -60,8 +60,8 @@ public: explicit {{class}}(QObject *parent = nullptr); - QStringList interfaces() const; - QIviFeatureInterface* interfaceInstance(const QString& interface) const; + QStringList interfaces() const override; + QIviFeatureInterface* interfaceInstance(const QString& interface) const override; private: QVector<QIviFeatureInterface *> m_interfaces; diff --git a/src/tools/ivigenerator/templates/backend_simulator/plugin.h.tpl b/src/tools/ivigenerator/templates/backend_simulator/plugin.h.tpl index cd235d6..a4f005e 100644 --- a/src/tools/ivigenerator/templates/backend_simulator/plugin.h.tpl +++ b/src/tools/ivigenerator/templates/backend_simulator/plugin.h.tpl @@ -63,8 +63,8 @@ public: explicit {{class}}(QObject *parent = nullptr); - QStringList interfaces() const; - QIviFeatureInterface* interfaceInstance(const QString& interface) const; + QStringList interfaces() const override; + QIviFeatureInterface* interfaceInstance(const QString& interface) const override; private: QVector<QIviFeatureInterface *> m_interfaces; diff --git a/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp b/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp index fc1b603..e95f18f 100644 --- a/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp +++ b/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp @@ -72,7 +72,7 @@ public: return QIviAbstractFeature::errorText(); } - virtual bool acceptServiceObject(QIviServiceObject *serviceObject) + virtual bool acceptServiceObject(QIviServiceObject *serviceObject) override { if (m_testBaseFunctions) return QIviAbstractFeature::acceptServiceObject(serviceObject); @@ -83,7 +83,7 @@ public: return false; } - virtual void connectToServiceObject(QIviServiceObject *serviceObject) + virtual void connectToServiceObject(QIviServiceObject *serviceObject) override { if (!serviceObject) return; @@ -93,7 +93,7 @@ public: QIviAbstractFeature::connectToServiceObject(serviceObject); } - virtual void clearServiceObject() + virtual void clearServiceObject() override { } @@ -116,7 +116,7 @@ public: return QIviAbstractFeatureListModel::errorText(); } - virtual bool acceptServiceObject(QIviServiceObject *serviceObject) + virtual bool acceptServiceObject(QIviServiceObject *serviceObject) override { if (m_testBaseFunctions) return QIviAbstractFeatureListModel::acceptServiceObject(serviceObject); @@ -127,7 +127,7 @@ public: return false; } - virtual void connectToServiceObject(QIviServiceObject *serviceObject) + virtual void connectToServiceObject(QIviServiceObject *serviceObject) override { if (!serviceObject) return; @@ -137,17 +137,17 @@ public: QIviAbstractFeatureListModel::connectToServiceObject(serviceObject); } - virtual void clearServiceObject() + virtual void clearServiceObject() override { } - virtual int rowCount(const QModelIndex &parent) const + virtual int rowCount(const QModelIndex &parent) const override { Q_UNUSED(parent) return 0; } - virtual QVariant data(const QModelIndex &index, int role) const + virtual QVariant data(const QModelIndex &index, int role) const override { Q_UNUSED(index) Q_UNUSED(role) @@ -189,12 +189,12 @@ public: , m_testBackend(new TestFeatureBackend(this)) {} - QStringList interfaces() const + QStringList interfaces() const override { return QStringList(QString("testFeature")); } - QIviFeatureInterface* interfaceInstance(const QString& interface) const + QIviFeatureInterface* interfaceInstance(const QString& interface) const override { if (interface == "testFeature") return m_testBackend; diff --git a/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp b/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp index 560d2b2..ec358f7 100644 --- a/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp +++ b/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp @@ -156,8 +156,8 @@ public: m_interfaces << QIviPagingModel_iid; } - QStringList interfaces() const { return m_interfaces; } - QIviFeatureInterface *interfaceInstance(const QString &interface) const + QStringList interfaces() const override { return m_interfaces; } + QIviFeatureInterface *interfaceInstance(const QString &interface) const override { if (interface == QIviPagingModel_iid) return testBackend(); diff --git a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp index 093cbfd..84b6475 100644 --- a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp +++ b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp @@ -379,8 +379,8 @@ public: m_interfaces << QIviSearchAndBrowseModel_iid; } - QStringList interfaces() const { return m_interfaces; } - QIviFeatureInterface *interfaceInstance(const QString &interface) const + QStringList interfaces() const override { return m_interfaces; } + QIviFeatureInterface *interfaceInstance(const QString &interface) const override { if (interface == QIviSearchAndBrowseModel_iid) return testBackend(); diff --git a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h index f6f3e17..1208e22 100644 --- a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h +++ b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h @@ -44,11 +44,11 @@ public: explicit SimplePlugin(); ~SimplePlugin() {} - QStringList interfaces() const { + QStringList interfaces() const override { return QStringList() << "simple_plugin"; } - QIviFeatureInterface *interfaceInstance(const QString &interface) const { + QIviFeatureInterface *interfaceInstance(const QString &interface) const override { Q_UNUSED(interface) return 0; } diff --git a/tests/auto/core/servicemanagertest/simple_plugin_static/simplestaticplugin.h b/tests/auto/core/servicemanagertest/simple_plugin_static/simplestaticplugin.h index c3fd2fe..a8d4711 100644 --- a/tests/auto/core/servicemanagertest/simple_plugin_static/simplestaticplugin.h +++ b/tests/auto/core/servicemanagertest/simple_plugin_static/simplestaticplugin.h @@ -44,11 +44,11 @@ public: explicit SimpleStaticPlugin(); ~SimpleStaticPlugin() {} - QStringList interfaces() const { + QStringList interfaces() const override { return QStringList() << "simple_plugin_static"; } - QIviFeatureInterface *interfaceInstance(const QString &interface) const { + QIviFeatureInterface *interfaceInstance(const QString &interface) const override { Q_UNUSED(interface) return 0; } diff --git a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp index 1eb2afd..e2efd49 100644 --- a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp +++ b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp @@ -48,11 +48,11 @@ public: { } - QStringList interfaces() const { + QStringList interfaces() const override { return m_serviceObjects.keys(); } - QIviFeatureInterface *interfaceInstance(const QString &interface) const { + QIviFeatureInterface *interfaceInstance(const QString &interface) const override { return m_serviceObjects.value(interface); } diff --git a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h index d2e084e..3735b82 100644 --- a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h +++ b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h @@ -43,11 +43,11 @@ public: explicit WrongMetadataPlugin(); ~WrongMetadataPlugin() {} - QStringList interfaces() const { + QStringList interfaces() const override { return QStringList() << "wrongmetadata"; } - QIviFeatureInterface *interfaceInstance(const QString &interface) const { + QIviFeatureInterface *interfaceInstance(const QString &interface) const override { Q_UNUSED(interface) return 0; } diff --git a/tests/auto/core/servicemanagertest/wrongmetadata_plugin_static/wrongmetadatastaticplugin.h b/tests/auto/core/servicemanagertest/wrongmetadata_plugin_static/wrongmetadatastaticplugin.h index cb42cff..615650c 100644 --- a/tests/auto/core/servicemanagertest/wrongmetadata_plugin_static/wrongmetadatastaticplugin.h +++ b/tests/auto/core/servicemanagertest/wrongmetadata_plugin_static/wrongmetadatastaticplugin.h @@ -44,11 +44,11 @@ public: explicit WrongMetadataStaticPlugin(); ~WrongMetadataStaticPlugin() {} - QStringList interfaces() const { + QStringList interfaces() const override { return QStringList() << "wrongmetadata_static"; } - QIviFeatureInterface *interfaceInstance(const QString &interface) const { + QIviFeatureInterface *interfaceInstance(const QString &interface) const override { Q_UNUSED(interface) return 0; } |