summaryrefslogtreecommitdiffstats
path: root/src/imports/location/qdeclarativegeocodemodel.cpp
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2012-02-14 13:58:22 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-20 00:22:40 +0100
commitf2f8d5dc1c74024827019378424dcf59ba3096ed (patch)
treea73bb19ba75a8b4dc664f6201bb5bd6cde139fb4 /src/imports/location/qdeclarativegeocodemodel.cpp
parent9b7cf2b63fb9f9ff7b3c5f05b8e916c85c66403b (diff)
Convert QGeoBoundingArea to use value type semantics.
This simplifies the API while keeping the same functionality. Objects of type QGeoBoundingCircle and QGeoBoundingBox can still be passed around as QGeoBoundingArea without losing their identity. QGeoBoundingArea::isValid(), ::isEmpty() and ::contains() function as one would expect. This change removes the necessity of the application developer to track and delete pointers. Change-Id: I1ee70af90319da4c77225c6a0a03601d5ff431f1 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/imports/location/qdeclarativegeocodemodel.cpp')
-rw-r--r--src/imports/location/qdeclarativegeocodemodel.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp
index cd8a666f..1529d738 100644
--- a/src/imports/location/qdeclarativegeocodemodel.cpp
+++ b/src/imports/location/qdeclarativegeocodemodel.cpp
@@ -141,14 +141,14 @@ void QDeclarativeGeocodeModel::componentComplete()
update();
}
-QGeoBoundingArea* QDeclarativeGeocodeModel::boundingArea()
+QGeoBoundingArea QDeclarativeGeocodeModel::boundingArea()
{
if (qobject_cast<QDeclarativeGeoBoundingBox*>(boundingArea_) && boundingBox_.isValid()) {
- return &boundingBox_;
+ return boundingBox_;
} else if (qobject_cast<QDeclarativeGeoBoundingCircle*>(boundingArea_) && boundingCircle_.isValid()) {
- return &boundingCircle_;
+ return boundingCircle_;
}
- return 0;
+ return QGeoBoundingArea();
}
/*!