Add Icon support to Places

Change-Id: I559c96427db542dd71122f937dff90c900a02241
Reviewed-on: http://codereview.qt-project.org/6041
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Reviewed-by: abcd <qt_abcd1@ovi.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/location/places/qplacesupplier.cpp b/src/location/places/qplacesupplier.cpp
index c3500f48..24dbb60f 100644
--- a/src/location/places/qplacesupplier.cpp
+++ b/src/location/places/qplacesupplier.cpp
@@ -54,7 +54,7 @@ QPlaceSupplierPrivate::QPlaceSupplierPrivate(const QPlaceSupplierPrivate &other)
     this->name = other.name;
     this->supplierId = other.supplierId;
     this->url = other.url;
-    this->supplierIconUrl = other.supplierIconUrl;
+    this->icon = other.icon;
 }
 
 QPlaceSupplierPrivate::~QPlaceSupplierPrivate()
@@ -67,7 +67,7 @@ bool QPlaceSupplierPrivate::operator==(const QPlaceSupplierPrivate &other) const
             this->name == other.name
             && this->supplierId == other.supplierId
             && this->url == other.url
-            && this->supplierIconUrl == other.supplierIconUrl
+            && this->icon == other.icon
     );
 }
 
@@ -165,17 +165,17 @@ void QPlaceSupplier::setUrl(const QUrl &url)
 }
 
 /*!
-    Returns the supplier's icon URL.
+    Returns the supplier icon
 */
-QUrl QPlaceSupplier::supplierIconUrl() const
+QPlaceIcon QPlaceSupplier::icon() const
 {
-    return d->supplierIconUrl;
+    return d->icon;
 }
 
 /*!
-    Sets \a url of the icon of the supplier.
+    Sets the supplier icon
 */
-void QPlaceSupplier::setSupplierIconUrl(const QUrl &url)
+void QPlaceSupplier::setIcon(const QPlaceIcon &icon)
 {
-    d->supplierIconUrl = url;
+    d->icon = icon;
 }