Rename Icon class in jsondb plugin.

The Icon class in the jsondb plugin confuses qdoc because the name
clashes with the QML type "Icon" in the QtLocation import.  This is a
workaround for QTBUG-26273.

Change-Id: I5453c0f6a8abc9ccfa67239a5e47d0fb3f240a29
Reviewed-by: Alex <alex.blasche@nokia.com>

6 files changed, 88 insertions, 88 deletions

diff --git a/src/plugins/geoservices/nokia_places_jsondb/icon.cpp b/src/plugins/geoservices/nokia_places_jsondb/icon.cpp
index 1a99c99a..c6d93f38 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/icon.cpp
+++ b/src/plugins/geoservices/nokia_places_jsondb/icon.cpp
@@ -49,38 +49,38 @@
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>
 
-const QSize Icon::SmallSize(QSize(20,20));
-const QSize Icon::MediumSize(QSize(30,30));
-const QSize Icon::LargeSize(QSize(50,50));
-const QSize Icon::FullscreenSize(QSize(320,480));
+const QSize JsonDbIcon::SmallSize(QSize(20,20));
+const QSize JsonDbIcon::MediumSize(QSize(30,30));
+const QSize JsonDbIcon::LargeSize(QSize(50,50));
+const QSize JsonDbIcon::FullscreenSize(QSize(320,480));
 
-const QLatin1String Icon::SmallSource("smallSourceUrl");
-const QLatin1String Icon::MediumSource("mediumSourceUrl");
-const QLatin1String Icon::LargeSource("largeSourceUrl");
-const QLatin1String Icon::FullscreenSource("fullscreenSourceUrl");
+const QLatin1String JsonDbIcon::SmallSource("smallSourceUrl");
+const QLatin1String JsonDbIcon::MediumSource("mediumSourceUrl");
+const QLatin1String JsonDbIcon::LargeSource("largeSourceUrl");
+const QLatin1String JsonDbIcon::FullscreenSource("fullscreenSourceUrl");
 
-const QLatin1String Icon::SmallDestination("smallUrl");
-const QLatin1String Icon::MediumDestination("mediumUrl");
-const QLatin1String Icon::LargeDestination("largeUrl");
-const QLatin1String Icon::FullscreenDestination("fullscreenUrl");
+const QLatin1String JsonDbIcon::SmallDestination("smallUrl");
+const QLatin1String JsonDbIcon::MediumDestination("mediumUrl");
+const QLatin1String JsonDbIcon::LargeDestination("largeUrl");
+const QLatin1String JsonDbIcon::FullscreenDestination("fullscreenUrl");
 
-const QLatin1String Icon::SmallDestinationSize("smallSize");
-const QLatin1String Icon::MediumDestinationSize("mediumSize");
-const QLatin1String Icon::LargeDestinationSize("largeSize");
-const QLatin1String Icon::FullscreenDestinationSize("fullscreenSize");
+const QLatin1String JsonDbIcon::SmallDestinationSize("smallSize");
+const QLatin1String JsonDbIcon::MediumDestinationSize("mediumSize");
+const QLatin1String JsonDbIcon::LargeDestinationSize("largeSize");
+const QLatin1String JsonDbIcon::FullscreenDestinationSize("fullscreenSize");
 
-const QLatin1String Icon::NokiaIcon("nokiaIcon");
-const QLatin1String Icon::NokiaIconGenerated("nokiaIconGenerated");
+const QLatin1String JsonDbIcon::NokiaIcon("nokiaIcon");
+const QLatin1String JsonDbIcon::NokiaIconGenerated("nokiaIconGenerated");
 
-const QLatin1String Icon::DefaultIcon("/icons/categories/06.icon");
+const QLatin1String JsonDbIcon::DefaultIcon("/icons/categories/06.icon");
 
-Icon::Icon(IconHandler *parent)
+JsonDbIcon::JsonDbIcon(IconHandler *parent)
     : QObject(parent), m_iconHandler(parent), m_error(QPlaceReply::NoError)
 {
     Q_ASSERT(parent);
 }
 
-Icon::~Icon()
+JsonDbIcon::~JsonDbIcon()
 {
 }
 
@@ -89,7 +89,7 @@ Icon::~Icon()
 //initialization in the case of having a destination icon url only involves _attempting_
 //to fetch it in order to calculate its size.  If this cannot be done, the
 //user specified size is used.
-void Icon::initialize()
+void JsonDbIcon::initialize()
 {
     QNetworkAccessManager *netManager = m_iconHandler->networkAccessManager();
     QNetworkRequest request;
@@ -102,7 +102,7 @@ void Icon::initialize()
     connect(reply, SIGNAL(finished()), this, SLOT(iconFetchFinished()));
 }
 
-bool Icon::copy() const
+bool JsonDbIcon::copy() const
 {
     QFile file(m_destinationUrl.toLocalFile());
     if (!file.open(QIODevice::WriteOnly)) {
@@ -126,68 +126,68 @@ bool Icon::copy() const
     return true;
 }
 
-QSize Icon::size() const
+QSize JsonDbIcon::size() const
 {
     return m_size;
 }
 
-QSize Icon::specifiedSize() const
+QSize JsonDbIcon::specifiedSize() const
 {
     return m_specifiedSize;
 }
 
-void Icon::setSpecifiedSize(const QSize &size)
+void JsonDbIcon::setSpecifiedSize(const QSize &size)
 {
     m_specifiedSize = size;
 }
 
-QUrl Icon::sourceUrl() const
+QUrl JsonDbIcon::sourceUrl() const
 {
     return m_sourceUrl;
 }
 
-void Icon::setSourceUrl(const QUrl &url)
+void JsonDbIcon::setSourceUrl(const QUrl &url)
 {
     m_sourceUrl = url;
 }
 
-QUrl Icon::destinationUrl() const
+QUrl JsonDbIcon::destinationUrl() const
 {
     return m_destinationUrl;
 }
 
-void Icon::setDestinationUrl(const QUrl &url)
+void JsonDbIcon::setDestinationUrl(const QUrl &url)
 {
     m_destinationUrl = url;
 }
 
-void Icon::setDestinationDataUrl()
+void JsonDbIcon::setDestinationDataUrl()
 {
     QString mimeType = imageFormatToMimeType(m_inputFormat);
     m_destinationUrl = QUrl(QString::fromLatin1("data:") + mimeType + QLatin1String(";base64,") + m_payload.toBase64());
 }
 
-QString Icon::destination() const
+QString JsonDbIcon::destination() const
 {
     return m_destination;
 }
 
-void Icon::setDestination(const QString &destination)
+void JsonDbIcon::setDestination(const QString &destination)
 {
     m_destination = destination;
 }
 
-QPlaceReply::Error Icon::error() const
+QPlaceReply::Error JsonDbIcon::error() const
 {
     return m_error;
 }
 
-QString Icon::errorString() const
+QString JsonDbIcon::errorString() const
 {
     return m_errorString;
 }
 
-void Icon::iconFetchFinished()
+void JsonDbIcon::iconFetchFinished()
 {
     QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
 
@@ -227,7 +227,7 @@ void Icon::iconFetchFinished()
     emit initializationFinished();
 }
 
-QString Icon::imageFormatToMimeType(const QByteArray &format)
+QString JsonDbIcon::imageFormatToMimeType(const QByteArray &format)
 {
     if (format == "bmp")
         return QLatin1String("image/bmp");
diff --git a/src/plugins/geoservices/nokia_places_jsondb/icon.h b/src/plugins/geoservices/nokia_places_jsondb/icon.h
index 16fbb985..a1ca90ff 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/icon.h
+++ b/src/plugins/geoservices/nokia_places_jsondb/icon.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 class IconHandler;
 
-class Icon : public QObject
+class JsonDbIcon : public QObject
 {
     Q_OBJECT
 public:
@@ -88,8 +88,8 @@ public:
 
     static const QLatin1String DefaultIcon;
 
-    Icon(IconHandler *parent);
-    ~Icon();
+    JsonDbIcon(IconHandler *parent);
+    ~JsonDbIcon();
 
     void initialize();
 
diff --git a/src/plugins/geoservices/nokia_places_jsondb/iconhandler.cpp b/src/plugins/geoservices/nokia_places_jsondb/iconhandler.cpp
index 3d7ad4ad..d3245454 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/iconhandler.cpp
+++ b/src/plugins/geoservices/nokia_places_jsondb/iconhandler.cpp
@@ -81,7 +81,7 @@ IconHandler::IconHandler(const QPlaceIcon &inputIcon, const QJsonObject &thumbna
         if (!destinationUrl.isEmpty())
             destination = prefix + QLatin1String("Url");
 
-        Icon *icon = new Icon(this);
+        JsonDbIcon *icon = new JsonDbIcon(this);
         icon->setSourceUrl(sourceUrl);
         icon->setDestinationUrl(destinationUrl);
         icon->setDestination(destination);
@@ -116,7 +116,7 @@ QNetworkAccessManager *IconHandler::networkAccessManager()
 
 void IconHandler::processIcons()
 {
-    if (Icon *senderIcon = qobject_cast<Icon *>(sender())) {
+    if (JsonDbIcon *senderIcon = qobject_cast<JsonDbIcon *>(sender())) {
         if (senderIcon->error() != QPlaceReply::NoError) {
             triggerDone(senderIcon->error(), senderIcon->errorString());
             return;
@@ -124,7 +124,7 @@ void IconHandler::processIcons()
     }
 
     if (m_currIconIndex < m_icons.count()) {
-        Icon *icon = m_icons.at(m_currIconIndex);
+        JsonDbIcon *icon = m_icons.at(m_currIconIndex);
         connect(icon, SIGNAL(initializationFinished()), this, SLOT(processIcons()), Qt::QueuedConnection);
         icon->initialize();
         m_currIconIndex++;
@@ -134,21 +134,21 @@ void IconHandler::processIcons()
 
         //try to set destinations for icons which were not already set
         QStringList specifiedDestinations;
-        foreach (Icon *icon, m_icons) {
+        foreach (JsonDbIcon *icon, m_icons) {
             if (!icon->destination().isEmpty())
                 specifiedDestinations.append(icon->destination());
         }
 
         //try to set small,medium and large destinations if they haven't already been explicitly specified
         //and there are icons with unspecified destinations. (essentially we are creating data urls if necessary)
-        if (!specifiedDestinations.contains(Icon::SmallDestination))
-            trySetDestination(Icon::SmallDestination);
+        if (!specifiedDestinations.contains(JsonDbIcon::SmallDestination))
+            trySetDestination(JsonDbIcon::SmallDestination);
 
-        if (!specifiedDestinations.contains(Icon::MediumDestination))
-            trySetDestination(Icon::MediumDestination);
+        if (!specifiedDestinations.contains(JsonDbIcon::MediumDestination))
+            trySetDestination(JsonDbIcon::MediumDestination);
 
-        if (!specifiedDestinations.contains(Icon::LargeDestination))
-            trySetDestination(Icon::LargeDestination);
+        if (!specifiedDestinations.contains(JsonDbIcon::LargeDestination))
+            trySetDestination(JsonDbIcon::LargeDestination);
 
         //Note that we don't try and set the destination for full screen thumbnails
         //since data urls are meant to be just for small images
@@ -162,7 +162,7 @@ void IconHandler::processIcons()
         m_thumbnailsJson.remove(JsonDb::Fullscreen);
         m_thumbnailsJson.remove(JsonDb::NokiaIcon);
 
-        foreach (Icon *icon, m_icons) {
+        foreach (JsonDbIcon *icon, m_icons) {
             QJsonObject thumbnailJson;
             if (icon->error() != QPlaceReply::NoError) {
                 triggerDone(icon->error(), icon->errorString());
@@ -194,19 +194,19 @@ void IconHandler::processIcons()
                 thumbnailJson.insert(JsonDb::Width, icon->specifiedSize().width());
             }
 
-            if (icon->destination() == Icon::SmallDestination)
+            if (icon->destination() == JsonDbIcon::SmallDestination)
                 m_thumbnailsJson.insert(JsonDb::Small, thumbnailJson);
-            else if (icon->destination() == Icon::MediumDestination)
+            else if (icon->destination() == JsonDbIcon::MediumDestination)
                 m_thumbnailsJson.insert(JsonDb::Medium, thumbnailJson);
-            else if (icon->destination() == Icon::LargeDestination)
+            else if (icon->destination() == JsonDbIcon::LargeDestination)
                 m_thumbnailsJson.insert(JsonDb::Large, thumbnailJson);
             else
                 m_thumbnailsJson.insert(JsonDb::Fullscreen, thumbnailJson);
         }
 
-        QString nokiaIcon = m_inputIcon.parameters().value(Icon::NokiaIcon).toString();
+        QString nokiaIcon = m_inputIcon.parameters().value(JsonDbIcon::NokiaIcon).toString();
         bool nokiaIconGenerated = m_inputIcon.parameters()
-                                        .value(Icon::NokiaIconGenerated).toBool();
+                                        .value(JsonDbIcon::NokiaIconGenerated).toBool();
         if (!nokiaIcon.isEmpty() && !nokiaIconGenerated) {
             QString localIconPath = m_reply->engine()->localDataPath() + nokiaIcon;
             if (QFile::exists(localIconPath))
@@ -231,19 +231,19 @@ void IconHandler::trySetDestination(const QString &destination)
     //assumption is that icons are squarish
     //so we can rely on height as a means to detect which size bucket
     //the icon belongs to
-    if (destination == Icon::SmallDestination) {
-        threshold = (Icon::SmallSize.height() + Icon::MediumSize.height()) / 2;
-        height = Icon::SmallSize.height();
-    } else if (destination == Icon::MediumDestination) {
-        threshold = (Icon::MediumSize.height() + Icon::LargeSize.height()) / 2;
-        height = Icon::MediumSize.height();
-    } else if (destination == Icon::LargeDestination) {
-        threshold = Icon::LargeSize.height() * 2;
-        height = Icon::LargeSize.height();
+    if (destination == JsonDbIcon::SmallDestination) {
+        threshold = (JsonDbIcon::SmallSize.height() + JsonDbIcon::MediumSize.height()) / 2;
+        height = JsonDbIcon::SmallSize.height();
+    } else if (destination == JsonDbIcon::MediumDestination) {
+        threshold = (JsonDbIcon::MediumSize.height() + JsonDbIcon::LargeSize.height()) / 2;
+        height = JsonDbIcon::MediumSize.height();
+    } else if (destination == JsonDbIcon::LargeDestination) {
+        threshold = JsonDbIcon::LargeSize.height() * 2;
+        height = JsonDbIcon::LargeSize.height();
     } //note fullscreen thumbnails should not be set as data urls.
 
-    Icon *currIcon = 0;
-    foreach (Icon *icon, m_icons) {
+    JsonDbIcon *currIcon = 0;
+    foreach (JsonDbIcon *icon, m_icons) {
         if (icon->destination().isEmpty()
                 && icon->size().height() < threshold
                 && (currIcon == 0 ||  qAbs(icon->size().height() - height) < qAbs(currIcon->size().height() - height))) {
diff --git a/src/plugins/geoservices/nokia_places_jsondb/iconhandler.h b/src/plugins/geoservices/nokia_places_jsondb/iconhandler.h
index 689733d5..f6d7a36d 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/iconhandler.h
+++ b/src/plugins/geoservices/nokia_places_jsondb/iconhandler.h
@@ -88,7 +88,7 @@ private:
     QPlaceReply::Error m_error;
     QString m_errorString;
 
-    QList<Icon *> m_icons;
+    QList<JsonDbIcon *> m_icons;
     int m_currIconIndex;
 
     IdReply *m_reply;
diff --git a/src/plugins/geoservices/nokia_places_jsondb/jsondb.cpp b/src/plugins/geoservices/nokia_places_jsondb/jsondb.cpp
index 69ee138d..14875bcc 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/jsondb.cpp
+++ b/src/plugins/geoservices/nokia_places_jsondb/jsondb.cpp
@@ -619,7 +619,7 @@ QPlaceIcon JsonDb::convertJsonObjectToIcon(const QJsonObject &thumbnailsJson,
 
     QString nokiaIcon = thumbnailsJson.value(JsonDb::NokiaIcon).toString();
     if (!nokiaIcon.isEmpty())
-        iconParameters.insert(Icon::NokiaIcon, nokiaIcon);
+        iconParameters.insert(JsonDbIcon::NokiaIcon, nokiaIcon);
 
     if (nokiaIcon.isEmpty() && !engine->useCustomIcons()) {
         const JsonDb *db = engine->db();
@@ -636,11 +636,11 @@ QPlaceIcon JsonDb::convertJsonObjectToIcon(const QJsonObject &thumbnailsJson,
         }
 
         if (nokiaIcon.isEmpty())
-            nokiaIcon = Icon::DefaultIcon;
+            nokiaIcon = JsonDbIcon::DefaultIcon;
 
         if (QFile::exists(iconPrefix + nokiaIcon)) {
-            iconParameters.insert(Icon::NokiaIcon, nokiaIcon);
-            iconParameters.insert(Icon::NokiaIconGenerated, true);
+            iconParameters.insert(JsonDbIcon::NokiaIcon, nokiaIcon);
+            iconParameters.insert(JsonDbIcon::NokiaIconGenerated, true);
         }
     }
 
diff --git a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp b/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp
index 113c4d3c..f7ea7bcc 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp
+++ b/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp
@@ -292,29 +292,29 @@ QPlace QPlaceManagerEngineJsonDb::compatiblePlace(const QPlace &original) const
     QPlaceIcon originalIcon = original.icon();
     if (!originalIcon.isEmpty()) {
         if (originalIcon.parameters().contains(QPlaceIcon::SingleUrl)) {
-                parameters.insert(Icon::MediumSource, originalIcon.url(Icon::MediumSize));
+                parameters.insert(JsonDbIcon::MediumSource, originalIcon.url(JsonDbIcon::MediumSize));
         } else if (originalIcon.manager()) {
             if (originalIcon.manager()->managerName() == QLatin1String("nokia") ||
                  originalIcon.manager()->managerName() == QLatin1String("nokia_mos")) {
                 QString nokiaIcon = originalIcon.parameters()
-                                    .value(Icon::NokiaIcon).toString();
+                                    .value(JsonDbIcon::NokiaIcon).toString();
                 if (!nokiaIcon.isEmpty())
-                    parameters.insert(Icon::NokiaIcon, nokiaIcon);
+                    parameters.insert(JsonDbIcon::NokiaIcon, nokiaIcon);
 
                 bool nokiaIconGenerated = originalIcon.parameters()
-                        .value(Icon::NokiaIconGenerated).toBool() == true;
+                        .value(JsonDbIcon::NokiaIconGenerated).toBool() == true;
                 if (nokiaIconGenerated)
-                     parameters.insert(Icon::NokiaIconGenerated, nokiaIconGenerated);
+                     parameters.insert(JsonDbIcon::NokiaIconGenerated, nokiaIconGenerated);
             } else if (originalIcon.manager()->managerName()
                             == QLatin1String("nokia_places_jsondb")) {
                 parameters = originalIcon.parameters();
             } else {
-                if (!originalIcon.url(Icon::SmallSize).isEmpty())
-                    parameters.insert(Icon::SmallSource, originalIcon.url(Icon::SmallSize));
-                if (!originalIcon.url(Icon::MediumSize).isEmpty())
-                    parameters.insert(Icon::MediumSource, originalIcon.url(Icon::MediumSize));
-                if (!originalIcon.url(Icon::LargeSize).isEmpty())
-                    parameters.insert(Icon::LargeSource, originalIcon.url(Icon::LargeSize));
+                if (!originalIcon.url(JsonDbIcon::SmallSize).isEmpty())
+                    parameters.insert(JsonDbIcon::SmallSource, originalIcon.url(JsonDbIcon::SmallSize));
+                if (!originalIcon.url(JsonDbIcon::MediumSize).isEmpty())
+                    parameters.insert(JsonDbIcon::MediumSource, originalIcon.url(JsonDbIcon::MediumSize));
+                if (!originalIcon.url(JsonDbIcon::LargeSize).isEmpty())
+                    parameters.insert(JsonDbIcon::LargeSource, originalIcon.url(JsonDbIcon::LargeSize));
             }
         }
     }
@@ -336,11 +336,11 @@ QUrl QPlaceManagerEngineJsonDb::constructIconUrl(const QPlaceIcon &icon, const Q
         QList<QPair<int, QUrl> > candidates;
         //TODO: possible optimizations
         QMap<QString, QSize> sizeDictionary;
-        sizeDictionary.insert(Icon::SmallDestination, Icon::SmallSize);
+        sizeDictionary.insert(JsonDbIcon::SmallDestination, JsonDbIcon::SmallSize);
 
-        sizeDictionary.insert(Icon::MediumDestination, Icon::MediumSize);
-        sizeDictionary.insert(Icon::LargeDestination, Icon::LargeSize);
-        sizeDictionary.insert(Icon::FullscreenDestination, Icon::FullscreenSize);
+        sizeDictionary.insert(JsonDbIcon::MediumDestination, JsonDbIcon::MediumSize);
+        sizeDictionary.insert(JsonDbIcon::LargeDestination, JsonDbIcon::LargeSize);
+        sizeDictionary.insert(JsonDbIcon::FullscreenDestination, JsonDbIcon::FullscreenSize);
 
         QStringList sizeKeys;
         sizeKeys << "small" <<  "medium" << "large"
@@ -376,7 +376,7 @@ QUrl QPlaceManagerEngineJsonDb::constructIconUrl(const QPlaceIcon &icon, const Q
             iconUrl = candidates.last().second;
         }
     } else {
-        QString nokiaIcon = icon.parameters().value(Icon::NokiaIcon).toString();
+        QString nokiaIcon = icon.parameters().value(JsonDbIcon::NokiaIcon).toString();
         if (!nokiaIcon.isEmpty()) {
             QString nokiaIconPath = m_localDataPath + nokiaIcon;
             if (QFile::exists(nokiaIconPath)) {