diff options
author | Aaron McCarthy <aaron.mccarthy@jollamobile.com> | 2014-01-06 16:39:10 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-08 09:01:28 +0100 |
commit | 4d3134b673faf5eb3c84e37bff25c8d678172ee3 (patch) | |
tree | 06b053e2a5c9803ca53c46f57878da679a7b2efa | |
parent | a12f2caf8fd801fc84953072bae7d185ba0ed109 (diff) | |
download | qtlocation-4d3134b673faf5eb3c84e37bff25c8d678172ee3.tar.gz |
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>
47 files changed, 68 insertions, 67 deletions
diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp index f91b9ed1..da92644c 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider.cpp +++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp @@ -571,9 +571,9 @@ void QDeclarativeGeoServiceProvider::parameter_clear(QQmlListProperty<QDeclarati /*! \internal */ -QMap<QString, QVariant> QDeclarativeGeoServiceProvider::parameterMap() const +QVariantMap QDeclarativeGeoServiceProvider::parameterMap() const { - QMap<QString, QVariant> map; + QVariantMap map; for (int i = 0; i < parameters_.size(); ++i) { QDeclarativeGeoServiceProviderParameter *parameter = parameters_.at(i); diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h index 75743f83..b859f803 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider_p.h +++ b/src/imports/location/qdeclarativegeoserviceprovider_p.h @@ -169,7 +169,7 @@ public: QString name() const; QQmlListProperty<QDeclarativeGeoServiceProviderParameter> parameters(); - QMap<QString, QVariant> parameterMap() const; + QVariantMap parameterMap() const; QStringList availableServiceProviders(); diff --git a/src/location/maps/qgeocodingmanagerengine.cpp b/src/location/maps/qgeocodingmanagerengine.cpp index f3aa2870..965f09a5 100644 --- a/src/location/maps/qgeocodingmanagerengine.cpp +++ b/src/location/maps/qgeocodingmanagerengine.cpp @@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE Constructs a new engine with the specified \a parent, using \a parameters to pass any implementation specific data to the engine. */ -QGeoCodingManagerEngine::QGeoCodingManagerEngine(const QMap<QString, QVariant> ¶meters, QObject *parent) +QGeoCodingManagerEngine::QGeoCodingManagerEngine(const QVariantMap ¶meters, QObject *parent) : QObject(parent), d_ptr(new QGeoCodingManagerEnginePrivate()) { diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h index aa2839a0..11862db3 100644 --- a/src/location/maps/qgeocodingmanagerengine.h +++ b/src/location/maps/qgeocodingmanagerengine.h @@ -56,7 +56,7 @@ class Q_LOCATION_EXPORT QGeoCodingManagerEngine : public QObject { Q_OBJECT public: - QGeoCodingManagerEngine(const QMap<QString, QVariant> ¶meters, QObject *parent = 0); + QGeoCodingManagerEngine(const QVariantMap ¶meters, QObject *parent = 0); virtual ~QGeoCodingManagerEngine(); QString managerName() const; diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h index 903ac14b..a26a4cbd 100644 --- a/src/location/maps/qgeomappingmanagerengine_p.h +++ b/src/location/maps/qgeomappingmanagerengine_p.h @@ -87,7 +87,7 @@ public: virtual QGeoMapData *createMapData() = 0; - QMap<QString, QVariant> parameters() const; + QVariantMap parameters() const; QString managerName() const; int managerVersion() const; diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp index 20a10164..7b81d7a6 100644 --- a/src/location/maps/qgeoroutingmanagerengine.cpp +++ b/src/location/maps/qgeoroutingmanagerengine.cpp @@ -87,7 +87,7 @@ QT_BEGIN_NAMESPACE Constructs a new engine with the specified \a parent, using \a parameters to pass any implementation specific data to the engine. */ -QGeoRoutingManagerEngine::QGeoRoutingManagerEngine(const QMap<QString, QVariant> ¶meters, QObject *parent) +QGeoRoutingManagerEngine::QGeoRoutingManagerEngine(const QVariantMap ¶meters, QObject *parent) : QObject(parent), d_ptr(new QGeoRoutingManagerEnginePrivate()) { diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h index 71f3f77a..1e05b890 100644 --- a/src/location/maps/qgeoroutingmanagerengine.h +++ b/src/location/maps/qgeoroutingmanagerengine.h @@ -56,7 +56,7 @@ class Q_LOCATION_EXPORT QGeoRoutingManagerEngine : public QObject { Q_OBJECT public: - QGeoRoutingManagerEngine(const QMap<QString, QVariant> ¶meters, QObject *parent = 0); + QGeoRoutingManagerEngine(const QVariantMap ¶meters, QObject *parent = 0); virtual ~QGeoRoutingManagerEngine(); QString managerName() const; diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index c91ef8a5..2babbba6 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -641,7 +641,7 @@ void QGeoServiceProviderPrivate::loadMeta() } } -void QGeoServiceProviderPrivate::loadPlugin(const QMap<QString, QVariant> ¶meters) +void QGeoServiceProviderPrivate::loadPlugin(const QVariantMap ¶meters) { Q_UNUSED(parameters) diff --git a/src/location/maps/qgeoserviceprovider_p.h b/src/location/maps/qgeoserviceprovider_p.h index 1ec19c89..1d92149e 100644 --- a/src/location/maps/qgeoserviceprovider_p.h +++ b/src/location/maps/qgeoserviceprovider_p.h @@ -75,7 +75,7 @@ public: ~QGeoServiceProviderPrivate(); void loadMeta(); - void loadPlugin(const QMap<QString, QVariant> ¶meters); + void loadPlugin(const QVariantMap ¶meters); void unload(); /* helper templates for generating the feature and manager accessors */ @@ -88,7 +88,7 @@ public: QGeoServiceProviderFactory *factory; QJsonObject metaData; - QMap<QString, QVariant> parameterMap; + QVariantMap parameterMap; bool experimental; diff --git a/src/location/maps/qgeoserviceproviderfactory.cpp b/src/location/maps/qgeoserviceproviderfactory.cpp index 8fbfb3d7..b1c7759c 100644 --- a/src/location/maps/qgeoserviceproviderfactory.cpp +++ b/src/location/maps/qgeoserviceproviderfactory.cpp @@ -78,7 +78,7 @@ Destroys this QGeoServiceProviderFactory instance. The default implementation returns 0, which causes a QGeoServiceProvider::NotSupportedError in QGeoServiceProvider. */ -QGeoCodingManagerEngine *QGeoServiceProviderFactory::createGeocodingManagerEngine(const QMap<QString, QVariant> ¶meters, +QGeoCodingManagerEngine *QGeoServiceProviderFactory::createGeocodingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { @@ -104,7 +104,7 @@ QGeoCodingManagerEngine *QGeoServiceProviderFactory::createGeocodingManagerEngin \internal */ -QGeoMappingManagerEngine *QGeoServiceProviderFactory::createMappingManagerEngine(const QMap<QString, QVariant> ¶meters, +QGeoMappingManagerEngine *QGeoServiceProviderFactory::createMappingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { @@ -128,7 +128,7 @@ QGeoMappingManagerEngine *QGeoServiceProviderFactory::createMappingManagerEngine The default implementation returns 0, which causes a QGeoServiceProvider::NotSupportedError in QGeoServiceProvider. */ -QGeoRoutingManagerEngine *QGeoServiceProviderFactory::createRoutingManagerEngine(const QMap<QString, QVariant> ¶meters, +QGeoRoutingManagerEngine *QGeoServiceProviderFactory::createRoutingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const @@ -153,7 +153,7 @@ QGeoRoutingManagerEngine *QGeoServiceProviderFactory::createRoutingManagerEngine The default implementation returns 0, which causes a QGeoServiceProvider::NotSupportedError in QGeoServiceProvider. */ -QPlaceManagerEngine *QGeoServiceProviderFactory::createPlaceManagerEngine(const QMap<QString, QVariant> ¶meters, +QPlaceManagerEngine *QGeoServiceProviderFactory::createPlaceManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h index 28c27ef0..b2843301 100644 --- a/src/location/maps/qgeoserviceproviderfactory.h +++ b/src/location/maps/qgeoserviceproviderfactory.h @@ -55,16 +55,16 @@ class Q_LOCATION_EXPORT QGeoServiceProviderFactory public: virtual ~QGeoServiceProviderFactory() {} - virtual QGeoCodingManagerEngine *createGeocodingManagerEngine(const QMap<QString, QVariant> ¶meters, + virtual QGeoCodingManagerEngine *createGeocodingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; - virtual QGeoMappingManagerEngine *createMappingManagerEngine(const QMap<QString, QVariant> ¶meters, + virtual QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; - virtual QGeoRoutingManagerEngine *createRoutingManagerEngine(const QMap<QString, QVariant> ¶meters, + virtual QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; - virtual QPlaceManagerEngine *createPlaceManagerEngine(const QMap<QString, QVariant> ¶meters, + virtual QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; }; diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp index 67dbf9c6..89bf6100 100644 --- a/src/location/places/qplacemanagerengine.cpp +++ b/src/location/places/qplacemanagerengine.cpp @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE Constructs a new engine with the specified \a parent, using \a parameters to pass any implementation specific data to the engine. */ -QPlaceManagerEngine::QPlaceManagerEngine(const QMap<QString, QVariant> ¶meters, +QPlaceManagerEngine::QPlaceManagerEngine(const QVariantMap ¶meters, QObject *parent) : QObject(parent), d_ptr(new QPlaceManagerEnginePrivate) { diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h index ee019637..13512955 100644 --- a/src/location/places/qplacemanagerengine.h +++ b/src/location/places/qplacemanagerengine.h @@ -58,7 +58,7 @@ class Q_LOCATION_EXPORT QPlaceManagerEngine : public QObject Q_OBJECT public: - QPlaceManagerEngine(const QMap<QString, QVariant> ¶meters, QObject *parent = 0); + QPlaceManagerEngine(const QVariantMap ¶meters, QObject *parent = 0); virtual ~QPlaceManagerEngine(); QString managerName() const; 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> ¶meters, + const QVariantMap ¶meters, 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> ¶meters, + const QVariantMap ¶meters, 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> ¶meters, const QString &token, QObject *parent) +QGeoIntrinsicNetworkAccessManager::QGeoIntrinsicNetworkAccessManager(const QVariantMap ¶meters, 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> ¶meters) +void QGeoIntrinsicNetworkAccessManager::configure(const QVariantMap ¶meters) { 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> ¶meters, const QString &token = QString(), QObject *parent = 0); + QGeoIntrinsicNetworkAccessManager(const QVariantMap ¶meters, 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> ¶meters); + void configure(const QVariantMap ¶meters); 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> ¶meters, + const QVariantMap ¶meters, 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> ¶meters, + const QVariantMap ¶meters, 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> ¶meters, + const QVariantMap ¶meters, 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> ¶meters, + const QVariantMap ¶meters, 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> ¶meters, + const QVariantMap ¶meters, 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> ¶meters, + const QVariantMap ¶meters, 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 ¶meters, 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 ¶meters, 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> ¶meters, + const QVariantMap ¶meters, 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> ¶meters, + const QVariantMap ¶meters, 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> ¶meters, +QGeoRoutingManagerEngineOsm::QGeoRoutingManagerEngineOsm(const QVariantMap ¶meters, 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> ¶meters, + QGeoRoutingManagerEngineOsm(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString); ~QGeoRoutingManagerEngineOsm(); diff --git a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h index 29058c83..b48c0bb0 100644 --- a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h +++ b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h @@ -82,7 +82,7 @@ class QGeoCodingManagerEngineTest: public QGeoCodingManagerEngine { Q_OBJECT public: - QGeoCodingManagerEngineTest(const QMap<QString, QVariant> ¶meters, + QGeoCodingManagerEngineTest(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoCodingManagerEngine(parameters), validateWellKnownValues_(false), diff --git a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h index ebdd3fa7..b9612ba9 100644 --- a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h +++ b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h @@ -83,7 +83,7 @@ class QGeoRoutingManagerEngineTest: public QGeoRoutingManagerEngine QString errorString_; public: - QGeoRoutingManagerEngineTest(const QMap<QString, QVariant> ¶meters, + QGeoRoutingManagerEngineTest(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoRoutingManagerEngine(parameters), routeReply_(0), diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp index b902d75c..5e770475 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.cpp @@ -56,15 +56,15 @@ QGeoServiceProviderFactoryTest::~QGeoServiceProviderFactoryTest() } QGeoRoutingManagerEngine* QGeoServiceProviderFactoryTest::createRoutingManagerEngine( - const QMap<QString, QVariant> & parameters, - QGeoServiceProvider::Error * error, QString *errorString) const + const QVariantMap ¶meters, + QGeoServiceProvider::Error *error, QString *errorString) const { return new QGeoRoutingManagerEngineTest(parameters, error, errorString); } QGeoCodingManagerEngine* QGeoServiceProviderFactoryTest::createGeocodingManagerEngine( - const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { return new QGeoCodingManagerEngineTest(parameters, error, errorString); @@ -72,14 +72,14 @@ QGeoCodingManagerEngine* QGeoServiceProviderFactoryTest::createGeocodingManagerE QGeoMappingManagerEngine* QGeoServiceProviderFactoryTest::createMappingManagerEngine( - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { return new QGeoTiledMappingManagerEngineTest(parameters, error, errorString); } QPlaceManagerEngine* QGeoServiceProviderFactoryTest::createPlaceManagerEngine( - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { Q_UNUSED(error); diff --git a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h index 84939133..3b62850b 100644 --- a/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h +++ b/tests/auto/geotestplugin/qgeoserviceproviderplugin_test.h @@ -59,16 +59,16 @@ public: ~QGeoServiceProviderFactoryTest(); QGeoMappingManagerEngine* createMappingManagerEngine( - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; QGeoRoutingManagerEngine* createRoutingManagerEngine( - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString ) const; QGeoCodingManagerEngine* createGeocodingManagerEngine( - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; QPlaceManagerEngine* createPlaceManagerEngine( - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; }; diff --git a/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h b/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h index 5e166544..1a499792 100644 --- a/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h +++ b/tests/auto/geotestplugin/qgeotiledmappingmanagerengine_test.h @@ -58,7 +58,7 @@ class QGeoTiledMappingManagerEngineTest: public QGeoTiledMappingManagerEngine { Q_OBJECT public: - QGeoTiledMappingManagerEngineTest(const QMap<QString, QVariant> ¶meters, + QGeoTiledMappingManagerEngineTest(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoTiledMappingManagerEngine() { diff --git a/tests/auto/geotestplugin/qgeotilefetcher_test.h b/tests/auto/geotestplugin/qgeotilefetcher_test.h index 7affbc69..2f2754cf 100644 --- a/tests/auto/geotestplugin/qgeotilefetcher_test.h +++ b/tests/auto/geotestplugin/qgeotilefetcher_test.h @@ -130,7 +130,7 @@ public: return mappingReply_; } - void setParams(const QMap<QString, QVariant> ¶meters) + void setParams(const QVariantMap ¶meters) { parameters_ = parameters; } @@ -174,7 +174,7 @@ private: int timerId_; QGeoTiledMapReply::Error errorCode_; QString errorString_; - QMap<QString, QVariant> parameters_; + QVariantMap parameters_; QSize tileSize_; }; diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h index 6096ffe1..816493d0 100644 --- a/tests/auto/geotestplugin/qplacemanagerengine_test.h +++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h @@ -208,7 +208,7 @@ class QPlaceManagerEngineTest : public QPlaceManagerEngine { Q_OBJECT public: - QPlaceManagerEngineTest(const QMap<QString, QVariant> ¶meters) + QPlaceManagerEngineTest(const QVariantMap ¶meters) : QPlaceManagerEngine(parameters) { m_locales << QLocale(); diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp index f3e24a93..95d034da 100644 --- a/tests/auto/nokia_services/routing/tst_routing.cpp +++ b/tests/auto/nokia_services/routing/tst_routing.cpp @@ -335,7 +335,7 @@ void tst_nokia_routing::initTestCase() m_networkManager = new MockGeoNetworkAccessManager(); - QMap<QString, QVariant> parameters; + QVariantMap parameters; parameters.insert(QStringLiteral("nam"), QVariant::fromValue<void*>(m_networkManager)); parameters.insert(QStringLiteral("app_id"), "stub"); parameters.insert(QStringLiteral("token"), "stub"); diff --git a/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.cpp b/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.cpp index 710fb97b..20c88d27 100644 --- a/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.cpp +++ b/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.cpp @@ -53,7 +53,7 @@ QGeoServiceProviderFactoryTest::~QGeoServiceProviderFactoryTest() } QPlaceManagerEngine *QGeoServiceProviderFactoryTest::createPlaceManagerEngine( - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { Q_UNUSED(error); diff --git a/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.h b/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.h index 210ac7cc..66869947 100644 --- a/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.h +++ b/tests/auto/placesplugin_unsupported/qgeoserviceproviderplugin_test.h @@ -57,7 +57,7 @@ public: QGeoServiceProviderFactoryTest(); ~QGeoServiceProviderFactoryTest(); - QPlaceManagerEngine *createPlaceManagerEngine(const QMap<QString, QVariant> ¶meters, + QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; }; diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h index c1c17b1b..ada63803 100644 --- a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h +++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h @@ -73,7 +73,7 @@ class QGeoCodingManagerEngineTest: public QGeoCodingManagerEngine { Q_OBJECT public: - QGeoCodingManagerEngineTest(const QMap<QString, QVariant> ¶meters, + QGeoCodingManagerEngineTest(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoCodingManagerEngine(parameters) { diff --git a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp index d16ba32e..878c0fa1 100644 --- a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp +++ b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.cpp @@ -53,7 +53,7 @@ QGeoServiceProviderFactoryTest::~QGeoServiceProviderFactoryTest() } QGeoCodingManagerEngine* QGeoServiceProviderFactoryTest::createGeocodingManagerEngine( - const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { return new QGeoCodingManagerEngineTest(parameters, error, errorString); diff --git a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h index c49e90bb..fe442b4f 100644 --- a/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h +++ b/tests/auto/qgeocodingmanagerplugins/qgeoserviceproviderplugin_test.h @@ -59,7 +59,7 @@ public: ~QGeoServiceProviderFactoryTest(); QGeoCodingManagerEngine* createGeocodingManagerEngine( - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; }; diff --git a/tests/auto/qgeomapcontroller/tst_qgeomapcontroller.cpp b/tests/auto/qgeomapcontroller/tst_qgeomapcontroller.cpp index 0123d375..7b7f8b98 100644 --- a/tests/auto/qgeomapcontroller/tst_qgeomapcontroller.cpp +++ b/tests/auto/qgeomapcontroller/tst_qgeomapcontroller.cpp @@ -91,7 +91,7 @@ tst_QGeoMapController::tst_QGeoMapController() QGeoServiceProviderFactoryTest serviceProviderTest; // empty constructor // TODO: check whether the default constructors of these objects allow the create to work - QMap<QString, QVariant> parameterMap; + QVariantMap parameterMap; QGeoServiceProvider::Error mappingError; QString mappingErrorString; diff --git a/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h b/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h index 7bfb506c..33dfba4a 100644 --- a/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h +++ b/tests/auto/qgeoroutingmanagerplugins/qgeoroutingmanagerengine_test.h @@ -55,7 +55,7 @@ class QGeoRoutingManagerEngineTest: public QGeoRoutingManagerEngine { Q_OBJECT public: - QGeoRoutingManagerEngineTest(const QMap<QString, QVariant> ¶meters, + QGeoRoutingManagerEngineTest(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoRoutingManagerEngine(parameters) { diff --git a/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.cpp b/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.cpp index 1f3a1b50..8079ed21 100644 --- a/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.cpp +++ b/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.cpp @@ -52,8 +52,9 @@ QGeoServiceProviderFactoryTest::~QGeoServiceProviderFactoryTest() { } -QGeoRoutingManagerEngine* QGeoServiceProviderFactoryTest::createRoutingManagerEngine(const QMap< - QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const +QGeoRoutingManagerEngine* QGeoServiceProviderFactoryTest::createRoutingManagerEngine( + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, + QString *errorString) const { return new QGeoRoutingManagerEngineTest(parameters, error, errorString); } diff --git a/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.h b/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.h index 1d6ceb96..bb4ac7ee 100644 --- a/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.h +++ b/tests/auto/qgeoroutingmanagerplugins/qgeoserviceproviderplugin_test.h @@ -58,7 +58,7 @@ public: QGeoServiceProviderFactoryTest(); ~QGeoServiceProviderFactoryTest(); - QGeoRoutingManagerEngine* createRoutingManagerEngine(const QMap<QString, QVariant> ¶meters, + QGeoRoutingManagerEngine* createRoutingManagerEngine(const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const; }; diff --git a/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp b/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp index 74c33d86..c8128925 100644 --- a/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp +++ b/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp @@ -91,7 +91,7 @@ void tst_QPlaceManagerNokia::initTestCase() QStringList providers = QGeoServiceProvider::availableServiceProviders(); - QMap<QString, QVariant> params; + QVariantMap params; params.insert("app_id", "stub"); params.insert("token", "stub"); provider = new QGeoServiceProvider("nokia", params); |