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

ProjectExplorer: Rename Base*Aspect to *Aspect

Browse Source 
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:
hjk
2020-08-13 09:16:00 +02:00
parent e62044aa29
commit 51e7bce109
54 changed files with 381 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -123,11 +123,11 @@ QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Core::Id id)
emit qbsConfigurationChanged();
});
m_configurationName = addAspect<BaseStringAspect>();
m_configurationName = addAspect<StringAspect>();
m_configurationName->setLabelText(tr("Configuration name:"));
m_configurationName->setSettingsKey("Qbs.configName");
m_configurationName->setDisplayStyle(BaseStringAspect::LineEditDisplay);
connect(m_configurationName, &BaseStringAspect::changed,
m_configurationName->setDisplayStyle(StringAspect::LineEditDisplay);
connect(m_configurationName, &StringAspect::changed,
this, &BuildConfiguration::buildDirectoryChanged);
const auto separateDebugInfoAspect = addAspect<SeparateDebugInfoAspect>();

2
src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
View File

@@ -100,7 +100,7 @@ private:
QStringList m_changedFiles;
QStringList m_activeFileTags;
QStringList m_products;
ProjectExplorer::BaseStringAspect *m_configurationName = nullptr;
ProjectExplorer::StringAspect *m_configurationName = nullptr;
QbsBuildSystem *m_buildSystem = nullptr;
};

12
src/plugins/qbsprojectmanager/qbscleanstep.cpp
View File

@@ -54,16 +54,16 @@ QbsCleanStep::QbsCleanStep(BuildStepList *bsl, Core::Id id)
{
setDisplayName(tr("Qbs Clean"));
m_dryRunAspect = addAspect<BaseBoolAspect>();
m_dryRunAspect = addAspect<BoolAspect>();
m_dryRunAspect->setSettingsKey("Qbs.DryRun");
m_dryRunAspect->setLabel(tr("Dry run:"), BaseBoolAspect::LabelPlacement::InExtraLabel);
m_dryRunAspect->setLabel(tr("Dry run:"), BoolAspect::LabelPlacement::InExtraLabel);
m_keepGoingAspect = addAspect<BaseBoolAspect>();
m_keepGoingAspect = addAspect<BoolAspect>();
m_keepGoingAspect->setSettingsKey("Qbs.DryKeepGoing");
m_keepGoingAspect->setLabel(tr("Keep going:"), BaseBoolAspect::LabelPlacement::InExtraLabel);
m_keepGoingAspect->setLabel(tr("Keep going:"), BoolAspect::LabelPlacement::InExtraLabel);
auto effectiveCommandAspect = addAspect<BaseStringAspect>();
effectiveCommandAspect->setDisplayStyle(BaseStringAspect::TextEditDisplay);
auto effectiveCommandAspect = addAspect<StringAspect>();
effectiveCommandAspect->setDisplayStyle(StringAspect::TextEditDisplay);
effectiveCommandAspect->setLabelText(tr("Equivalent command line:"));
setSummaryUpdater([this, effectiveCommandAspect] {

4
src/plugins/qbsprojectmanager/qbscleanstep.h
View File

@@ -60,8 +60,8 @@ private:
void createTaskAndOutput(ProjectExplorer::Task::TaskType type,
const QString &message, const QString &file, int line);
ProjectExplorer::BaseBoolAspect *m_dryRunAspect = nullptr;
ProjectExplorer::BaseBoolAspect *m_keepGoingAspect = nullptr;
ProjectExplorer::BoolAspect *m_dryRunAspect = nullptr;
ProjectExplorer::BoolAspect *m_keepGoingAspect = nullptr;
QStringList m_products;
QbsSession *m_session = nullptr;