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

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

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -2139,14 +2139,14 @@ void InitialCMakeArgumentsAspect::setCMakeConfiguration(const CMakeConfig &confi
         ci.isInitial = true;
 }
 
-void InitialCMakeArgumentsAspect::fromMap(const QVariantMap &map)
+void InitialCMakeArgumentsAspect::fromMap(const Storage &map)
 {
     const QString value = map.value(settingsKey(), defaultValue()).toString();
     QStringList additionalArguments;
     setAllValues(value, additionalArguments);
 }
 
-void InitialCMakeArgumentsAspect::toMap(QVariantMap &map) const
+void InitialCMakeArgumentsAspect::toMap(Storage &map) const
 {
     saveToMap(map, allValues().join('\n'), defaultValue(), settingsKey());
 }
@@ -2231,7 +2231,7 @@ ConfigureEnvironmentAspect::ConfigureEnvironmentAspect(AspectContainer *containe
     });
 }
 
-void ConfigureEnvironmentAspect::fromMap(const QVariantMap &map)
+void ConfigureEnvironmentAspect::fromMap(const Storage &map)
 {
     // Match the key values from Qt Creator 9.0.0/1 to the ones from EnvironmentAspect
     const bool cleanSystemEnvironment = map.value(QLatin1String(CLEAR_SYSTEM_ENVIRONMENT_KEY))
@@ -2249,7 +2249,7 @@ void ConfigureEnvironmentAspect::fromMap(const QVariantMap &map)
     ProjectExplorer::EnvironmentAspect::fromMap(tmpMap);
 }
 
-void ConfigureEnvironmentAspect::toMap(QVariantMap &map) const
+void ConfigureEnvironmentAspect::toMap(Storage &map) const
 {
     QVariantMap tmpMap;
     ProjectExplorer::EnvironmentAspect::toMap(tmpMap);

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h

@@ -31,8 +31,8 @@ public:
     void setAllValues(const QString &values, QStringList &additionalArguments);
     void setCMakeConfiguration(const CMakeConfig &config);
 
-    void fromMap(const QVariantMap &map) final;
-    void toMap(QVariantMap &map) const final;
+    void fromMap(const Utils::Storage &map) final;
+    void toMap(Utils::Storage &map) const final;
 
 private:
     CMakeConfig m_cmakeConfiguration;
@@ -44,8 +44,8 @@ public:
     ConfigureEnvironmentAspect(Utils::AspectContainer *container,
                                ProjectExplorer::BuildConfiguration *buildConfig);
 
-    void fromMap(const QVariantMap &map);
-    void toMap(QVariantMap &map) const;
+    void fromMap(const Utils::Storage &map);
+    void toMap(Utils::Storage &map) const;
 };
 
 } // namespace Internal

src/plugins/cmakeprojectmanager/cmakebuildstep.cpp

@@ -273,7 +273,7 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :
             this, &CMakeBuildStep::updateBuildTargetsModel);
 }
 
-void CMakeBuildStep::toMap(QVariantMap &map) const
+void CMakeBuildStep::toMap(Utils::Storage &map) const
 {
     CMakeAbstractProcessStep::toMap(map);
     map.insert(BUILD_TARGETS_KEY, m_buildTargets);
@@ -282,7 +282,7 @@ void CMakeBuildStep::toMap(QVariantMap &map) const
     map.insert(QLatin1String(BUILD_PRESET_KEY), m_buildPreset);
 }
 
-void CMakeBuildStep::fromMap(const QVariantMap &map)
+void CMakeBuildStep::fromMap(const Utils::Storage &map)
 {
     setBuildTargets(map.value(BUILD_TARGETS_KEY).toStringList());
 

src/plugins/cmakeprojectmanager/cmakebuildstep.h

@@ -44,7 +44,7 @@ public:
     bool buildsBuildTarget(const QString &target) const;
     void setBuildsBuildTarget(const QString &target, bool on);
 
-    void toMap(QVariantMap &map) const override;
+    void toMap(Utils::Storage &map) const override;
 
     QString cleanTarget() const;
     QString allTarget() const ;
@@ -83,7 +83,7 @@ signals:
 private:
     Utils::CommandLine cmakeCommand() const;
 
-    void fromMap(const QVariantMap &map) override;
+    void fromMap(const Utils::Storage &map) override;
 
     bool init() override;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;

src/plugins/cmakeprojectmanager/cmaketool.h

@@ -7,8 +7,9 @@
 
 #include <texteditor/codeassist/keywordscompletionassist.h>
 
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
+#include <utils/storage.h>
 
 #include <optional>
 
@@ -59,7 +60,7 @@ public:
     bool isValid() const;
 
     Utils::Id id() const { return m_id; }
-    QVariantMap toMap () const;
+    Utils::Storage toMap () const;
 
     void setAutorun(bool autoRun) { m_isAutoRun = autoRun; }