summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/nokia
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2015-02-09 15:41:43 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-02-17 07:39:31 +0000
commit682fbcc50b33a9425c949b086de1ddebbf494a12 (patch)
tree3cc67e4e27e5fa2d014f1eb0eb17b90c9ff72b99 /src/plugins/geoservices/nokia
parentf5ae66e0ee788c6f99dbd2fa2779d2550e0fb5bf (diff)
downloadqtlocation-682fbcc50b33a9425c949b086de1ddebbf494a12.tar.gz
Add Q_DECL_OVERRIDE where missing
clang 3.6 and later print a warning for such cases. This patch fixes all override warnings caused by the content of the qtlocation itself. The remaining cases are triggered by headers outside of the qtlocation repo. This patch only fixes cases which clang on Linux can reach. It is possible that some of the platform specific plugins still have some ovveride related cases. Change-Id: I9f93062511d38cba4449b7fc70e65c93d4251a8b Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/plugins/geoservices/nokia')
-rw-r--r--src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
index 3753c47a..c5088735 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
@@ -75,33 +75,33 @@ public:
QString *errorString);
~QPlaceManagerEngineNokiaV2();
- QPlaceDetailsReply *getPlaceDetails(const QString &placeId);
+ QPlaceDetailsReply *getPlaceDetails(const QString &placeId) Q_DECL_OVERRIDE;
QPlaceContentReply *getPlaceContent(const QPlaceContentRequest &request) Q_DECL_OVERRIDE;
- QPlaceSearchReply *search(const QPlaceSearchRequest &query);
+ QPlaceSearchReply *search(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE;
- QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query);
+ QPlaceSearchSuggestionReply *searchSuggestions(const QPlaceSearchRequest &query) Q_DECL_OVERRIDE;
- QPlaceIdReply *savePlace(const QPlace &place);
- QPlaceIdReply *removePlace(const QString &placeId);
+ QPlaceIdReply *savePlace(const QPlace &place) Q_DECL_OVERRIDE;
+ QPlaceIdReply *removePlace(const QString &placeId) Q_DECL_OVERRIDE;
- QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId);
- QPlaceIdReply *removeCategory(const QString &categoryId);
+ QPlaceIdReply *saveCategory(const QPlaceCategory &category, const QString &parentId) Q_DECL_OVERRIDE;
+ QPlaceIdReply *removeCategory(const QString &categoryId) Q_DECL_OVERRIDE;
- QPlaceReply *initializeCategories();
- QString parentCategoryId(const QString &categoryId) const;
- QStringList childCategoryIds(const QString &categoryId) const;
- QPlaceCategory category(const QString &categoryId) const;
- QList<QPlaceCategory> childCategories(const QString &parentId) const;
+ 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;
- QList<QLocale> locales() const;
- void setLocales(const QList<QLocale> &locales);
+ QList<QLocale> locales() const Q_DECL_OVERRIDE;
+ void setLocales(const QList<QLocale> &locales) Q_DECL_OVERRIDE;
QPlaceIcon icon(const QString &remotePath,
const QList<QPlaceCategory> &categories = QList<QPlaceCategory>()) const;
- QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const;
+ QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size) const Q_DECL_OVERRIDE;
private:
QNetworkReply *sendRequest(const QUrl &url);