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, 5 deletions

diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index b9a352c1..18ecef97 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -55,7 +55,7 @@
 #include <QStringList>
 #include <QUrl>
 #include <QLocale>
-#include <qgeoboundingbox.h>
+#include <QtLocation/QGeoRectangle>
 
 QT_BEGIN_NAMESPACE
 
@@ -371,10 +371,10 @@ QString QGeoRoutingManagerEngineNokia::routeRequestString(const QGeoRouteRequest
 {
     QString requestString;
 
-    const QList<QGeoBoundingBox> excludeAreas = request.excludeAreas();
-    QList<QGeoBoundingBox>::const_iterator beg = excludeAreas.begin();
-    QList<QGeoBoundingBox>::const_iterator end = excludeAreas.begin();
-    for (QList<QGeoBoundingBox>::const_iterator it = beg; it != end; ++it) {
+    const QList<QGeoRectangle> excludeAreas = request.excludeAreas();
+    QList<QGeoRectangle>::const_iterator beg = excludeAreas.begin();
+    QList<QGeoRectangle>::const_iterator end = excludeAreas.begin();
+    for (QList<QGeoRectangle>::const_iterator it = beg; it != end; ++it) {
         requestString += QLatin1String("&avoidareas=");
         requestString += trimDouble(it->topLeft().latitude());
         requestString += QLatin1String(",");