From 1b0873e68501f222ccb1d611010af0bf4e755262 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Fri, 24 Jul 2020 15:03:18 +0200
Subject: Adapt to the Q(Multi)Hash split-up

Make some variables auto so that we no longer care whether they're
QHash or QMultiHash.

Change-Id: Idbefdbd6134ac862d44403f8ba1dcbf8bf5cd761
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 src/positioning/qgeoareamonitorsource.cpp   | 4 ++--
 src/positioning/qgeopositioninfosource.cpp  | 4 ++--
 src/positioning/qgeosatelliteinfosource.cpp | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/positioning/qgeoareamonitorsource.cpp b/src/positioning/qgeoareamonitorsource.cpp
index 1db9c742..d056f1bc 100644
--- a/src/positioning/qgeoareamonitorsource.cpp
+++ b/src/positioning/qgeoareamonitorsource.cpp
@@ -173,7 +173,7 @@ QGeoAreaMonitorSource *QGeoAreaMonitorSource::createDefaultSource(QObject *paren
 */
 QGeoAreaMonitorSource *QGeoAreaMonitorSource::createSource(const QString &sourceName, QObject *parent)
 {
-    QHash<QString, QJsonObject> plugins = QGeoPositionInfoSourcePrivate::plugins();
+    auto plugins = QGeoPositionInfoSourcePrivate::plugins();
     if (plugins.contains(sourceName)) {
         QGeoPositionInfoSourcePrivate d;
         d.metaData = plugins.value(sourceName);
@@ -196,7 +196,7 @@ QGeoAreaMonitorSource *QGeoAreaMonitorSource::createSource(const QString &source
 QStringList QGeoAreaMonitorSource::availableSources()
 {
     QStringList plugins;
-    const QHash<QString, QJsonObject> meta = QGeoPositionInfoSourcePrivate::plugins();
+    const auto meta = QGeoPositionInfoSourcePrivate::plugins();
     for (auto it = meta.cbegin(), end = meta.cend(); it != end; ++it) {
         if (it.value().value(QStringLiteral("Monitor")).isBool()
                 && it.value().value(QStringLiteral("Monitor")).toBool()) {
diff --git a/src/positioning/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp
index 56ee66d7..968b2914 100644
--- a/src/positioning/qgeopositioninfosource.cpp
+++ b/src/positioning/qgeopositioninfosource.cpp
@@ -406,7 +406,7 @@ QGeoPositionInfoSource *QGeoPositionInfoSource::createSource(const QString &sour
 */
 QGeoPositionInfoSource *QGeoPositionInfoSource::createSource(const QString &sourceName, const QVariantMap &parameters, QObject *parent)
 {
-    QHash<QString, QJsonObject> plugins = QGeoPositionInfoSourcePrivate::plugins();
+    auto plugins = QGeoPositionInfoSourcePrivate::plugins();
     if (plugins.contains(sourceName))
         return createSource_real(plugins.value(sourceName), parameters, parent);
     return nullptr;
@@ -419,7 +419,7 @@ QGeoPositionInfoSource *QGeoPositionInfoSource::createSource(const QString &sour
 QStringList QGeoPositionInfoSource::availableSources()
 {
     QStringList plugins;
-    const QHash<QString, QJsonObject> meta = QGeoPositionInfoSourcePrivate::plugins();
+    const auto meta = QGeoPositionInfoSourcePrivate::plugins();
     for (auto it = meta.cbegin(), end = meta.cend(); it != end; ++it) {
         if (it.value().value(QStringLiteral("Position")).isBool()
                 && it.value().value(QStringLiteral("Position")).toBool()) {
diff --git a/src/positioning/qgeosatelliteinfosource.cpp b/src/positioning/qgeosatelliteinfosource.cpp
index 6796b921..f39121dd 100644
--- a/src/positioning/qgeosatelliteinfosource.cpp
+++ b/src/positioning/qgeosatelliteinfosource.cpp
@@ -249,7 +249,7 @@ QGeoSatelliteInfoSource *QGeoSatelliteInfoSource::createDefaultSource(const QVar
 */
 QGeoSatelliteInfoSource *QGeoSatelliteInfoSource::createSource(const QString &sourceName, const QVariantMap &parameters, QObject *parent)
 {
-    QHash<QString, QJsonObject> plugins = QGeoPositionInfoSourcePrivate::plugins();
+    auto plugins = QGeoPositionInfoSourcePrivate::plugins();
     if (plugins.contains(sourceName))
         return createSource_real(plugins.value(sourceName), parameters, parent);
     return nullptr;
@@ -262,7 +262,7 @@ QGeoSatelliteInfoSource *QGeoSatelliteInfoSource::createSource(const QString &so
 QStringList QGeoSatelliteInfoSource::availableSources()
 {
     QStringList plugins;
-    const QHash<QString, QJsonObject> meta = QGeoPositionInfoSourcePrivate::plugins();
+    const auto meta = QGeoPositionInfoSourcePrivate::plugins();
     for (auto it = meta.cbegin(), end = meta.cend(); it != end; ++it) {
         if (it.value().value(QStringLiteral("Satellite")).isBool()
                 && it.value().value(QStringLiteral("Satellite")).toBool()) {
-- 
cgit v1.2.3