forked from qt-creator/qt-creator
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:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user