Use Utils::Storage instead of QVariantMap in a few places

Change-Id: I02833cf2bc3caaadc22ff93ae530e4aebe4c3868
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

src/plugins/ios/iosbuildconfiguration.cpp

@@ -376,7 +376,7 @@ public:
 
 private:
     QList<NamedWidget *> createSubConfigWidgets() override;
-    void fromMap(const QVariantMap &map) override;
+    void fromMap(const Storage &map) override;
 
     void updateQmakeCommand();
 
@@ -414,7 +414,7 @@ QList<NamedWidget *> IosQmakeBuildConfiguration::createSubConfigWidgets()
     return subConfigWidgets;
 }
 
-void IosQmakeBuildConfiguration::fromMap(const QVariantMap &map)
+void IosQmakeBuildConfiguration::fromMap(const Storage &map)
 {
     QmakeBuildConfiguration::fromMap(map);
     if (!hasError())

src/plugins/ios/iosbuildstep.cpp

@@ -56,8 +56,8 @@ private:
 
     bool init() final;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) final;
-    void fromMap(const QVariantMap &map) final;
-    void toMap(QVariantMap &map) const final;
+    void fromMap(const Storage &map) final;
+    void toMap(Storage &map) const final;
 
     QStringList m_baseBuildArguments;
     QStringList m_extraArguments;
@@ -166,7 +166,7 @@ void IosBuildStep::setupOutputFormatter(OutputFormatter *formatter)
     AbstractProcessStep::setupOutputFormatter(formatter);
 }
 
-void IosBuildStep::toMap(QVariantMap &map) const
+void IosBuildStep::toMap(Storage &map) const
 {
     AbstractProcessStep::toMap(map);
 
@@ -177,7 +177,7 @@ void IosBuildStep::toMap(QVariantMap &map) const
     map.insert(CLEAN_KEY, stepList()->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
 }
 
-void IosBuildStep::fromMap(const QVariantMap &map)
+void IosBuildStep::fromMap(const Storage &map)
 {
     QVariant bArgs = map.value(BUILD_ARGUMENTS_KEY);
     m_baseBuildArguments = bArgs.toStringList();

src/plugins/ios/iosdevice.cpp

@@ -20,8 +20,6 @@
 #include <QFormLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <QVariant>
-#include <QVariantMap>
 
 #ifdef Q_OS_MAC
 #include <IOKit/IOKitLib.h>
@@ -42,6 +40,7 @@
 #include <exception>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace {
 static Q_LOGGING_CATEGORY(detectLog, "qtc.ios.deviceDetect", QtWarningMsg)
@@ -127,7 +126,7 @@ IDeviceWidget *IosDevice::createWidget()
     return new IosDeviceInfoWidget(sharedFromThis());
 }
 
-void IosDevice::fromMap(const QVariantMap &map)
+void IosDevice::fromMap(const Storage &map)
 {
     IDevice::fromMap(map);
 

src/plugins/ios/iosdevice.h

@@ -40,8 +40,8 @@ public:
     static QString name();
 
 protected:
-    void fromMap(const QVariantMap &map) final;
-    QVariantMap toMap() const final;
+    void fromMap(const Utils::Storage &map) final;
+    Utils::Storage toMap() const final;
 
     friend class IosDeviceFactory;
     friend class Ios::Internal::IosDeviceManager;

src/plugins/ios/iosdsymbuildstep.cpp

@@ -59,8 +59,8 @@ public:
 
 private:
     void setupOutputFormatter(OutputFormatter *formatter) override;
-    void toMap(QVariantMap &map) const override;
-    void fromMap(const QVariantMap &map) override;
+    void toMap(Storage &map) const override;
+    void fromMap(const Storage &map) override;
 
     QStringList defaultCleanCmdList() const;
     QStringList defaultCmdList() const;
@@ -83,7 +83,7 @@ IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent, Id id) :
     setIgnoreReturnValue(m_clean);
 }
 
-void IosDsymBuildStep::toMap(QVariantMap &map) const
+void IosDsymBuildStep::toMap(Storage &map) const
 {
     AbstractProcessStep::toMap(map);
 
@@ -95,7 +95,7 @@ void IosDsymBuildStep::toMap(QVariantMap &map) const
     map.insert(id().withSuffix(COMMAND_PARTIAL_KEY).toString(), command().toSettings());
 }
 
-void IosDsymBuildStep::fromMap(const QVariantMap &map)
+void IosDsymBuildStep::fromMap(const Storage &map)
 {
     QVariant bArgs = map.value(id().withSuffix(ARGUMENTS_PARTIAL_KEY).toString());
     m_arguments = bArgs.toStringList();

src/plugins/ios/iosrunconfiguration.cpp

@@ -206,7 +206,7 @@ FilePath IosRunConfiguration::localExecutable() const
     return bundleDirectory().pathAppended(applicationName());
 }
 
-void IosDeviceTypeAspect::fromMap(const QVariantMap &map)
+void IosDeviceTypeAspect::fromMap(const Storage &map)
 {
     bool deviceTypeIsInt;
     map.value(deviceTypeKey).toInt(&deviceTypeIsInt);
@@ -216,7 +216,7 @@ void IosDeviceTypeAspect::fromMap(const QVariantMap &map)
     m_runConfiguration->update();
 }
 
-void IosDeviceTypeAspect::toMap(QVariantMap &map) const
+void IosDeviceTypeAspect::toMap(Storage &map) const
 {
     map.insert(deviceTypeKey, deviceType().toMap());
 }

src/plugins/ios/iosrunconfiguration.h

@@ -27,8 +27,8 @@ public:
     explicit IosDeviceTypeAspect(Utils::AspectContainer *container,
                                  IosRunConfiguration *runConfiguration);
 
-    void fromMap(const QVariantMap &map) override;
-    void toMap(QVariantMap &map) const override;
+    void fromMap(const Utils::Storage &map) override;
+    void toMap(Utils::Storage &map) const override;
     void addToLayout(Layouting::LayoutItem &parent) override;
 
     IosDeviceType deviceType() const;

src/plugins/ios/iossimulator.cpp

@@ -13,6 +13,7 @@
 #include <QMapIterator>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace Ios::Internal {
 
@@ -72,7 +73,7 @@ IosDeviceType::IosDeviceType(IosDeviceType::Type type, const QString &identifier
     type(type), identifier(identifier), displayName(displayName)
 { }
 
-bool IosDeviceType::fromMap(const QVariantMap &map)
+bool IosDeviceType::fromMap(const Storage &map)
 {
     bool validType;
     displayName = map.value(iosDeviceTypeDisplayNameKey, QVariant()).toString();

src/plugins/ios/iossimulator.h

@@ -25,8 +25,8 @@ public:
     IosDeviceType(Type type = IosDevice, const QString &identifier = QString(),
                   const QString &displayName = QString());
 
-    bool fromMap(const QVariantMap &map);
-    QVariantMap toMap() const;
+    bool fromMap(const Utils::Storage &map);
+    Utils::Storage toMap() const;
 
     bool operator ==(const IosDeviceType &o) const;
     bool operator !=(const IosDeviceType &o) const { return !(*this == o); }