From dd6df42a6ae90cd349b9af2d00d53c5a0d3ed1ed Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@qt.io>
Date: Thu, 2 Apr 2020 13:43:52 +0200
Subject: Fix QHash/QMultiHash related deprecations warnings

Change-Id: I5ec9c700a0b69a556512efbd0bfd79c4c2119f9a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/location/maps/qgeoserviceprovider.cpp  | 8 ++++----
 src/location/maps/qgeoserviceprovider_p.h  | 4 ++--
 src/positioning/qgeopositioninfosource.cpp | 8 ++++----
 src/positioning/qgeopositioninfosource_p.h | 6 +++---
 4 files changed, 13 insertions(+), 13 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);
     }
 }
 
diff --git a/src/location/maps/qgeoserviceprovider_p.h b/src/location/maps/qgeoserviceprovider_p.h
index c6b03ce5..22dcedd6 100644
--- a/src/location/maps/qgeoserviceprovider_p.h
+++ b/src/location/maps/qgeoserviceprovider_p.h
@@ -121,8 +121,8 @@ public:
     QLocale locale;
     bool localeSet;
 
-    static QHash<QString, QJsonObject> plugins(bool reload = false);
-    static void loadPluginMetadata(QHash<QString, QJsonObject> &list);
+    static QMultiHash<QString, QJsonObject> plugins(bool reload = false);
+    static void loadPluginMetadata(QMultiHash<QString, QJsonObject> &list);
 };
 
 QT_END_NAMESPACE
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);
     }
 }
 
diff --git a/src/positioning/qgeopositioninfosource_p.h b/src/positioning/qgeopositioninfosource_p.h
index 2ae93055..e12ede4c 100644
--- a/src/positioning/qgeopositioninfosource_p.h
+++ b/src/positioning/qgeopositioninfosource_p.h
@@ -56,7 +56,7 @@
 #include "qgeopositioninfosourcefactory.h"
 #include <QJsonObject>
 #include <QString>
-#include <QHash>
+#include <QMultiHash>
 #include <QList>
 
 QT_BEGIN_NAMESPACE
@@ -79,8 +79,8 @@ public:
     virtual bool setBackendProperty(const QString &name, const QVariant &value);
     virtual QVariant backendProperty(const QString &name) const;
 
-    static QHash<QString, QJsonObject> plugins(bool reload = false);
-    static void loadPluginMetadata(QHash<QString, QJsonObject> &list);
+    static QMultiHash<QString, QJsonObject> plugins(bool reload = false);
+    static void loadPluginMetadata(QMultiHash<QString, QJsonObject> &list);
     static QList<QJsonObject> pluginsSorted();
 };
 
-- 
cgit v1.2.1