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

Change-Id: I02833cf2bc3caaadc22ff93ae530e4aebe4c3868
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-08-23 16:11:48 +02:00
parent 55b5b8a975
commit dc6b40a5c0
191 changed files with 525 additions and 491 deletions

View File

@@ -137,14 +137,14 @@ void MesonBuildConfiguration::setParameters(const QString &params)
emit parametersChanged();
}
void MesonBuildConfiguration::toMap(QVariantMap &map) const
void MesonBuildConfiguration::toMap(Storage &map) const
{
ProjectExplorer::BuildConfiguration::toMap(map);
map[Constants::BuildConfiguration::BUILD_TYPE_KEY] = mesonBuildTypeName(m_buildType);
map[Constants::BuildConfiguration::PARAMETERS_KEY] = m_parameters;
}
void MesonBuildConfiguration::fromMap(const QVariantMap &map)
void MesonBuildConfiguration::fromMap(const Storage &map)
{
ProjectExplorer::BuildConfiguration::fromMap(map);
m_buildSystem = new MesonBuildSystem{this};

View File

@@ -30,8 +30,8 @@ signals:
void parametersChanged();
private:
void toMap(QVariantMap &map) const override;
void fromMap(const QVariantMap &map) override;
void toMap(Utils::Storage &map) const override;
void fromMap(const Utils::Storage &map) override;
MesonBuildType m_buildType;
ProjectExplorer::NamedWidget *createConfigWidget() final;

View File

@@ -199,14 +199,14 @@ void NinjaBuildStep::setCommandArgs(const QString &args)
m_commandArgs = args.trimmed();
}
void NinjaBuildStep::toMap(QVariantMap &map) const
void NinjaBuildStep::toMap(Storage &map) const
{
AbstractProcessStep::toMap(map);
map.insert(TARGETS_KEY, m_targetName);
map.insert(TOOL_ARGUMENTS_KEY, m_commandArgs);
}
void NinjaBuildStep::fromMap(const QVariantMap &map)
void NinjaBuildStep::fromMap(const Storage &map)
{
m_targetName = map.value(TARGETS_KEY).toString();
m_commandArgs = map.value(TOOL_ARGUMENTS_KEY).toString();

View File

@@ -26,8 +26,8 @@ public:
Q_SIGNAL void targetListChanged();
Q_SIGNAL void commandChanged();
void toMap(QVariantMap &map) const override;
void fromMap(const QVariantMap &map) override;
void toMap(Utils::Storage &map) const override;
void fromMap(const Utils::Storage &map) override;
private:
void update(bool parsingSuccessful);