summaryrefslogtreecommitdiffstats
path: root/src/location/maps/qgeoserviceprovider.cpp
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2020-04-02 13:43:52 +0200
committerAlex Blasche <alexander.blasche@qt.io>2020-04-02 16:46:27 +0200
commitdd6df42a6ae90cd349b9af2d00d53c5a0d3ed1ed (patch)
tree052e53fe3d6ff8a95d9c3e7a7c7ac0dafd123a88 /src/location/maps/qgeoserviceprovider.cpp
parent7711e7bcfae2c09688ecdaf587d580077889cce3 (diff)
Fix QHash/QMultiHash related deprecations warnings
Change-Id: I5ec9c700a0b69a556512efbd0bfd79c4c2119f9a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/location/maps/qgeoserviceprovider.cpp')
-rw-r--r--src/location/maps/qgeoserviceprovider.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index ec341c44..4873da22 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -896,9 +896,9 @@ void QGeoServiceProviderPrivate::loadPlugin(const QVariantMap &parameters)
}
}
-QHash<QString, QJsonObject> QGeoServiceProviderPrivate::plugins(bool reload)
+QMultiHash<QString, QJsonObject> QGeoServiceProviderPrivate::plugins(bool reload)
{
- static QHash<QString, QJsonObject> plugins;
+ static QMultiHash<QString, QJsonObject> plugins;
static bool alreadyDiscovered = false;
if (reload == true)
@@ -911,14 +911,14 @@ QHash<QString, QJsonObject> QGeoServiceProviderPrivate::plugins(bool reload)
return plugins;
}
-void QGeoServiceProviderPrivate::loadPluginMetadata(QHash<QString, QJsonObject> &list)
+void QGeoServiceProviderPrivate::loadPluginMetadata(QMultiHash<QString, QJsonObject> &list)
{
QFactoryLoader *l = loader();
QList<QJsonObject> meta = l->metaData();
for (int i = 0; i < meta.size(); ++i) {
QJsonObject obj = meta.at(i).value(QStringLiteral("MetaData")).toObject();
obj.insert(QStringLiteral("index"), i);
- list.insertMulti(obj.value(QStringLiteral("Provider")).toString(), obj);
+ list.insert(obj.value(QStringLiteral("Provider")).toString(), obj);
}
}