forked from qt-creator/qt-creator
ProjectExplorer: Rename Base*Aspect to *Aspect
In most cases they are used directly, so there's not much Base* in that. Added the old name as alias as porting help for a while. Change-Id: I494a8a560b8996bcf74915ea3570b504df6a6b4c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -66,7 +66,7 @@ private:
|
||||
bool init() override;
|
||||
void doRun() override;
|
||||
|
||||
BaseStringAspect *m_additionalArgumentsAspect = nullptr;
|
||||
StringAspect *m_additionalArgumentsAspect = nullptr;
|
||||
bool m_runAutogen = false;
|
||||
};
|
||||
|
||||
@@ -74,11 +74,11 @@ AutogenStep::AutogenStep(BuildStepList *bsl, Utils::Id id) : AbstractProcessStep
|
||||
{
|
||||
setDefaultDisplayName(tr("Autogen"));
|
||||
|
||||
m_additionalArgumentsAspect = addAspect<BaseStringAspect>();
|
||||
m_additionalArgumentsAspect = addAspect<StringAspect>();
|
||||
m_additionalArgumentsAspect->setSettingsKey(
|
||||
"AutotoolsProjectManager.AutogenStep.AdditionalArguments");
|
||||
m_additionalArgumentsAspect->setLabelText(tr("Arguments:"));
|
||||
m_additionalArgumentsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
|
||||
m_additionalArgumentsAspect->setDisplayStyle(StringAspect::LineEditDisplay);
|
||||
m_additionalArgumentsAspect->setHistoryCompleter("AutotoolsPM.History.AutogenStepArgs");
|
||||
|
||||
connect(m_additionalArgumentsAspect, &ProjectConfigurationAspect::changed, this, [this] {
|
||||
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
void doRun() override;
|
||||
|
||||
private:
|
||||
BaseStringAspect *m_additionalArgumentsAspect = nullptr;
|
||||
StringAspect *m_additionalArgumentsAspect = nullptr;
|
||||
bool m_runAutoreconf = false;
|
||||
};
|
||||
|
||||
@@ -72,11 +72,11 @@ AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Utils::Id id)
|
||||
{
|
||||
setDefaultDisplayName(tr("Autoreconf"));
|
||||
|
||||
m_additionalArgumentsAspect = addAspect<BaseStringAspect>();
|
||||
m_additionalArgumentsAspect = addAspect<StringAspect>();
|
||||
m_additionalArgumentsAspect->setSettingsKey("AutotoolsProjectManager.AutoreconfStep.AdditionalArguments");
|
||||
m_additionalArgumentsAspect->setLabelText(tr("Arguments:"));
|
||||
m_additionalArgumentsAspect->setValue("--force --install");
|
||||
m_additionalArgumentsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
|
||||
m_additionalArgumentsAspect->setDisplayStyle(StringAspect::LineEditDisplay);
|
||||
m_additionalArgumentsAspect->setHistoryCompleter("AutotoolsPM.History.AutoreconfStepArgs");
|
||||
|
||||
connect(m_additionalArgumentsAspect, &ProjectConfigurationAspect::changed, this, [this] {
|
||||
|
||||
@@ -85,7 +85,7 @@ private:
|
||||
bool init() override;
|
||||
void doRun() override;
|
||||
|
||||
ProjectExplorer::BaseStringAspect *m_additionalArgumentsAspect = nullptr;
|
||||
ProjectExplorer::StringAspect *m_additionalArgumentsAspect = nullptr;
|
||||
bool m_runConfigure = false;
|
||||
};
|
||||
|
||||
@@ -94,8 +94,8 @@ ConfigureStep::ConfigureStep(BuildStepList *bsl, Utils::Id id)
|
||||
{
|
||||
setDefaultDisplayName(tr("Configure"));
|
||||
|
||||
m_additionalArgumentsAspect = addAspect<BaseStringAspect>();
|
||||
m_additionalArgumentsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
|
||||
m_additionalArgumentsAspect = addAspect<StringAspect>();
|
||||
m_additionalArgumentsAspect->setDisplayStyle(StringAspect::LineEditDisplay);
|
||||
m_additionalArgumentsAspect->setSettingsKey(
|
||||
"AutotoolsProjectManager.ConfigureStep.AdditionalArguments");
|
||||
m_additionalArgumentsAspect->setLabelText(tr("Arguments:"));
|
||||
|
||||
Reference in New Issue
Block a user