Convert GeoShape, GeoRectangle and GeoCircle into QML value types.v5.0.0-beta1

This replaces the GeoShape, GeoRectangle and GeoCircle QML elements with
value types.  A value type is a better fit for shape types.  It is very
similar to a rect with some utility functions.

Declare QGeoShape, QGeoRectangle and QGeoCircle as movable types.

Update documentation.

Change-Id: Id6c48e1e841c68f2f0c5c6a9c4a6580a57e2dfb6
Reviewed-by: abcd <amos.choy@nokia.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/src/imports/location/qdeclarativegeocodemodel_p.h b/src/imports/location/qdeclarativegeocodemodel_p.h
index 15e712e3..ccc3a4e0 100644
--- a/src/imports/location/qdeclarativegeocodemodel_p.h
+++ b/src/imports/location/qdeclarativegeocodemodel_p.h
@@ -73,7 +73,7 @@ class QDeclarativeGeocodeModel : public QAbstractListModel, public QQmlParserSta
     Q_PROPERTY(int limit READ limit WRITE setLimit NOTIFY limitChanged)
     Q_PROPERTY(int offset READ offset WRITE setOffset NOTIFY offsetChanged)
     Q_PROPERTY(QVariant query READ query WRITE setQuery NOTIFY queryChanged)
-    Q_PROPERTY(QObject *bounds READ bounds WRITE setBounds NOTIFY boundsChanged)
+    Q_PROPERTY(QVariant bounds READ bounds WRITE setBounds NOTIFY boundsChanged)
     Q_PROPERTY(GeocodeError error READ error NOTIFY errorChanged)
     Q_INTERFACES(QQmlParserStatus)
 
@@ -114,8 +114,8 @@ public:
     void setPlugin(QDeclarativeGeoServiceProvider *plugin);
     QDeclarativeGeoServiceProvider *plugin() const;
 
-    void setBounds(QObject *bounds);
-    QObject *bounds() const;
+    void setBounds(const QVariant &boundingArea);
+    QVariant bounds() const;
 
     Status status() const;
     QString errorString() const;
@@ -171,14 +171,11 @@ protected:
 
 private:
     void setLocations(const QList<QGeoLocation> &locations);
-    QGeoShape boundingArea();
     void abortRequest();
     QGeocodeReply *reply_;
 
     QDeclarativeGeoServiceProvider *plugin_;
-    QPointer<QObject> boundingArea_;
-    QGeoRectangle boundingBox_;
-    QGeoCircle boundingCircle_;
+    QGeoShape boundingArea_;
 
     QList<QDeclarativeGeoLocation *> declarativeLocations_;