diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-09-10 23:16:36 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-09-12 11:58:27 +0200 |
commit | 08f7958e9aebd6d1b827547623c94f6705bea7c2 (patch) | |
tree | 2cc9770e5268b499e9a6b8d9aa11a677946c2801 /tests | |
parent | a8cbbeb3ab8b60a252ab1ef89c15e12bee15888a (diff) | |
download | qtlocation-08f7958e9aebd6d1b827547623c94f6705bea7c2.tar.gz |
Cleanup: remove virtual keyword from overrides
Change-Id: Iac3ac030809f57cfcffbfcc3257551efb6c1ff0f
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'tests')
7 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/declarativetestplugin/locationtest.cpp b/tests/auto/declarativetestplugin/locationtest.cpp index c7c59c6b..52fa35ac 100644 --- a/tests/auto/declarativetestplugin/locationtest.cpp +++ b/tests/auto/declarativetestplugin/locationtest.cpp @@ -50,7 +50,7 @@ class QLocationDeclarativeTestModule: public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - virtual void registerTypes(const char* uri) override + void registerTypes(const char* uri) override { if (QLatin1String(uri) == QLatin1String("QtLocation.Test")) { qmlRegisterType<QDeclarativePinchGenerator>(uri, 5, 5, "PinchGenerator"); diff --git a/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h b/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h index e9411bfe..3c7c019a 100644 --- a/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h +++ b/tests/auto/declarativetestplugin/qdeclarativelocationtestmodel_p.h @@ -70,13 +70,13 @@ public: }; // from QQmlParserStatus - virtual void componentComplete() override; - virtual void classBegin() override {} + void componentComplete() override; + void classBegin() override {} // From QAbstractListModel - virtual int rowCount(const QModelIndex &parent) const override; - virtual QVariant data(const QModelIndex &index, int role) const override; - virtual QHash<int, QByteArray> roleNames() const override; + int rowCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role) const override; + QHash<int, QByteArray> roleNames() const override; int datacount() const; void setDatacount(int datacount); diff --git a/tests/auto/declarativetestplugin/qdeclarativepinchgenerator_p.h b/tests/auto/declarativetestplugin/qdeclarativepinchgenerator_p.h index 74d9e6f3..ac78b075 100644 --- a/tests/auto/declarativetestplugin/qdeclarativepinchgenerator_p.h +++ b/tests/auto/declarativetestplugin/qdeclarativepinchgenerator_p.h @@ -105,7 +105,7 @@ public: }; // from QQmlParserStatus - virtual void componentComplete() override; + void componentComplete() override; // from QQuickItem void itemChange(ItemChange change, const ItemChangeData &data) override; diff --git a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h index 43e8a44b..e60b2d2b 100644 --- a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h +++ b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h @@ -136,7 +136,7 @@ public: QGeoRouteRequest::TruckTravel ); } - virtual QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request) override + QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request) override { routeReply_ = new RouteReplyTest(); connect(routeReply_, SIGNAL(aborted()), this, SLOT(requestAborted())); diff --git a/tests/auto/geotestplugin/qgeotiledmap_test.cpp b/tests/auto/geotestplugin/qgeotiledmap_test.cpp index aa0810eb..bab66fc1 100644 --- a/tests/auto/geotestplugin/qgeotiledmap_test.cpp +++ b/tests/auto/geotestplugin/qgeotiledmap_test.cpp @@ -71,7 +71,7 @@ public: param->disconnect(q); } - virtual void setVisibleArea(const QRectF &visibleArea) override + void setVisibleArea(const QRectF &visibleArea) override { if (m_options.supportVisibleArea) return QGeoTiledMapPrivate::setVisibleArea(visibleArea); @@ -79,7 +79,7 @@ public: return QGeoMapPrivate::setVisibleArea(visibleArea); } - virtual QRectF visibleArea() const override + QRectF visibleArea() const override { if (m_options.supportVisibleArea) return QGeoTiledMapPrivate::visibleArea(); diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h index 16e3f94c..44aee74e 100644 --- a/tests/auto/geotestplugin/qplacemanagerengine_test.h +++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h @@ -641,12 +641,12 @@ public: return QString(); } - virtual QStringList childCategoryIds(const QString &categoryId) const override + QStringList childCategoryIds(const QString &categoryId) const override { return m_childCategories.value(categoryId); } - virtual QPlaceCategory category(const QString &categoryId) const override + QPlaceCategory category(const QString &categoryId) const override { return m_categories.value(categoryId); } diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp index e19d7348..0a5b7cc6 100644 --- a/tests/auto/nokia_services/routing/tst_routing.cpp +++ b/tests/auto/nokia_services/routing/tst_routing.cpp @@ -48,7 +48,7 @@ class MockGeoNetworkReply : public QNetworkReply { public: MockGeoNetworkReply( QObject* parent = 0); - virtual void abort() override; + void abort() override; void setFile(QFile* file); void complete(); @@ -57,8 +57,8 @@ public: using QNetworkReply::setError; protected: - virtual qint64 readData(char *data, qint64 maxlen) override; - virtual qint64 writeData(const char *data, qint64 len) override; + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; private: QFile* m_file; |