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

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

4 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
index 1e389870429..c3df267e3b7 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
@@ -152,7 +152,7 @@ void QbsBuildConfiguration::triggerReparseIfActive()
         m_buildSystem->delayParsing();
 }
 
-void QbsBuildConfiguration::fromMap(const QVariantMap &map)
+void QbsBuildConfiguration::fromMap(const Storage &map)
 {
     BuildConfiguration::fromMap(map);
     if (hasError())
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
index 5984a555b9e..b58da50bb42 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
@@ -71,7 +71,7 @@ signals:
     void qbsConfigurationChanged();
 
 private:
-    void fromMap(const QVariantMap &map) override;
+    void fromMap(const Utils::Storage &map) override;
     void restrictNextBuild(const ProjectExplorer::RunConfiguration *rc) override;
     void triggerReparseIfActive();
 
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 8729e806045..cab1607503b 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -45,7 +45,6 @@ const char QBS_CLEAN_INSTALL_ROOT[] = "Qbs.CleanInstallRoot";
 
 using namespace ProjectExplorer;
 using namespace QtSupport;
-using namespace Tasking;
 using namespace Utils;
 
 namespace QbsProjectManager::Internal {
@@ -352,7 +351,7 @@ int QbsBuildStep::maxJobs() const
     return QThread::idealThreadCount();
 }
 
-void QbsBuildStep::fromMap(const QVariantMap &map)
+void QbsBuildStep::fromMap(const Storage &map)
 {
     BuildStep::fromMap(map);
     if (hasError())
@@ -360,7 +359,7 @@ void QbsBuildStep::fromMap(const QVariantMap &map)
     setQbsConfiguration(map.value(QBS_CONFIG).toMap());
 }
 
-void QbsBuildStep::toMap(QVariantMap &map) const
+void QbsBuildStep::toMap(Storage &map) const
 {
     ProjectExplorer::BuildStep::toMap(map);
     map.insert(QBS_CONFIG, m_qbsConfiguration);
@@ -381,8 +380,9 @@ QbsBuildSystem *QbsBuildStep::qbsBuildSystem() const
     return static_cast<QbsBuildSystem *>(buildSystem());
 }
 
-GroupItem QbsBuildStep::runRecipe()
+Tasking::GroupItem QbsBuildStep::runRecipe()
 {
+    using namespace Tasking;
     const auto onPreParserSetup = [this](QbsRequest &request) {
         request.setParseData(qbsBuildSystem());
     };
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h
index 1e5186a326b..8a4a2b3b6df 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h
@@ -70,8 +70,8 @@ private:
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
     Tasking::GroupItem runRecipe() final;
     QWidget *createConfigWidget() override;
-    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;
 
     QbsBuildConfiguration *qbsBuildConfiguration() const;
     QbsBuildSystem *qbsBuildSystem() const;