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

ProjectExplorer: Remove BuildStepConfigWidget::m_step

Browse Source 
It's not needed centrally anymore.

Keep it in the only remaining user, QbsBuildStepConfigWidget. Also
there it will not be needed after aspectification anymore.

Change-Id: Ia29e1e1f5226832ecb62ca79675ce717c9e5ef9a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-09-11 13:39:11 +02:00
parent d49365e29e
commit c0b001737c
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/projectexplorer/buildstep.cpp
View File

@@ -488,11 +488,10 @@ BuildStep *BuildStepFactory::restore(BuildStepList *parent, const QVariantMap &m
// BuildStepConfigWidget // BuildStepConfigWidget
BuildStepConfigWidget::BuildStepConfigWidget(BuildStep *step) BuildStepConfigWidget::BuildStepConfigWidget(BuildStep *step)
: m_step(step)
{ {
m_displayName = step->displayName(); m_displayName = step->displayName();
m_summaryText = "<b>" + m_displayName + "</b>"; m_summaryText = "<b>" + m_displayName + "</b>";
connect(m_step, &ProjectConfiguration::displayNameChanged, connect(step, &ProjectConfiguration::displayNameChanged,
this, &BuildStepConfigWidget::updateSummary); this, &BuildStepConfigWidget::updateSummary);
for (auto aspect : step->aspects()) { for (auto aspect : step->aspects()) {
connect(aspect, &BaseAspect::changed, connect(aspect, &BaseAspect::changed,

2
src/plugins/projectexplorer/buildstep.h
View File

@@ -230,7 +230,6 @@ public:
QString summaryText() const; QString summaryText() const;
QString displayName() const; QString displayName() const;
BuildStep *step() const { return m_step; }
void setDisplayName(const QString &displayName); void setDisplayName(const QString &displayName);
void setSummaryText(const QString &summaryText); void setSummaryText(const QString &summaryText);
@@ -242,7 +241,6 @@ signals:
void updateSummary(); void updateSummary();
private: private:
BuildStep *m_step = nullptr;
QString m_displayName; QString m_displayName;
QString m_summaryText; QString m_summaryText;
std::function<QString()> m_summaryUpdater; std::function<QString()> m_summaryUpdater;

8
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -116,6 +116,7 @@ private:
QString effectiveValue; QString effectiveValue;
}; };
QbsBuildStep *m_qbsStep;
QList<Property> m_propertyCache; QList<Property> m_propertyCache;
bool m_ignoreChange = false; bool m_ignoreChange = false;
@@ -542,6 +543,7 @@ void QbsBuildStep::dropSession()
QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) : QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
BuildStepConfigWidget(step), BuildStepConfigWidget(step),
m_qbsStep(step),
m_ignoreChange(false) m_ignoreChange(false)
{ {
connect(step, &ProjectConfiguration::displayNameChanged, connect(step, &ProjectConfiguration::displayNameChanged,
@@ -685,7 +687,7 @@ void QbsBuildStepConfigWidget::updateState()
const QString buildVariant = qbsStep()->buildVariant(); const QString buildVariant = qbsStep()->buildVariant();
const int idx = (buildVariant == Constants::QBS_VARIANT_DEBUG) ? 0 : 1; const int idx = (buildVariant == Constants::QBS_VARIANT_DEBUG) ? 0 : 1;
buildVariantComboBox->setCurrentIndex(idx); buildVariantComboBox->setCurrentIndex(idx);
const auto qbsBuildConfig = static_cast<QbsBuildConfiguration *>(step()->buildConfiguration()); const auto qbsBuildConfig = static_cast<QbsBuildConfiguration *>(qbsStep()->buildConfiguration());
QString command = qbsBuildConfig->equivalentCommandLine(qbsStep()->stepData()); QString command = qbsBuildConfig->equivalentCommandLine(qbsStep()->stepData());
@@ -846,7 +848,7 @@ void QbsBuildStepConfigWidget::applyCachedProperties()
QbsBuildStep *QbsBuildStepConfigWidget::qbsStep() const QbsBuildStep *QbsBuildStepConfigWidget::qbsStep() const
{ {
return static_cast<QbsBuildStep *>(step()); return m_qbsStep;
} }
bool QbsBuildStepConfigWidget::validateProperties(Utils::FancyLineEdit *edit, QString *errorMessage) bool QbsBuildStepConfigWidget::validateProperties(Utils::FancyLineEdit *edit, QString *errorMessage)
@@ -861,7 +863,7 @@ bool QbsBuildStepConfigWidget::validateProperties(Utils::FancyLineEdit *edit, QS
} }
QList<Property> properties; QList<Property> properties;
const MacroExpander * const expander = step()->macroExpander(); const MacroExpander * const expander = qbsStep()->macroExpander();
foreach (const QString &rawArg, argList) { foreach (const QString &rawArg, argList) {
int pos = rawArg.indexOf(':'); int pos = rawArg.indexOf(':');
if (pos > 0) { if (pos > 0) {