diff options
Diffstat (limited to 'src/plugins')
19 files changed, 42 insertions, 42 deletions
diff --git a/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.h b/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.h index 8ed1da8f..02a10452 100644 --- a/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.h +++ b/src/plugins/geoservices/itemsoverlay/qgeoserviceproviderpluginitemsoverlay.h @@ -52,16 +52,16 @@ class QGeoServiceProviderFactoryItemsOverlay: public QObject, public QGeoService public: QGeoCodingManagerEngine *createGeocodingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; }; QT_END_NAMESPACE diff --git a/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.h b/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.h index 61ab9a4a..e1a8186c 100644 --- a/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.h +++ b/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.h @@ -59,7 +59,7 @@ public: QString *errorString); ~QGeoRoutingManagerEngineMapbox(); - QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request); + QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request) override; const QGeoRouteParser *routeParser() const; private Q_SLOTS: diff --git a/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.h b/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.h index 30b4c6ee..b6769e96 100644 --- a/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.h +++ b/src/plugins/geoservices/mapbox/qgeoserviceproviderpluginmapbox.h @@ -52,16 +52,16 @@ class QGeoServiceProviderFactoryMapbox: public QObject, public QGeoServiceProvid public: QGeoCodingManagerEngine *createGeocodingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; }; QT_END_NAMESPACE diff --git a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.h b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.h index 292e4211..f7b64efd 100644 --- a/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.h +++ b/src/plugins/geoservices/mapbox/qgeotiledmappingmanagerenginemapbox.h @@ -52,7 +52,7 @@ public: QGeoServiceProvider::Error *error, QString *errorString); ~QGeoTiledMappingManagerEngineMapbox(); - QGeoMap *createMap(); + QGeoMap *createMap() override; private: QString m_cacheDirectory; diff --git a/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.h b/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.h index 6a653354..b33b6e59 100644 --- a/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.h +++ b/src/plugins/geoservices/mapbox/qgeotilefetchermapbox.h @@ -58,7 +58,7 @@ public: void setAccessToken(const QString &accessToken); private: - QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec); + QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) override; QNetworkAccessManager *m_networkManager; QByteArray m_userAgent; diff --git a/src/plugins/geoservices/nokia/qgeocodejsonparser.h b/src/plugins/geoservices/nokia/qgeocodejsonparser.h index 03251775..abdf8362 100644 --- a/src/plugins/geoservices/nokia/qgeocodejsonparser.h +++ b/src/plugins/geoservices/nokia/qgeocodejsonparser.h @@ -56,7 +56,7 @@ class QGeoCodeJsonParser : public QObject, public QRunnable public: void setBounds(const QGeoShape &bounds); void parse(const QByteArray &data); - void run(); + void run() override; signals: void results(const QList<QGeoLocation> &locations); diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h index 9e1564aa..a9dcee8d 100644 --- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h @@ -60,14 +60,14 @@ public: ~QGeoCodingManagerEngineNokia(); QGeoCodeReply *geocode(const QGeoAddress &address, - const QGeoShape &bounds); + const QGeoShape &bounds) override; QGeoCodeReply *reverseGeocode(const QGeoCoordinate &coordinate, - const QGeoShape &bounds); + const QGeoShape &bounds) override; QGeoCodeReply *geocode(const QString &searchString, int limit, int offset, - const QGeoShape &bounds); + const QGeoShape &bounds) override; private Q_SLOTS: void placesFinished(); diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h index fb5ab482..293004a5 100644 --- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h +++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h @@ -51,8 +51,8 @@ public: explicit QGeoIntrinsicNetworkAccessManager(QObject *parent = 0); QGeoIntrinsicNetworkAccessManager(const QVariantMap ¶meters, const QString &token = QString(), QObject *parent = 0); - virtual QNetworkReply *get(const QNetworkRequest &request); - virtual QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data); + QNetworkReply *get(const QNetworkRequest &request) override; + QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data) override; private: void configure(const QVariantMap ¶meters); diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h index 7f2cc149..9dde9b13 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h @@ -101,7 +101,7 @@ public: ~QGeoRouteXmlParser(); void parse(const QByteArray &data); - void run(); + void run() override; signals: void results(const QList<QGeoRoute> &routes); diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h index 9335bcac..28c6b679 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h @@ -57,8 +57,8 @@ public: QString *errorString); ~QGeoRoutingManagerEngineNokia(); - QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request); - QGeoRouteReply *updateRoute(const QGeoRoute &route, const QGeoCoordinate &position); + QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request) override; + QGeoRouteReply *updateRoute(const QGeoRoute &route, const QGeoCoordinate &position) override; private Q_SLOTS: void routeFinished(); diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h index 5ed2645e..a2107c3e 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h @@ -56,16 +56,16 @@ public: QGeoCodingManagerEngine *createGeocodingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; }; QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h index 487f6f49..cd912852 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h @@ -59,7 +59,7 @@ public: ~QGeoTiledMapNokia(); QString getViewCopyright(); - void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles); + void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) override; private: QImage m_logo; diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h index 16483120..c9c584c1 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h @@ -65,7 +65,7 @@ public: QString *errorString); ~QGeoTiledMappingManagerEngineNokia(); - virtual QGeoMap *createMap(); + QGeoMap *createMap() override; QString evaluateCopyrightsText(const QGeoMapType mapType, const qreal zoomLevel, const QSet<QGeoTileSpec> &tiles); diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h index 06d1bba9..89d605b7 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h @@ -60,7 +60,7 @@ public: QGeoTiledMappingManagerEngineNokia *engine, const QSize &tileSize, int ppi); ~QGeoTileFetcherNokia(); - QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec); + QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) override; QString token() const; QString applicationId() const; diff --git a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h index 8e2d7f50..dfd04c28 100644 --- a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h +++ b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h @@ -58,7 +58,7 @@ public: QString *errorString); ~QGeoRoutingManagerEngineOsm(); - QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request); + QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request) override; const QGeoRouteParser *routeParser() const; private Q_SLOTS: diff --git a/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h b/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h index 5e4ab3e0..36af54e2 100644 --- a/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h +++ b/src/plugins/geoservices/osm/qgeoserviceproviderpluginosm.h @@ -55,16 +55,16 @@ class QGeoServiceProviderFactoryOsm: public QObject, public QGeoServiceProviderF public: QGeoCodingManagerEngine *createGeocodingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, - QString *errorString) const; + QString *errorString) const override; }; QT_END_NAMESPACE diff --git a/src/plugins/position/positionpoll/positionpollfactory.h b/src/plugins/position/positionpoll/positionpollfactory.h index 6841fd0b..e1e33c55 100644 --- a/src/plugins/position/positionpoll/positionpollfactory.h +++ b/src/plugins/position/positionpoll/positionpollfactory.h @@ -50,9 +50,9 @@ class QGeoPositionInfoSourceFactoryPoll : public QObject, public QGeoPositionInf FILE "plugin.json") Q_INTERFACES(QGeoPositionInfoSourceFactory) public: - QGeoPositionInfoSource *positionInfoSource(QObject *parent); - QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent); - QGeoAreaMonitorSource *areaMonitor(QObject *parent); + QGeoPositionInfoSource *positionInfoSource(QObject *parent) override; + QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent) override; + QGeoAreaMonitorSource *areaMonitor(QObject *parent) override; }; #endif // POSITIONPOLLFACTORY_H diff --git a/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.h b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.h index c8ca0e7e..eb468771 100644 --- a/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.h +++ b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.h @@ -51,13 +51,13 @@ class QGeoPositionInfoSourceFactorySerialNmea : public QObject, public QGeoPosit Q_INTERFACES(QGeoPositionInfoSourceFactoryV2) public: - QGeoPositionInfoSource *positionInfoSource(QObject *parent); - QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent); - QGeoAreaMonitorSource *areaMonitor(QObject *parent); + QGeoPositionInfoSource *positionInfoSource(QObject *parent) override; + QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent) override; + QGeoAreaMonitorSource *areaMonitor(QObject *parent) override; - QGeoPositionInfoSource *positionInfoSourceWithParameters(QObject *parent, const QVariantMap ¶meters); - QGeoSatelliteInfoSource *satelliteInfoSourceWithParameters(QObject *parent, const QVariantMap ¶meters); - QGeoAreaMonitorSource *areaMonitorWithParameters(QObject *parent, const QVariantMap ¶meters); + QGeoPositionInfoSource *positionInfoSourceWithParameters(QObject *parent, const QVariantMap ¶meters) override; + QGeoSatelliteInfoSource *satelliteInfoSourceWithParameters(QObject *parent, const QVariantMap ¶meters) override; + QGeoAreaMonitorSource *areaMonitorWithParameters(QObject *parent, const QVariantMap ¶meters) override; }; #endif diff --git a/src/plugins/position/serialnmea/qnmeasatelliteinfosource.cpp b/src/plugins/position/serialnmea/qnmeasatelliteinfosource.cpp index d31106fc..9804c406 100644 --- a/src/plugins/position/serialnmea/qnmeasatelliteinfosource.cpp +++ b/src/plugins/position/serialnmea/qnmeasatelliteinfosource.cpp @@ -62,7 +62,7 @@ public: QGeoSatelliteInfoPrivateNmea(const QGeoSatelliteInfoPrivate &other); QGeoSatelliteInfoPrivateNmea(const QGeoSatelliteInfoPrivateNmea &other); virtual ~QGeoSatelliteInfoPrivateNmea(); - virtual QGeoSatelliteInfoPrivate *clone() const; + QGeoSatelliteInfoPrivate *clone() const override; QList<QByteArray> nmeaSentences; }; |