summaryrefslogtreecommitdiff
path: root/src/positioning
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/positioning
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/positioning')
-rw-r--r--src/positioning/qgeocircle_p.h12
-rw-r--r--src/positioning/qgeorectangle_p.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/src/positioning/qgeocircle_p.h b/src/positioning/qgeocircle_p.h
index 5af2aef6..7fc0231f 100644
--- a/src/positioning/qgeocircle_p.h
+++ b/src/positioning/qgeocircle_p.h
@@ -58,17 +58,17 @@ public:
QGeoCirclePrivate(const QGeoCirclePrivate &other);
~QGeoCirclePrivate();
- bool isValid() const;
- bool isEmpty() const;
- bool contains(const QGeoCoordinate &coordinate) const;
+ bool isValid() const Q_DECL_OVERRIDE;
+ bool isEmpty() const Q_DECL_OVERRIDE;
+ bool contains(const QGeoCoordinate &coordinate) const Q_DECL_OVERRIDE;
QGeoCoordinate center() const Q_DECL_OVERRIDE;
- void extendShape(const QGeoCoordinate &coordinate);
+ void extendShape(const QGeoCoordinate &coordinate) Q_DECL_OVERRIDE;
- QGeoShapePrivate *clone() const;
+ QGeoShapePrivate *clone() const Q_DECL_OVERRIDE;
- bool operator==(const QGeoShapePrivate &other) const;
+ bool operator==(const QGeoShapePrivate &other) const Q_DECL_OVERRIDE;
QGeoCoordinate m_center;
qreal radius;
diff --git a/src/positioning/qgeorectangle_p.h b/src/positioning/qgeorectangle_p.h
index dbe879e7..34b3842b 100644
--- a/src/positioning/qgeorectangle_p.h
+++ b/src/positioning/qgeorectangle_p.h
@@ -58,17 +58,17 @@ public:
QGeoRectanglePrivate(const QGeoRectanglePrivate &other);
~QGeoRectanglePrivate();
- bool isValid() const;
- bool isEmpty() const;
- bool contains(const QGeoCoordinate &coordinate) const;
+ bool isValid() const Q_DECL_OVERRIDE;
+ bool isEmpty() const Q_DECL_OVERRIDE;
+ bool contains(const QGeoCoordinate &coordinate) const Q_DECL_OVERRIDE;
QGeoCoordinate center() const Q_DECL_OVERRIDE;
- void extendShape(const QGeoCoordinate &coordinate);
+ void extendShape(const QGeoCoordinate &coordinate) Q_DECL_OVERRIDE;
- QGeoShapePrivate *clone() const;
+ QGeoShapePrivate *clone() const Q_DECL_OVERRIDE;
- bool operator==(const QGeoShapePrivate &other) const;
+ bool operator==(const QGeoShapePrivate &other) const Q_DECL_OVERRIDE;
QGeoCoordinate topLeft;
QGeoCoordinate bottomRight;