forked from qt-creator/qt-creator
Utils: Rename the new Storage to Store
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:
@@ -376,7 +376,7 @@ public:
|
||||
|
||||
private:
|
||||
QList<NamedWidget *> createSubConfigWidgets() override;
|
||||
void fromMap(const Storage &map) override;
|
||||
void fromMap(const Store &map) override;
|
||||
|
||||
void updateQmakeCommand();
|
||||
|
||||
@@ -414,7 +414,7 @@ QList<NamedWidget *> IosQmakeBuildConfiguration::createSubConfigWidgets()
|
||||
return subConfigWidgets;
|
||||
}
|
||||
|
||||
void IosQmakeBuildConfiguration::fromMap(const Storage &map)
|
||||
void IosQmakeBuildConfiguration::fromMap(const Store &map)
|
||||
{
|
||||
QmakeBuildConfiguration::fromMap(map);
|
||||
if (!hasError())
|
||||
|
||||
@@ -56,8 +56,8 @@ private:
|
||||
|
||||
bool init() final;
|
||||
void setupOutputFormatter(Utils::OutputFormatter *formatter) final;
|
||||
void fromMap(const Storage &map) final;
|
||||
void toMap(Storage &map) const final;
|
||||
void fromMap(const Store &map) final;
|
||||
void toMap(Store &map) const final;
|
||||
|
||||
QStringList m_baseBuildArguments;
|
||||
QStringList m_extraArguments;
|
||||
@@ -166,7 +166,7 @@ void IosBuildStep::setupOutputFormatter(OutputFormatter *formatter)
|
||||
AbstractProcessStep::setupOutputFormatter(formatter);
|
||||
}
|
||||
|
||||
void IosBuildStep::toMap(Storage &map) const
|
||||
void IosBuildStep::toMap(Store &map) const
|
||||
{
|
||||
AbstractProcessStep::toMap(map);
|
||||
|
||||
@@ -177,7 +177,7 @@ void IosBuildStep::toMap(Storage &map) const
|
||||
map.insert(CLEAN_KEY, stepList()->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
|
||||
}
|
||||
|
||||
void IosBuildStep::fromMap(const Storage &map)
|
||||
void IosBuildStep::fromMap(const Store &map)
|
||||
{
|
||||
QVariant bArgs = map.value(BUILD_ARGUMENTS_KEY);
|
||||
m_baseBuildArguments = bArgs.toStringList();
|
||||
|
||||
@@ -126,7 +126,7 @@ IDeviceWidget *IosDevice::createWidget()
|
||||
return new IosDeviceInfoWidget(sharedFromThis());
|
||||
}
|
||||
|
||||
void IosDevice::fromMap(const Storage &map)
|
||||
void IosDevice::fromMap(const Store &map)
|
||||
{
|
||||
IDevice::fromMap(map);
|
||||
|
||||
|
||||
@@ -40,8 +40,8 @@ public:
|
||||
static QString name();
|
||||
|
||||
protected:
|
||||
void fromMap(const Utils::Storage &map) final;
|
||||
Utils::Storage toMap() const final;
|
||||
void fromMap(const Utils::Store &map) final;
|
||||
Utils::Store toMap() const final;
|
||||
|
||||
friend class IosDeviceFactory;
|
||||
friend class Ios::Internal::IosDeviceManager;
|
||||
|
||||
@@ -59,8 +59,8 @@ public:
|
||||
|
||||
private:
|
||||
void setupOutputFormatter(OutputFormatter *formatter) override;
|
||||
void toMap(Storage &map) const override;
|
||||
void fromMap(const Storage &map) override;
|
||||
void toMap(Store &map) const override;
|
||||
void fromMap(const Store &map) override;
|
||||
|
||||
QStringList defaultCleanCmdList() const;
|
||||
QStringList defaultCmdList() const;
|
||||
@@ -83,7 +83,7 @@ IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent, Id id) :
|
||||
setIgnoreReturnValue(m_clean);
|
||||
}
|
||||
|
||||
void IosDsymBuildStep::toMap(Storage &map) const
|
||||
void IosDsymBuildStep::toMap(Store &map) const
|
||||
{
|
||||
AbstractProcessStep::toMap(map);
|
||||
|
||||
@@ -95,7 +95,7 @@ void IosDsymBuildStep::toMap(Storage &map) const
|
||||
map.insert(id().withSuffix(COMMAND_PARTIAL_KEY).toString(), command().toSettings());
|
||||
}
|
||||
|
||||
void IosDsymBuildStep::fromMap(const Storage &map)
|
||||
void IosDsymBuildStep::fromMap(const Store &map)
|
||||
{
|
||||
QVariant bArgs = map.value(id().withSuffix(ARGUMENTS_PARTIAL_KEY).toString());
|
||||
m_arguments = bArgs.toStringList();
|
||||
|
||||
@@ -206,7 +206,7 @@ FilePath IosRunConfiguration::localExecutable() const
|
||||
return bundleDirectory().pathAppended(applicationName());
|
||||
}
|
||||
|
||||
void IosDeviceTypeAspect::fromMap(const Storage &map)
|
||||
void IosDeviceTypeAspect::fromMap(const Store &map)
|
||||
{
|
||||
bool deviceTypeIsInt;
|
||||
map.value(deviceTypeKey).toInt(&deviceTypeIsInt);
|
||||
@@ -216,7 +216,7 @@ void IosDeviceTypeAspect::fromMap(const Storage &map)
|
||||
m_runConfiguration->update();
|
||||
}
|
||||
|
||||
void IosDeviceTypeAspect::toMap(Storage &map) const
|
||||
void IosDeviceTypeAspect::toMap(Store &map) const
|
||||
{
|
||||
map.insert(deviceTypeKey, deviceType().toMap());
|
||||
}
|
||||
|
||||
@@ -27,8 +27,8 @@ public:
|
||||
explicit IosDeviceTypeAspect(Utils::AspectContainer *container,
|
||||
IosRunConfiguration *runConfiguration);
|
||||
|
||||
void fromMap(const Utils::Storage &map) override;
|
||||
void toMap(Utils::Storage &map) const override;
|
||||
void fromMap(const Utils::Store &map) override;
|
||||
void toMap(Utils::Store &map) const override;
|
||||
void addToLayout(Layouting::LayoutItem &parent) override;
|
||||
|
||||
IosDeviceType deviceType() const;
|
||||
|
||||
@@ -73,7 +73,7 @@ IosDeviceType::IosDeviceType(IosDeviceType::Type type, const QString &identifier
|
||||
type(type), identifier(identifier), displayName(displayName)
|
||||
{ }
|
||||
|
||||
bool IosDeviceType::fromMap(const Storage &map)
|
||||
bool IosDeviceType::fromMap(const Store &map)
|
||||
{
|
||||
bool validType;
|
||||
displayName = map.value(iosDeviceTypeDisplayNameKey, QVariant()).toString();
|
||||
|
||||
@@ -25,8 +25,8 @@ public:
|
||||
IosDeviceType(Type type = IosDevice, const QString &identifier = QString(),
|
||||
const QString &displayName = QString());
|
||||
|
||||
bool fromMap(const Utils::Storage &map);
|
||||
Utils::Storage toMap() const;
|
||||
bool fromMap(const Utils::Store &map);
|
||||
Utils::Store toMap() const;
|
||||
|
||||
bool operator ==(const IosDeviceType &o) const;
|
||||
bool operator !=(const IosDeviceType &o) const { return !(*this == o); }
|
||||
|
||||
Reference in New Issue
Block a user