summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/nokia
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2018-01-31 14:34:16 +0100
committerKevin Funk <kevin.funk@kdab.com>2018-02-05 13:14:46 +0000
commitb4807a11e816feaa3b541b4e4b02f77c1fafbf48 (patch)
tree8bbbb202dfd8e283b7bdfeadd1396757669e7f04 /src/plugins/geoservices/nokia
parent4ecd38a9371ceb79abe162c39de6082e112f1053 (diff)
downloadqtlocation-b4807a11e816feaa3b541b4e4b02f77c1fafbf48.tar.gz
Replace Q_DECL_OVERRIDE with override
Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/geoservices/nokia')
-rw-r--r--src/plugins/geoservices/nokia/qgeofiletilecachenokia.h4
-rw-r--r--src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h32
2 files changed, 18 insertions, 18 deletions
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);