Rename formattedAddress to text.

The name formattedAddress gave the impression that the address was
always complete, which was not the case.  Rename to "text" and document
that it is the recommended text to use to display the address to the
user and that it is not always complete.

Change-Id: I6c9757ded63e43c52d9764724c4bd0e408c76322
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp
index fe3068e3..ec674ae1 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp
+++ b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp
@@ -165,7 +165,7 @@ void QPlaceDetailsReplyImpl::replyFinished()
 
     QJsonObject addressObject = locationObject.value(QLatin1String("address")).toObject();
 
-    address.setFormattedAddress(addressObject.value(QLatin1String("text")).toString());
+    address.setText(addressObject.value(QLatin1String("text")).toString());
 
     address.setCountry(addressObject.value(QLatin1String("country")).toString());
     address.setCountryCode(addressObject.value(QLatin1String("countryCode")).toString());
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp
index 2d09375d..7ac6a72f 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp
+++ b/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp
@@ -119,7 +119,7 @@ void QPlaceRecommendationReplyImpl::replyFinished()
 
         const QString vicinity = item.value(QLatin1String("vicinity")).toString();
         QGeoAddress address;
-        address.setFormattedAddress(vicinity);
+        address.setText(vicinity);
         location.setAddress(address);
 
         place.setLocation(location);
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp
index ea8d1075..1341a431 100644
--- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp
+++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp
@@ -123,7 +123,7 @@ void QPlaceSearchReplyImpl::replyFinished()
 
         const QString vicinity = item.value(QLatin1String("vicinity")).toString();
         QGeoAddress address;
-        address.setFormattedAddress(vicinity);
+        address.setText(vicinity);
         location.setAddress(address);
 
         if (item.contains(QLatin1String("bbox"))) {