diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2012-06-19 12:55:53 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-21 04:09:32 +0200 |
| commit | 6b68304f59de5fa3f6c861186d98b0c7fe54a4ba (patch) | |
| tree | 1d94a6db5a3ad399149e44510a86c008c58814f2 /src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp | |
| parent | 4b10442e2e83bf7440837e469af344579d1ad9d5 (diff) | |
| download | qtlocation-6b68304f59de5fa3f6c861186d98b0c7fe54a4ba.tar.gz | |
Rename QGeoBoundingArea and related classes to QGeoShape.
QGeoBoundingArea is used for describing more than just a bounding area.
Renaming it to a more appropriate name, QGeoShape. The same is done
for subclasses and QML equivalents.
In C++:
QGeoBoundingArea -> QGeoShape
QGeoBoundingCircle -> QGeoCircle
QGeoBoundingBox -> QGeoRectangle
In QML:
BoundingArea -> GeoShape
BoundingCircle -> GeoCircle
BoundingBox -> GeoRectangle
Change-Id: I93c6df8f1b6c5179ed52fd8354a05f709063b1cf
Reviewed-by: abcd <amos.choy@nokia.com>
Diffstat (limited to 'src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp')
| -rw-r--r-- | src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp index 26d9e23c..d16fef4c 100644 --- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp @@ -49,10 +49,12 @@ #include "qgeocodereply_nokia.h" #include "qgeocodexmlparser.h" +#include <QtLocation/QGeoShape> + QT_BEGIN_NAMESPACE QGeocodeReplyNokia::QGeocodeReplyNokia(QNetworkReply *reply, int limit, int offset, - const QGeoBoundingArea &viewport, QObject *parent) + const QGeoShape &viewport, QObject *parent) : QGeocodeReply(parent), m_reply(reply) { @@ -103,7 +105,7 @@ void QGeocodeReplyNokia::networkFinished() QGeoCodeXmlParser parser; if (parser.parse(m_reply)) { QList<QGeoLocation> locations = parser.results(); - QGeoBoundingArea bounds = viewport(); + QGeoShape bounds = viewport(); if (bounds.isValid()) { for (int i = locations.size() - 1; i >= 0; --i) { if (!bounds.contains(locations[i].coordinate())) |