diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2020-04-02 13:43:52 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2020-04-02 16:46:27 +0200 |
commit | dd6df42a6ae90cd349b9af2d00d53c5a0d3ed1ed (patch) | |
tree | 052e53fe3d6ff8a95d9c3e7a7c7ac0dafd123a88 /src/positioning/qgeopositioninfosource.cpp | |
parent | 7711e7bcfae2c09688ecdaf587d580077889cce3 (diff) | |
download | qtlocation-dd6df42a6ae90cd349b9af2d00d53c5a0d3ed1ed.tar.gz |
Fix QHash/QMultiHash related deprecations warnings
Change-Id: I5ec9c700a0b69a556512efbd0bfd79c4c2119f9a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/positioning/qgeopositioninfosource.cpp')
-rw-r--r-- | src/positioning/qgeopositioninfosource.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp index 1f9abec1..56ee66d7 100644 --- a/src/positioning/qgeopositioninfosource.cpp +++ b/src/positioning/qgeopositioninfosource.cpp @@ -143,9 +143,9 @@ QVariant QGeoPositionInfoSourcePrivate::backendProperty(const QString &/*name*/) return QVariant(); } -QHash<QString, QJsonObject> QGeoPositionInfoSourcePrivate::plugins(bool reload) +QMultiHash<QString, QJsonObject> QGeoPositionInfoSourcePrivate::plugins(bool reload) { - static QHash<QString, QJsonObject> plugins; + static QMultiHash<QString, QJsonObject> plugins; static bool alreadyDiscovered = false; if (reload == true) @@ -179,7 +179,7 @@ QList<QJsonObject> QGeoPositionInfoSourcePrivate::pluginsSorted() return list; } -void QGeoPositionInfoSourcePrivate::loadPluginMetadata(QHash<QString, QJsonObject> &plugins) +void QGeoPositionInfoSourcePrivate::loadPluginMetadata(QMultiHash<QString, QJsonObject> &plugins) { QFactoryLoader *l = loader(); QList<QJsonObject> meta = l->metaData(); @@ -192,7 +192,7 @@ void QGeoPositionInfoSourcePrivate::loadPluginMetadata(QHash<QString, QJsonObjec continue; } obj.insert(QStringLiteral("index"), i); - plugins.insertMulti(obj.value(QStringLiteral("Provider")).toString(), obj); + plugins.insert(obj.value(QStringLiteral("Provider")).toString(), obj); } } |