diff options
author | Kevin Funk <kfunk@kde.org> | 2018-01-31 14:34:16 +0100 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2018-02-05 13:14:46 +0000 |
commit | b4807a11e816feaa3b541b4e4b02f77c1fafbf48 (patch) | |
tree | 8bbbb202dfd8e283b7bdfeadd1396757669e7f04 /src/location/places | |
parent | 4ecd38a9371ceb79abe162c39de6082e112f1053 (diff) | |
download | qtlocation-b4807a11e816feaa3b541b4e4b02f77c1fafbf48.tar.gz |
Replace Q_DECL_OVERRIDE with override
Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/location/places')
-rw-r--r-- | src/location/places/qplaceproposedsearchresult_p.h | 2 | ||||
-rw-r--r-- | src/location/places/qplaceresult_p.h | 2 | ||||
-rw-r--r-- | src/location/places/qplacesearchresult_p.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/location/places/qplaceproposedsearchresult_p.h b/src/location/places/qplaceproposedsearchresult_p.h index 46f95106..b0972bec 100644 --- a/src/location/places/qplaceproposedsearchresult_p.h +++ b/src/location/places/qplaceproposedsearchresult_p.h @@ -60,7 +60,7 @@ public: ~QPlaceProposedSearchResultPrivate(); - bool compare(const QPlaceSearchResultPrivate *other) const Q_DECL_OVERRIDE; + bool compare(const QPlaceSearchResultPrivate *other) const override; Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(QPlaceProposedSearchResult, QPlaceSearchResult::ProposedSearchResult) diff --git a/src/location/places/qplaceresult_p.h b/src/location/places/qplaceresult_p.h index 0e0bf8cd..b7f4065f 100644 --- a/src/location/places/qplaceresult_p.h +++ b/src/location/places/qplaceresult_p.h @@ -60,7 +60,7 @@ public: ~QPlaceResultPrivate(); - bool compare(const QPlaceSearchResultPrivate *other) const Q_DECL_OVERRIDE; + bool compare(const QPlaceSearchResultPrivate *other) const override; Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(QPlaceResult, QPlaceSearchResult::PlaceResult) diff --git a/src/location/places/qplacesearchresult_p.h b/src/location/places/qplacesearchresult_p.h index e7c1aaf5..3d444694 100644 --- a/src/location/places/qplacesearchresult_p.h +++ b/src/location/places/qplacesearchresult_p.h @@ -65,8 +65,8 @@ QT_BEGIN_NAMESPACE Class::Class(const QPlaceSearchResult &other) : QPlaceSearchResult() { Class##Private::copyIfPossible(d_ptr, other); } #define Q_DEFINE_SEARCHRESULT_PRIVATE_HELPER(Class, ResultType) \ - virtual QPlaceSearchResultPrivate *clone() const Q_DECL_OVERRIDE { return new Class##Private(*this); } \ - virtual QPlaceSearchResult::SearchResultType type() const Q_DECL_OVERRIDE {return ResultType;} \ + virtual QPlaceSearchResultPrivate *clone() const override { return new Class##Private(*this); } \ + virtual QPlaceSearchResult::SearchResultType type() const override {return ResultType;} \ static void copyIfPossible(QSharedDataPointer<QPlaceSearchResultPrivate> &d_ptr, const QPlaceSearchResult &other) \ { \ if (other.type() == ResultType) \ |