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>

1 files changed, 5 insertions, 6 deletions

diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
index c502010f..d8c8945b 100644
--- a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
+++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h
@@ -48,11 +48,10 @@
 #include <qgeoaddress.h>
 #include <qgeolocation.h>
 #include <qgeocodereply.h>
-
+#include <QtLocation/QGeoCoordinate>
 
 QT_USE_NAMESPACE
 
-
 class GeocodeReplyTest :public QGeocodeReply
 {
     Q_OBJECT
@@ -65,7 +64,7 @@ public:
     void  callSetLimit ( int limit ) {setLimit(limit);}
     void  callSetOffset ( int offset ) {setOffset(offset);}
     void  callSetLocations ( const QList<QGeoLocation> & locations ) {setLocations(locations);}
-    void  callSetViewport ( const QGeoBoundingArea &viewport ) {setViewport(viewport);}
+    void  callSetViewport ( const QGeoShape &viewport ) {setViewport(viewport);}
 
 };
 
@@ -83,7 +82,7 @@ public:
         setLocale(QLocale(QLocale::German, QLocale::Germany));
     }
 
-    QGeocodeReply*  geocode ( const QString & searchString, int limit, int offset, const QGeoBoundingArea &bounds )
+    QGeocodeReply*  geocode ( const QString & searchString, int limit, int offset, const QGeoShape &bounds )
     {
         GeocodeReplyTest *geocodereply = new GeocodeReplyTest();
         geocodereply->callSetLimit(limit);
@@ -96,7 +95,7 @@ public:
         return static_cast<QGeocodeReply*>(geocodereply);
     }
 
-    QGeocodeReply*  geocode ( const QGeoAddress & address, const QGeoBoundingArea &bounds )
+    QGeocodeReply*  geocode ( const QGeoAddress & address, const QGeoShape &bounds )
     {
         GeocodeReplyTest *geocodereply = new GeocodeReplyTest();
         geocodereply->callSetViewport(bounds);
@@ -107,7 +106,7 @@ public:
         return static_cast<QGeocodeReply*>(geocodereply);
     }
 
-    QGeocodeReply*  reverseGeocode ( const QGeoCoordinate & coordinate, const QGeoBoundingArea &bounds )
+    QGeocodeReply*  reverseGeocode ( const QGeoCoordinate & coordinate, const QGeoShape &bounds )
     {
         GeocodeReplyTest *geocodereply = new GeocodeReplyTest();
         geocodereply->callSetViewport(bounds);