QPlaceManager::constructIconUrl does not need to exist

The PlaceIcon can call the engine directly to get the constructed
icon

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

4 files changed, 4 insertions, 13 deletions

diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp
index 447e632d..0817ed87 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp
@@ -157,7 +157,7 @@ QUrl QDeclarativePlaceIcon::url(const QSize &size, QDeclarativePlaceIcon::IconFl
         icon.setBaseUrl(m_baseUrl);
         icon.setFullUrl(m_fullUrl);
         icon.setManager(placeManager);
-        return placeManager->constructIconUrl(icon, size, QPlaceIcon::IconFlags(int(flags)));
+        return icon.url(size, QPlaceIcon::IconFlags(int(flags)));
     }
 
     return QUrl();
diff --git a/src/location/places/qplaceicon.cpp b/src/location/places/qplaceicon.cpp
index 392c661c..f09bfa98 100644
--- a/src/location/places/qplaceicon.cpp
+++ b/src/location/places/qplaceicon.cpp
@@ -42,6 +42,7 @@
 #include "qplaceicon.h"
 #include "qplaceicon_p.h"
 #include "qplacemanager.h"
+#include "qplacemanagerengine.h"
 
 QT_USE_NAMESPACE
 
@@ -137,7 +138,7 @@ QUrl QPlaceIcon::url(const QSize &size, QPlaceIcon::IconFlags flags) const
         return d->fullUrl;
 
 
-    return d->manager->constructIconUrl(*this, size, flags);
+    return d->manager->d->constructIconUrl(*this, size, flags);
 }
 
 /*!
diff --git a/src/location/places/qplacemanager.cpp b/src/location/places/qplacemanager.cpp
index de9c1923..ee31cfee 100644
--- a/src/location/places/qplacemanager.cpp
+++ b/src/location/places/qplacemanager.cpp
@@ -266,14 +266,6 @@ void QPlaceManager::setLocale(const QLocale &locale)
 }
 
 /*!
-    Constructs an icon url from a given \a icon, \a size and \a flags.
-*/
-QUrl QPlaceManager::constructIconUrl(const QPlaceIcon &icon, const QSize &size, QPlaceIcon::IconFlags flags)
-{
-    return d->constructIconUrl(icon, size, flags);
-}
-
-/*!
     Returns a set of flags indicating what particular features this manager instance supports.
 */
 QPlaceManager::ManagerFeatures QPlaceManager::supportedFeatures() const
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index 5da69cc3..d57ce3c8 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -117,8 +117,6 @@ public:
     QLocale locale() const;
     void setLocale(const QLocale &locale);
 
-    QUrl constructIconUrl(const QPlaceIcon &icon, const QSize &size, QPlaceIcon::IconFlags flags);
-
     ManagerFeatures supportedFeatures() const;
 
 Q_SIGNALS:
@@ -135,12 +133,12 @@ Q_SIGNALS:
 
 private:
     QPlaceManager(QPlaceManagerEngine *engine, QObject *parent = 0);
-
     Q_DISABLE_COPY(QPlaceManager)
 
     QPlaceManagerEngine *d;
 
     friend class QGeoServiceProvider;
+    friend class QPlaceIcon;
 };
 
 QT_END_NAMESPACE