feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Rename the new Storage to Store

Browse Source 
Apparently that's what the young people on the web use for such a thing.

Change-Id: I75d5396ff3cb3c26efd6008b5f2261354c4f7896
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-08-23 16:53:06 +02:00
parent 14d21f4f2c
commit 6e307be365
181 changed files with 457 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -2139,14 +2139,14 @@ void InitialCMakeArgumentsAspect::setCMakeConfiguration(const CMakeConfig &confi
ci.isInitial = true;
}
void InitialCMakeArgumentsAspect::fromMap(const Storage &map)
void InitialCMakeArgumentsAspect::fromMap(const Store &map)
{
const QString value = map.value(settingsKey(), defaultValue()).toString();
QStringList additionalArguments;
setAllValues(value, additionalArguments);
}
void InitialCMakeArgumentsAspect::toMap(Storage &map) const
void InitialCMakeArgumentsAspect::toMap(Store &map) const
{
saveToMap(map, allValues().join('\n'), defaultValue(), settingsKey());
}
@@ -2231,7 +2231,7 @@ ConfigureEnvironmentAspect::ConfigureEnvironmentAspect(AspectContainer *containe
});
}
void ConfigureEnvironmentAspect::fromMap(const Storage &map)
void ConfigureEnvironmentAspect::fromMap(const Store &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 Storage &map)
ProjectExplorer::EnvironmentAspect::fromMap(tmpMap);
}
void ConfigureEnvironmentAspect::toMap(Storage &map) const
void ConfigureEnvironmentAspect::toMap(Store &map) const
{
QVariantMap tmpMap;
ProjectExplorer::EnvironmentAspect::toMap(tmpMap);

8
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
View File

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

4
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

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

4
src/plugins/cmakeprojectmanager/cmakebuildstep.h
View File

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

4
src/plugins/cmakeprojectmanager/cmaketool.h
View File

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