diff options
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
6 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 36fcb2ea46b..9d85fb2f73d 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -187,13 +187,13 @@ QmakeBuildConfiguration::~QmakeBuildConfiguration() delete m_buildSystem; } -void QmakeBuildConfiguration::toMap(QVariantMap &map) const +void QmakeBuildConfiguration::toMap(Storage &map) const { BuildConfiguration::toMap(map); map.insert(QLatin1String(BUILD_CONFIGURATION_KEY), int(m_qmakeBuildConfiguration)); } -void QmakeBuildConfiguration::fromMap(const QVariantMap &map) +void QmakeBuildConfiguration::fromMap(const Storage &map) { BuildConfiguration::fromMap(map); if (hasError()) diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h index a1813e6cd7f..3dca5b9dad8 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h @@ -67,7 +67,7 @@ public: QString *arguments, const Utils::FilePath &directory, const QtSupport::QtVersion *version, QStringList *outArgs = nullptr); - void toMap(QVariantMap &map) const override; + void toMap(Utils::Storage &map) const override; BuildType buildType() const override; @@ -99,7 +99,7 @@ signals: void useQtQuickCompilerChanged(); protected: - void fromMap(const QVariantMap &map) override; + void fromMap(const Utils::Storage &map) override; bool regenerateBuildFiles(ProjectExplorer::Node *node = nullptr) override; private: diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 119cb3669e9..e83dd5a0b7d 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -171,7 +171,7 @@ QmakeProject::~QmakeProject() setRootProjectNode(nullptr); } -Project::RestoreResult QmakeProject::fromMap(const QVariantMap &map, QString *errorMessage) +Project::RestoreResult QmakeProject::fromMap(const Storage &map, QString *errorMessage) { RestoreResult result = Project::fromMap(map, errorMessage); if (result != RestoreResult::Ok) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index 3097ae7b579..5d65de04c2f 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -45,7 +45,7 @@ public: ProjectExplorer::ProjectImporter *projectImporter() const final; protected: - RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) final; + RestoreResult fromMap(const Utils::Storage &map, QString *errorMessage) final; private: ProjectExplorer::DeploymentKnowledge deploymentKnowledge() const override; diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 893fd5192cb..39c5e0bc63e 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -403,14 +403,14 @@ QString QMakeStep::mkspec() const return QmakeKitAspect::effectiveMkspec(target()->kit()); } -void QMakeStep::toMap(QVariantMap &map) const +void QMakeStep::toMap(Storage &map) const { AbstractProcessStep::toMap(map); map.insert(QMAKE_FORCED_KEY, m_forced); map.insert(QMAKE_SELECTED_ABIS_KEY, m_selectedAbis); } -void QMakeStep::fromMap(const QVariantMap &map) +void QMakeStep::fromMap(const Storage &map) { m_forced = map.value(QMAKE_FORCED_KEY, false).toBool(); m_selectedAbis = map.value(QMAKE_SELECTED_ABIS_KEY).toStringList(); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index b3177d1f7ae..673838ad7f5 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -124,14 +124,14 @@ public: QString makeArguments(const QString &makefile) const; QString effectiveQMakeCall() const; - void toMap(QVariantMap &map) const override; + void toMap(Utils::Storage &map) const override; Utils::SelectionAspect buildType{this}; ProjectExplorer::ArgumentsAspect userArguments{this}; Utils::StringAspect effectiveCall{this}; protected: - void fromMap(const QVariantMap &map) override; + void fromMap(const Utils::Storage &map) override; private: Tasking::GroupItem runRecipe() final; |