Use QVariantMap instead of QMap<QString, QVariant>.

It is shorter, easier to read, easier to type and it doesn't affect
the ABI.

Change-Id: Ic4d8a371d00b434ac84382dd75d8d82a963089cb
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

16 files changed, 19 insertions, 19 deletions

diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
index d00f4fb9..cbdf98f2 100644
--- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 
 QGeoCodingManagerEngineNokia::QGeoCodingManagerEngineNokia(
         QGeoNetworkAccessManager *networkManager,
-        const QMap<QString, QVariant> &parameters,
+        const QVariantMap &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString)
         : QGeoCodingManagerEngine(parameters)
diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
index 6b9bf1e2..b4e5c75d 100644
--- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
@@ -66,7 +66,7 @@ class QGeoCodingManagerEngineNokia : public QGeoCodingManagerEngine
     Q_OBJECT
 public:
     QGeoCodingManagerEngineNokia(QGeoNetworkAccessManager *networkManager,
-                                 const QMap<QString, QVariant> &parameters,
+                                 const QVariantMap &parameters,
                                  QGeoServiceProvider::Error *error,
                                  QString *errorString);
     ~QGeoCodingManagerEngineNokia();
diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
index 42da0070..69f3c9c9 100644
--- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
+++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
@@ -54,7 +54,7 @@ QGeoIntrinsicNetworkAccessManager::QGeoIntrinsicNetworkAccessManager(QObject *pa
 {
 }
 
-QGeoIntrinsicNetworkAccessManager::QGeoIntrinsicNetworkAccessManager(const QMap<QString, QVariant> &parameters, const QString &token, QObject *parent)
+QGeoIntrinsicNetworkAccessManager::QGeoIntrinsicNetworkAccessManager(const QVariantMap &parameters, const QString &token, QObject *parent)
 : QGeoNetworkAccessManager(parent)
 , m_customProxyToken(token)
 , m_networkManager(new QNetworkAccessManager(this))
@@ -62,7 +62,7 @@ QGeoIntrinsicNetworkAccessManager::QGeoIntrinsicNetworkAccessManager(const QMap<
     configure(parameters);
 }
 
-void QGeoIntrinsicNetworkAccessManager::configure(const QMap<QString, QVariant> &parameters)
+void QGeoIntrinsicNetworkAccessManager::configure(const QVariantMap &parameters)
 {
     QString proxy = parameters.value(QStringLiteral("proxy")).toString();
     if (proxy.isEmpty() && !m_customProxyToken.isEmpty())
diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
index 18f655f6..72ae2990 100644
--- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
+++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
@@ -54,13 +54,13 @@ class QGeoIntrinsicNetworkAccessManager : public QGeoNetworkAccessManager
 {
 public:
     explicit QGeoIntrinsicNetworkAccessManager(QObject *parent = 0);
-    QGeoIntrinsicNetworkAccessManager(const QMap<QString, QVariant> &parameters, const QString &token = QString(), QObject *parent = 0);
+    QGeoIntrinsicNetworkAccessManager(const QVariantMap &parameters, const QString &token = QString(), QObject *parent = 0);
 
     virtual QNetworkReply *get(const QNetworkRequest &request);
     virtual QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data);
 
 private:
-    void configure(const QMap<QString, QVariant> &parameters);
+    void configure(const QVariantMap &parameters);
 
     const QString m_customProxyToken;
     QNetworkAccessManager *m_networkManager;
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index 53bdc3cd..4380494a 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(
         QGeoNetworkAccessManager *networkManager,
-        const QMap<QString, QVariant> &parameters,
+        const QVariantMap &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString)
         : QGeoRoutingManagerEngine(parameters)
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
index 42a3c939..cf9caab0 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
@@ -64,7 +64,7 @@ class QGeoRoutingManagerEngineNokia : public QGeoRoutingManagerEngine
     Q_OBJECT
 public:
     QGeoRoutingManagerEngineNokia(QGeoNetworkAccessManager *networkInterface,
-                                  const QMap<QString, QVariant> &parameters,
+                                  const QVariantMap &parameters,
                                   QGeoServiceProvider::Error *error,
                                   QString *errorString);
     ~QGeoRoutingManagerEngineNokia();
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
index fbffcc5e..1c7c12e5 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
 
 QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia(
     QGeoNetworkAccessManager *networkManager,
-    const QMap<QString, QVariant> &parameters,
+    const QVariantMap &parameters,
     QGeoServiceProvider::Error *error,
     QString *errorString)
     : QGeoTiledMappingManagerEngine()
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
index 3ba30d90..56af20c4 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
@@ -71,7 +71,7 @@ class QGeoTiledMappingManagerEngineNokia : public QGeoTiledMappingManagerEngine
 
 public:
     QGeoTiledMappingManagerEngineNokia(QGeoNetworkAccessManager *networkManager,
-                                       const QMap<QString, QVariant> &parameters,
+                                       const QVariantMap &parameters,
                                        QGeoServiceProvider::Error *error,
                                        QString *errorString);
     ~QGeoTiledMappingManagerEngineNokia();
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index 31fa12e0..13616dbe 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -110,7 +110,7 @@ namespace
     }
 }
 QGeoTileFetcherNokia::QGeoTileFetcherNokia(
-        const QMap<QString, QVariant> &parameters,
+        const QVariantMap &parameters,
         QGeoNetworkAccessManager *networkManager,
         QGeoTiledMappingManagerEngine *engine,
         const QSize &tileSize)
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
index 534dfddb..2d9c385f 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
@@ -69,7 +69,7 @@ class QGeoTileFetcherNokia : public QGeoTileFetcher
 
 public:
     QGeoTileFetcherNokia(
-            const QMap<QString, QVariant> &parameters,
+            const QVariantMap &parameters,
             QGeoNetworkAccessManager *networkManager,
             QGeoTiledMappingManagerEngine *engine,
             const QSize &tileSize);
@@ -96,7 +96,7 @@ private:
 
     QPointer<QGeoTiledMappingManagerEngineNokia> m_engineNokia;
     QGeoNetworkAccessManager *m_networkManager;
-    QMap<QString, QVariant> m_parameters;
+    QVariantMap m_parameters;
     QSize m_tileSize;
     QString m_token;
     QNetworkReply *m_copyrightsReply;
diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.cpp b/src/plugins/geoservices/nokia/qgeouriprovider.cpp
index 0ce3611e..77c47b03 100644
--- a/src/plugins/geoservices/nokia/qgeouriprovider.cpp
+++ b/src/plugins/geoservices/nokia/qgeouriprovider.cpp
@@ -68,7 +68,7 @@ namespace
 
 QGeoUriProvider::QGeoUriProvider(
                 QObject *parent,
-                const QMap<QString, QVariant> & parameters,
+                const QVariantMap &parameters,
                 const QString &hostParameterName,
                 const QString &internationalHost,
                 const QString &localizedHost)
diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.h b/src/plugins/geoservices/nokia/qgeouriprovider.h
index d9f3e570..82f2bb45 100644
--- a/src/plugins/geoservices/nokia/qgeouriprovider.h
+++ b/src/plugins/geoservices/nokia/qgeouriprovider.h
@@ -62,7 +62,7 @@ class QGeoUriProvider : public QObject
 
 public:
     QGeoUriProvider(QObject *parent,
-                    const QMap<QString, QVariant> & parameters,
+                    const QVariantMap &parameters,
                     const QString &hostParameterName,
                     const QString &internationalHost,
                     const QString &localizedHost = QString());
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
index 9c2a9b85..0d2d3953 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
@@ -198,7 +198,7 @@ void CategoryParser::processCategory(int level, const QString &id, const QString
 
 QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2(
     QGeoNetworkAccessManager *networkManager,
-    const QMap<QString, QVariant> &parameters,
+    const QVariantMap &parameters,
     QGeoServiceProvider::Error *error,
     QString *errorString)
     : QPlaceManagerEngine(parameters)
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
index 6b31e165..fc26b1b5 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
@@ -78,7 +78,7 @@ class QPlaceManagerEngineNokiaV2 : public QPlaceManagerEngine
 
 public:
     QPlaceManagerEngineNokiaV2(QGeoNetworkAccessManager *networkManager,
-                               const QMap<QString, QVariant> &parameters,
+                               const QVariantMap &parameters,
                                QGeoServiceProvider::Error *error,
                                QString *errorString);
     ~QPlaceManagerEngineNokiaV2();
diff --git a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp
index 6f7bbb30..077c55ba 100644
--- a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp
+++ b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp
@@ -46,7 +46,7 @@
 
 #include <QtCore/QDebug>
 
-QGeoRoutingManagerEngineOsm::QGeoRoutingManagerEngineOsm(const QMap<QString, QVariant> &parameters,
+QGeoRoutingManagerEngineOsm::QGeoRoutingManagerEngineOsm(const QVariantMap &parameters,
                                                          QGeoServiceProvider::Error *error,
                                                          QString *errorString)
 :   QGeoRoutingManagerEngine(parameters), m_networkManager(new QNetworkAccessManager(this))
diff --git a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h
index 25016887..dd49a826 100644
--- a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h
+++ b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h
@@ -54,7 +54,7 @@ class QGeoRoutingManagerEngineOsm : public QGeoRoutingManagerEngine
     Q_OBJECT
 
 public:
-    QGeoRoutingManagerEngineOsm(const QMap<QString, QVariant> &parameters,
+    QGeoRoutingManagerEngineOsm(const QVariantMap &parameters,
                                 QGeoServiceProvider::Error *error,
                                 QString *errorString);
     ~QGeoRoutingManagerEngineOsm();