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 /tests/auto/qgeocodereply/tst_qgeocodereply.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 'tests/auto/qgeocodereply/tst_qgeocodereply.cpp')
| -rw-r--r-- | tests/auto/qgeocodereply/tst_qgeocodereply.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qgeocodereply/tst_qgeocodereply.cpp b/tests/auto/qgeocodereply/tst_qgeocodereply.cpp index e030b090..93edee0a 100644 --- a/tests/auto/qgeocodereply/tst_qgeocodereply.cpp +++ b/tests/auto/qgeocodereply/tst_qgeocodereply.cpp @@ -275,11 +275,11 @@ void tst_QGeocodeReply::viewport() { QGeoCoordinate *qgeocoordinate = new QGeoCoordinate (12.12 , 54.43); - qgeoboundingbox = new QGeoBoundingBox (*qgeocoordinate, 0.5 , 0.5); + qgeoboundingbox = new QGeoRectangle (*qgeocoordinate, 0.5 , 0.5); reply->callSetViewport(*qgeoboundingbox); - QCOMPARE (reply->viewport(), static_cast<const QGeoBoundingArea &>(*qgeoboundingbox)); + QCOMPARE (reply->viewport(), static_cast<const QGeoShape &>(*qgeoboundingbox)); delete qgeocoordinate; delete qgeoboundingbox; |