Replace Q_DECL_OVERRIDE with override

Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

27 files changed, 108 insertions, 108 deletions

diff --git a/src/plugins/geoservices/esri/geocodingmanagerengine_esri.h b/src/plugins/geoservices/esri/geocodingmanagerengine_esri.h
index 9ff246e0..ff7bf882 100644
--- a/src/plugins/geoservices/esri/geocodingmanagerengine_esri.h
+++ b/src/plugins/geoservices/esri/geocodingmanagerengine_esri.h
@@ -57,11 +57,11 @@ public:
                                QString *errorString);
     virtual ~GeoCodingManagerEngineEsri();
 
-    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) Q_DECL_OVERRIDE;
+    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) override;
     QGeoCodeReply *geocode(const QString &address, int limit, int offset,
-                           const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                           const QGeoShape &bounds) override;
     QGeoCodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
-                                  const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                                  const QGeoShape &bounds) override;
 
 private Q_SLOTS:
     void replyFinished();
diff --git a/src/plugins/geoservices/esri/georoutingmanagerengine_esri.h b/src/plugins/geoservices/esri/georoutingmanagerengine_esri.h
index 7387e25c..17aaa3ab 100644
--- a/src/plugins/geoservices/esri/georoutingmanagerengine_esri.h
+++ b/src/plugins/geoservices/esri/georoutingmanagerengine_esri.h
@@ -56,7 +56,7 @@ public:
                                 QString *errorString);
     virtual ~GeoRoutingManagerEngineEsri();
 
-    QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request) Q_DECL_OVERRIDE;
+    QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request) override;
 
 private Q_SLOTS:
     void replyFinished();
diff --git a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h
index d198c75a..abd0d59b 100644
--- a/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h
+++ b/src/plugins/geoservices/esri/geoserviceproviderfactory_esri.h
@@ -55,16 +55,16 @@ class GeoServiceProviderFactoryEsri: public QObject, public QGeoServiceProviderF
 public:
     QGeoCodingManagerEngine *createGeocodingManagerEngine(const QVariantMap &parameters,
                                                           QGeoServiceProvider::Error *error,
-                                                          QString *errorString) const Q_DECL_OVERRIDE;
+                                                          QString *errorString) const override;
     QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap &parameters,
                                                          QGeoServiceProvider::Error *error,
-                                                         QString *errorString) const Q_DECL_OVERRIDE;
+                                                         QString *errorString) const override;
     QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap &parameters,
                                                          QGeoServiceProvider::Error *error,
-                                                         QString *errorString) const Q_DECL_OVERRIDE;
+                                                         QString *errorString) const override;
     QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap &parameters,
                                                   QGeoServiceProvider::Error *error,
-                                                  QString *errorString) const Q_DECL_OVERRIDE;
+                                                  QString *errorString) const override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/esri/geotiledmap_esri.h b/src/plugins/geoservices/esri/geotiledmap_esri.h
index d9d9d0b7..07f461d2 100644
--- a/src/plugins/geoservices/esri/geotiledmap_esri.h
+++ b/src/plugins/geoservices/esri/geotiledmap_esri.h
@@ -55,7 +55,7 @@ public:
     virtual ~GeoTiledMapEsri();
 
 protected:
-    void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) Q_DECL_OVERRIDE;
+    void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) override;
 
     inline GeoTiledMappingManagerEngineEsri *engine() const;
 
diff --git a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.h b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.h
index ea0c3c8b..63172389 100644
--- a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.h
+++ b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.h
@@ -57,7 +57,7 @@ public:
                                      QGeoServiceProvider::Error *error, QString *errorString);
     virtual ~GeoTiledMappingManagerEngineEsri();
 
-    QGeoMap *createMap() Q_DECL_OVERRIDE;
+    QGeoMap *createMap() override;
 
     inline const QList<GeoMapSource *>& mapSources() const;
     GeoMapSource *mapSource(int mapId) const;
diff --git a/src/plugins/geoservices/esri/geotilefetcher_esri.h b/src/plugins/geoservices/esri/geotilefetcher_esri.h
index be948af1..5702d1c4 100644
--- a/src/plugins/geoservices/esri/geotilefetcher_esri.h
+++ b/src/plugins/geoservices/esri/geotilefetcher_esri.h
@@ -61,7 +61,7 @@ public:
     inline void setToken(const QString &token);
 
 private:
-    QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) Q_DECL_OVERRIDE;
+    QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) override;
 
     QNetworkAccessManager *m_networkManager;
     QByteArray m_userAgent;
diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
index 8d5edc6d..29b84408 100644
--- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
+++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp
@@ -50,9 +50,9 @@ public:
     virtual ~QGeoMapItemsOverlayPrivate();
 
 protected:
-    void changeViewportSize(const QSize &size) Q_DECL_OVERRIDE;
-    void changeCameraData(const QGeoCameraData &oldCameraData) Q_DECL_OVERRIDE;
-    void changeActiveMapType(const QGeoMapType mapType) Q_DECL_OVERRIDE;
+    void changeViewportSize(const QSize &size) override;
+    void changeCameraData(const QGeoCameraData &oldCameraData) override;
+    void changeActiveMapType(const QGeoMapType mapType) override;
 };
 
 QGeoMapItemsOverlay::QGeoMapItemsOverlay(QGeoMappingManagerEngineItemsOverlay *engine, QObject *parent)
diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h
index bd53a693..47249240 100644
--- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h
+++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h
@@ -54,7 +54,7 @@ public:
 
     virtual ~QGeoMapItemsOverlay();
 protected:
-    QSGNode *updateSceneGraph(QSGNode *node, QQuickWindow *window) Q_DECL_OVERRIDE;
+    QSGNode *updateSceneGraph(QSGNode *node, QQuickWindow *window) override;
 
 private:
     Q_DISABLE_COPY(QGeoMapItemsOverlay)
diff --git a/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.h b/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.h
index 892bf59c..02bc3001 100644
--- a/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.h
+++ b/src/plugins/geoservices/itemsoverlay/qgeomappingmanagerengineitemsoverlay.h
@@ -51,7 +51,7 @@ public:
                                         QGeoServiceProvider::Error *error, QString *errorString);
     ~QGeoMappingManagerEngineItemsOverlay();
 
-    QGeoMap *createMap() Q_DECL_OVERRIDE;
+    QGeoMap *createMap() override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.h b/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.h
index 614151f5..e0913453 100644
--- a/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.h
+++ b/src/plugins/geoservices/mapbox/qgeocodingmanagerenginemapbox.h
@@ -58,11 +58,11 @@ public:
                                QString *errorString);
     ~QGeoCodingManagerEngineMapbox();
 
-    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) Q_DECL_OVERRIDE;
+    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) override;
     QGeoCodeReply *geocode(const QString &address, int limit, int offset,
-                           const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                           const QGeoShape &bounds) override;
     QGeoCodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
-                                  const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                                  const QGeoShape &bounds) override;
 
 private slots:
     void onReplyFinished();
diff --git a/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h b/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h
index faf9b2bf..30a10bdc 100644
--- a/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h
+++ b/src/plugins/geoservices/mapbox/qgeofiletilecachemapbox.h
@@ -50,8 +50,8 @@ public:
     ~QGeoFileTileCacheMapbox();
 
 protected:
-    QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const Q_DECL_OVERRIDE;
-    QGeoTileSpec filenameToTileSpec(const QString &filename) const Q_DECL_OVERRIDE;
+    QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const override;
+    QGeoTileSpec filenameToTileSpec(const QString &filename) const override;
 
     QList<QGeoMapType> m_mapTypes;
     QMap<QString, int> m_mapNameToId;
diff --git a/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.h b/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.h
index 1c5bda5b..120fab74 100644
--- a/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.h
+++ b/src/plugins/geoservices/mapbox/qplacemanagerenginemapbox.h
@@ -56,24 +56,24 @@ public:
                            QString *errorString);
     ~QPlaceManagerEngineMapbox();
 
-    QPlaceSearchReply *search(const QPlaceSearchRequest &) Q_DECL_OVERRIDE;
+    QPlaceSearchReply *search(const QPlaceSearchRequest &) override;
 
-    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &) Q_DECL_OVERRIDE;
+    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &) override;
 
-    QPlaceReply *initializeCategories() Q_DECL_OVERRIDE;
-    QString parentCategoryId(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QStringList childCategoryIds(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QPlaceCategory category(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QList<QPlaceCategory> childCategories(const QString &parentId) const Q_DECL_OVERRIDE;
+    QPlaceReply *initializeCategories() override;
+    QString parentCategoryId(const QString &categoryId) const override;
+    QStringList childCategoryIds(const QString &categoryId) const override;
+    QPlaceCategory category(const QString &categoryId) const override;
+    QList<QPlaceCategory> childCategories(const QString &parentId) const override;
 
-    QList<QLocale> locales() const Q_DECL_OVERRIDE;
-    void setLocales(const QList<QLocale> &locales) Q_DECL_OVERRIDE;
+    QList<QLocale> locales() const override;
+    void setLocales(const QList<QLocale> &locales) override;
 
     // TODO: icon
     //QPlaceIcon icon(const QString &remotePath,
     //                const QList<QPlaceCategory> &categories = QList<QPlaceCategory>()) const;
 
-    //QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const Q_DECL_OVERRIDE;
+    //QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const override;
 
 private slots:
     void onReplyFinished();
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h
index df76fcab..0ffaf4ea 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.h
@@ -53,7 +53,7 @@ public:
     QGeoMapMapboxGL(QGeoMappingManagerEngineMapboxGL *engine, QObject *parent);
     virtual ~QGeoMapMapboxGL();
 
-    QString copyrightsStyleSheet() const Q_DECL_OVERRIDE;
+    QString copyrightsStyleSheet() const override;
     void setMapboxGLSettings(const QMapboxGLSettings &);
     void setUseFBO(bool);
     void setMapItemsBefore(const QString &);
@@ -76,7 +76,7 @@ public Q_SLOTS:
     void copyrightsChanged(const QString &copyrightsHtml);
 
 private:
-    QSGNode *updateSceneGraph(QSGNode *oldNode, QQuickWindow *window) Q_DECL_OVERRIDE;
+    QSGNode *updateSceneGraph(QSGNode *oldNode, QQuickWindow *window) override;
 
     QGeoMappingManagerEngineMapboxGL *m_engine;
 };
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl_p.h b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl_p.h
index 598c9078..ffb06208 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl_p.h
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl_p.h
@@ -60,12 +60,12 @@ public:
 
     QSGNode *updateSceneGraph(QSGNode *oldNode, QQuickWindow *window);
 
-    void addParameter(QGeoMapParameter *param) Q_DECL_OVERRIDE;
-    void removeParameter(QGeoMapParameter *param) Q_DECL_OVERRIDE;
+    void addParameter(QGeoMapParameter *param) override;
+    void removeParameter(QGeoMapParameter *param) override;
 
-    QGeoMap::ItemTypes supportedMapItemTypes() const Q_DECL_OVERRIDE;
-    void addMapItem(QDeclarativeGeoMapItemBase *item) Q_DECL_OVERRIDE;
-    void removeMapItem(QDeclarativeGeoMapItemBase *item) Q_DECL_OVERRIDE;
+    QGeoMap::ItemTypes supportedMapItemTypes() const override;
+    void addMapItem(QDeclarativeGeoMapItemBase *item) override;
+    void removeMapItem(QDeclarativeGeoMapItemBase *item) override;
 
     /* Data members */
     enum SyncState : int {
@@ -92,9 +92,9 @@ public:
     QList<QSharedPointer<QMapboxGLStyleChange>> m_styleChanges;
 
 protected:
-    void changeViewportSize(const QSize &size) Q_DECL_OVERRIDE;
-    void changeCameraData(const QGeoCameraData &oldCameraData) Q_DECL_OVERRIDE;
-    void changeActiveMapType(const QGeoMapType mapType) Q_DECL_OVERRIDE;
+    void changeViewportSize(const QSize &size) override;
+    void changeCameraData(const QGeoCameraData &oldCameraData) override;
+    void changeActiveMapType(const QGeoMapType mapType) override;
 
 private:
     Q_DISABLE_COPY(QGeoMapMapboxGLPrivate);
diff --git a/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h b/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h
index 44096e60..b3afe77b 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h
+++ b/src/plugins/geoservices/mapboxgl/qgeomappingmanagerenginemapboxgl.h
@@ -54,7 +54,7 @@ public:
                                         QGeoServiceProvider::Error *error, QString *errorString);
     ~QGeoMappingManagerEngineMapboxGL();
 
-    QGeoMap *createMap() Q_DECL_OVERRIDE;
+    QGeoMap *createMap() override;
 
 private:
     QMapboxGLSettings m_settings;
diff --git a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange_p.h b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange_p.h
index 33737c1d..fd5b9af4 100644
--- a/src/plugins/geoservices/mapboxgl/qmapboxglstylechange_p.h
+++ b/src/plugins/geoservices/mapboxgl/qmapboxglstylechange_p.h
@@ -70,7 +70,7 @@ public:
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapParameter(QGeoMapParameter *);
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapItem(QDeclarativeGeoMapItemBase *);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapItem(QDeclarativePolylineMapItem *);
@@ -89,7 +89,7 @@ public:
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapParameter(QGeoMapParameter *);
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapItem(QDeclarativeGeoMapItemBase *);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     static QList<QSharedPointer<QMapboxGLStyleChange>> fromMapItem(QDeclarativeRectangleMapItem *);
@@ -111,7 +111,7 @@ public:
     static QSharedPointer<QMapboxGLStyleChange> fromMapParameter(QGeoMapParameter *);
     static QSharedPointer<QMapboxGLStyleChange> fromFeature(const QMapbox::Feature &feature, const QString &before);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleAddLayer() = default;
@@ -125,7 +125,7 @@ class QMapboxGLStyleRemoveLayer : public QMapboxGLStyleChange
 public:
     explicit QMapboxGLStyleRemoveLayer(const QString &id);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleRemoveLayer() = default;
@@ -140,7 +140,7 @@ public:
     static QSharedPointer<QMapboxGLStyleChange> fromFeature(const QMapbox::Feature &feature);
     static QSharedPointer<QMapboxGLStyleChange> fromMapItem(QDeclarativeGeoMapItemBase *);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleAddSource() = default;
@@ -154,7 +154,7 @@ class QMapboxGLStyleRemoveSource : public QMapboxGLStyleChange
 public:
     explicit QMapboxGLStyleRemoveSource(const QString &id);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleRemoveSource() = default;
@@ -167,7 +167,7 @@ class QMapboxGLStyleSetFilter : public QMapboxGLStyleChange
 public:
     static QSharedPointer<QMapboxGLStyleChange> fromMapParameter(QGeoMapParameter *);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleSetFilter() = default;
@@ -181,7 +181,7 @@ class QMapboxGLStyleAddImage : public QMapboxGLStyleChange
 public:
     static QSharedPointer<QMapboxGLStyleChange> fromMapParameter(QGeoMapParameter *);
 
-    void apply(QMapboxGL *map) Q_DECL_OVERRIDE;
+    void apply(QMapboxGL *map) override;
 
 private:
     QMapboxGLStyleAddImage() = default;
diff --git a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
index 5805a76c..f89ee143 100644
--- a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
+++ b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
@@ -71,8 +71,8 @@ public:
     QMapboxGL* map() const;
 
     // QSGRenderNode
-    void render(const RenderState *state) Q_DECL_OVERRIDE;
-    StateFlags changedStates() const Q_DECL_OVERRIDE;
+    void render(const RenderState *state) override;
+    StateFlags changedStates() const override;
 
 private:
     QScopedPointer<QMapboxGL> m_map;
diff --git a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
index aba232f5..4dcd445b 100644
--- a/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
+++ b/src/plugins/geoservices/nokia/qgeofiletilecachenokia.h
@@ -49,8 +49,8 @@ public:
     ~QGeoFileTileCacheNokia();
 
 protected:
-    virtual QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const Q_DECL_OVERRIDE;
-    virtual QGeoTileSpec filenameToTileSpec(const QString &filename) const Q_DECL_OVERRIDE;
+    virtual QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const override;
+    virtual QGeoTileSpec filenameToTileSpec(const QString &filename) const override;
 
     QString m_ppi;
 };
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
index fe2e537e..cd632958 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
@@ -71,33 +71,33 @@ public:
                                QString *errorString);
     ~QPlaceManagerEngineNokiaV2();
 
-    QPlaceDetailsReply *getPlaceDetails(const QString &placeId) Q_DECL_OVERRIDE;
+    QPlaceDetailsReply *getPlaceDetails(const QString &placeId) override;
 
-    QPlaceContentReply *getPlaceContent(const QPlaceContentRequest &request) Q_DECL_OVERRIDE;
+    QPlaceContentReply *getPlaceContent(const QPlaceContentRequest &request) override;
 
-    QPlaceSearchReply *search(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE;
+    QPlaceSearchReply *search(const QPlaceSearchRequest &query) override;
 
-    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE;
+    QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query) override;
 
-    QPlaceIdReply *savePlace(const QPlace &place) Q_DECL_OVERRIDE;
-    QPlaceIdReply *removePlace(const QString &placeId) Q_DECL_OVERRIDE;
+    QPlaceIdReply *savePlace(const QPlace &place) override;
+    QPlaceIdReply *removePlace(const QString &placeId) override;
 
-    QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId) Q_DECL_OVERRIDE;
-    QPlaceIdReply *removeCategory(const QString &categoryId) Q_DECL_OVERRIDE;
+    QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId) override;
+    QPlaceIdReply *removeCategory(const QString &categoryId) override;
 
-    QPlaceReply *initializeCategories() Q_DECL_OVERRIDE;
-    QString parentCategoryId(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QStringList childCategoryIds(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QPlaceCategory category(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QList<QPlaceCategory> childCategories(const QString &parentId) const Q_DECL_OVERRIDE;
+    QPlaceReply *initializeCategories() override;
+    QString parentCategoryId(const QString &categoryId) const override;
+    QStringList childCategoryIds(const QString &categoryId) const override;
+    QPlaceCategory category(const QString &categoryId) const override;
+    QList<QPlaceCategory> childCategories(const QString &parentId) const override;
 
-    QList<QLocale> locales() const Q_DECL_OVERRIDE;
-    void setLocales(const QList<QLocale> &locales) Q_DECL_OVERRIDE;
+    QList<QLocale> locales() const override;
+    void setLocales(const QList<QLocale> &locales) override;
 
     QPlaceIcon icon(const QString &remotePath,
                     const QList<QPlaceCategory> &categories = QList<QPlaceCategory>()) const;
 
-    QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const Q_DECL_OVERRIDE;
+    QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const override;
 
 private:
     QNetworkReply *sendRequest(const QUrl &url);
diff --git a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h
index 4eea2cde..0fec49de 100644
--- a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h
+++ b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.h
@@ -57,11 +57,11 @@ public:
                                QString *errorString);
     ~QGeoCodingManagerEngineOsm();
 
-    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) Q_DECL_OVERRIDE;
+    QGeoCodeReply *geocode(const QGeoAddress &address, const QGeoShape &bounds) override;
     QGeoCodeReply *geocode(const QString &address, int limit, int offset,
-                           const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                           const QGeoShape &bounds) override;
     QGeoCodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
-                                  const QGeoShape &bounds) Q_DECL_OVERRIDE;
+                                  const QGeoShape &bounds) override;
 
 private Q_SLOTS:
     void replyFinished();
diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
index f26e7f10..5f11004c 100644
--- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
+++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
@@ -55,7 +55,7 @@ public:
                          QObject *parent = 0);
     ~QGeoFileTileCacheOsm();
 
-    QSharedPointer<QGeoTileTexture> get(const QGeoTileSpec &spec) Q_DECL_OVERRIDE;
+    QSharedPointer<QGeoTileTexture> get(const QGeoTileSpec &spec) override;
 
 Q_SIGNALS:
     void mapDataUpdated(int mapId);
@@ -65,9 +65,9 @@ protected Q_SLOTS:
     void onProviderResolutionError(const QGeoTileProviderOsm *provider, QNetworkReply::NetworkError error);
 
 protected:
-    void init() Q_DECL_OVERRIDE;
-    QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const Q_DECL_OVERRIDE;
-    QGeoTileSpec filenameToTileSpec(const QString &filename) const Q_DECL_OVERRIDE;
+    void init() override;
+    QString tileSpecToFilename(const QGeoTileSpec &spec, const QString &format, const QString &directory) const override;
+    QGeoTileSpec filenameToTileSpec(const QString &filename) const override;
     QSharedPointer<QGeoTileTexture> getFromOfflineStorage(const QGeoTileSpec &spec);
     void dropTiles(int mapId);
     void loadTiles(int mapId);
diff --git a/src/plugins/geoservices/osm/qgeotiledmaposm.h b/src/plugins/geoservices/osm/qgeotiledmaposm.h
index cfc72948..b2af5d89 100644
--- a/src/plugins/geoservices/osm/qgeotiledmaposm.h
+++ b/src/plugins/geoservices/osm/qgeotiledmaposm.h
@@ -56,7 +56,7 @@ public:
     ~QGeoTiledMapOsm();
 
 protected:
-    void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) Q_DECL_OVERRIDE;
+    void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles) override;
 
 protected Q_SLOTS:
     void onProviderDataUpdated(const QGeoTileProviderOsm *provider);
diff --git a/src/plugins/geoservices/osm/qgeotilefetcherosm.h b/src/plugins/geoservices/osm/qgeotilefetcherosm.h
index 859033cc..682ff689 100644
--- a/src/plugins/geoservices/osm/qgeotilefetcherosm.h
+++ b/src/plugins/geoservices/osm/qgeotilefetcherosm.h
@@ -67,7 +67,7 @@ Q_SIGNALS:
     void providerDataUpdated(const QGeoTileProviderOsm *provider);
 
 protected:
-    bool initialized() const Q_DECL_OVERRIDE;
+    bool initialized() const override;
 
 protected Q_SLOTS:
     void onProviderResolutionFinished(const QGeoTileProviderOsm *provider);
@@ -75,7 +75,7 @@ protected Q_SLOTS:
     void restartTimer();
 
 private:
-    QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) Q_DECL_OVERRIDE;
+    QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) override;
     void readyUpdated();
 
     QByteArray m_userAgent;
diff --git a/src/plugins/geoservices/osm/qplacemanagerengineosm.h b/src/plugins/geoservices/osm/qplacemanagerengineosm.h
index 76898dad..77580226 100644
--- a/src/plugins/geoservices/osm/qplacemanagerengineosm.h
+++ b/src/plugins/geoservices/osm/qplacemanagerengineosm.h
@@ -58,17 +58,17 @@ public:
                            QString *errorString);
     ~QPlaceManagerEngineOsm();
 
-    QPlaceSearchReply *search(const QPlaceSearchRequest &request) Q_DECL_OVERRIDE;
+    QPlaceSearchReply *search(const QPlaceSearchRequest &request) override;
 
-    QPlaceReply *initializeCategories() Q_DECL_OVERRIDE;
-    QString parentCategoryId(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QStringList childCategoryIds(const QString &categoryId) const Q_DECL_OVERRIDE;
-    QPlaceCategory category(const QString &categoryId) const Q_DECL_OVERRIDE;
+    QPlaceReply *initializeCategories() override;
+    QString parentCategoryId(const QString &categoryId) const override;
+    QStringList childCategoryIds(const QString &categoryId) const override;
+    QPlaceCategory category(const QString &categoryId) const override;
 
-    QList<QPlaceCategory> childCategories(const QString &parentId) const Q_DECL_OVERRIDE;
+    QList<QPlaceCategory> childCategories(const QString &parentId) const override;
 
-    QList<QLocale> locales() const Q_DECL_OVERRIDE;
-    void setLocales(const QList<QLocale> &locales) Q_DECL_OVERRIDE;
+    QList<QLocale> locales() const override;
+    void setLocales(const QList<QLocale> &locales) override;
 
 private slots:
     void categoryReplyFinished();
diff --git a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h
index 6125cb42..d27721da 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h
+++ b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h
@@ -60,9 +60,9 @@ class QGeoPositionInfoSourceFactoryGeoclue : public QObject, public QGeoPosition
     Q_INTERFACES(QGeoPositionInfoSourceFactory)
 
 public:
-    QGeoPositionInfoSource *positionInfoSource(QObject *parent) Q_DECL_OVERRIDE;
-    QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent) Q_DECL_OVERRIDE;
-    QGeoAreaMonitorSource *areaMonitor(QObject *parent) Q_DECL_OVERRIDE;
+    QGeoPositionInfoSource *positionInfoSource(QObject *parent) override;
+    QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent) override;
+    QGeoAreaMonitorSource *areaMonitor(QObject *parent) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h
index 45a0ed79..254a17ac 100644
--- a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h
+++ b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h
@@ -61,14 +61,14 @@ public:
     explicit QGeoSatelliteInfoSourceGeoclueMaster(QObject *parent = 0);
     ~QGeoSatelliteInfoSourceGeoclueMaster();
 
-    int minimumUpdateInterval() const Q_DECL_OVERRIDE;
-    void setUpdateInterval(int msec) Q_DECL_OVERRIDE;
+    int minimumUpdateInterval() const override;
+    void setUpdateInterval(int msec) override;
 
-    Error error() const Q_DECL_OVERRIDE;
+    Error error() const override;
 
-    void startUpdates() Q_DECL_OVERRIDE;
-    void stopUpdates() Q_DECL_OVERRIDE;
-    void requestUpdate(int timeout = 0) Q_DECL_OVERRIDE;
+    void startUpdates() override;
+    void stopUpdates() override;
+    void requestUpdate(int timeout = 0) override;
 
 private slots:
     void positionProviderChanged(const QString &name, const QString &description,
diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
index c40d424b..11161869 100644
--- a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
+++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h
@@ -57,20 +57,20 @@ public :
     explicit QGeoAreaMonitorPolling(QObject *parent = 0);
     ~QGeoAreaMonitorPolling();
 
-    void setPositionInfoSource(QGeoPositionInfoSource *source) Q_DECL_OVERRIDE;
-    QGeoPositionInfoSource* positionInfoSource() const Q_DECL_OVERRIDE;
+    void setPositionInfoSource(QGeoPositionInfoSource *source) override;
+    QGeoPositionInfoSource* positionInfoSource() const override;
 
-    Error error() const Q_DECL_OVERRIDE;
+    Error error() const override;
 
-    bool startMonitoring(const QGeoAreaMonitorInfo &monitor) Q_DECL_OVERRIDE;
+    bool startMonitoring(const QGeoAreaMonitorInfo &monitor) override;
     bool requestUpdate(const QGeoAreaMonitorInfo &monitor,
-                       const char *signal) Q_DECL_OVERRIDE;
-    bool stopMonitoring(const QGeoAreaMonitorInfo &monitor) Q_DECL_OVERRIDE;
+                       const char *signal) override;
+    bool stopMonitoring(const QGeoAreaMonitorInfo &monitor) override;
 
-    QList<QGeoAreaMonitorInfo> activeMonitors() const Q_DECL_OVERRIDE;
-    QList<QGeoAreaMonitorInfo> activeMonitors(const QGeoShape &region) const Q_DECL_OVERRIDE;
+    QList<QGeoAreaMonitorInfo> activeMonitors() const override;
+    QList<QGeoAreaMonitorInfo> activeMonitors(const QGeoShape &region) const override;
 
-    QGeoAreaMonitorSource::AreaMonitorFeatures supportedAreaMonitorFeatures() const Q_DECL_OVERRIDE;
+    QGeoAreaMonitorSource::AreaMonitorFeatures supportedAreaMonitorFeatures() const override;
 
     inline bool isValid() { return positionInfoSource(); }
 
@@ -85,8 +85,8 @@ private:
     QGeoAreaMonitorPollingPrivate* d;
     QGeoAreaMonitorSource::Error lastError;
 
-    void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE;
-    void disconnectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE;
+    void connectNotify(const QMetaMethod &signal) override;
+    void disconnectNotify(const QMetaMethod &signal) override;
 
     int idForSignal(const char *signal);
 };