ProjectExplorer: Change BuildStepConfigWidget::summaryWidget()

From a virtual function to a normal one backed by a real data member.

That's essentially what several re-implementations did, the other
ones used a fixed value instead.

Change-Id: I61e45f1d4f7f0f80fe2eb1f2729785f37e7bb803
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-10-15 17:52:15 +02:00
parent fb1c562c2e
commit d6c605d84c
35 changed files with 34 additions and 179 deletions

View File

@@ -68,7 +68,6 @@ class QbsBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public:
QbsBuildStepConfigWidget(QbsBuildStep *step);
~QbsBuildStepConfigWidget() override;
QString summaryText() const override;
private:
void updateState();
@@ -115,7 +114,6 @@ private:
};
QList<Property> m_propertyCache;
QString m_summary;
bool m_ignoreChange;
};
@@ -596,11 +594,6 @@ QbsBuildStepConfigWidget::~QbsBuildStepConfigWidget()
delete m_ui;
}
QString QbsBuildStepConfigWidget::summaryText() const
{
return m_summary;
}
void QbsBuildStepConfigWidget::updateState()
{
if (!m_ignoreChange) {
@@ -632,11 +625,7 @@ void QbsBuildStepConfigWidget::updateState()
command.append(' ').append(Constants::QBS_CONFIG_QUICK_DEBUG_KEY).append(":true");
m_ui->commandLineTextEdit->setPlainText(command);
QString summary = tr("<b>Qbs:</b> %1").arg(command);
if (m_summary != summary) {
m_summary = summary;
emit updateSummary();
}
setSummaryText(tr("<b>Qbs:</b> %1").arg(command));
}
void QbsBuildStepConfigWidget::updateQmlDebuggingOption()

View File

@@ -245,11 +245,6 @@ QbsCleanStepConfigWidget::~QbsCleanStepConfigWidget()
delete m_ui;
}
QString QbsCleanStepConfigWidget::summaryText() const
{
return m_summary;
}
void QbsCleanStepConfigWidget::updateState()
{
m_ui->dryRunCheckBox->setChecked(m_step->dryRun());
@@ -259,11 +254,7 @@ void QbsCleanStepConfigWidget::updateState()
->equivalentCommandLine(m_step);
m_ui->commandLineTextEdit->setPlainText(command);
QString summary = tr("<b>Qbs:</b> %1").arg(command);
if (m_summary != summary) {
m_summary = summary;
emit updateSummary();
}
setSummaryText(tr("<b>Qbs:</b> %1").arg(command));
}
void QbsCleanStepConfigWidget::changeDryRun(bool dr)

View File

@@ -96,7 +96,6 @@ class QbsCleanStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public:
QbsCleanStepConfigWidget(QbsCleanStep *step);
~QbsCleanStepConfigWidget() override;
QString summaryText() const override;
private:
void updateState();
@@ -108,7 +107,6 @@ private:
Ui::QbsCleanStepConfigWidget *m_ui;
QbsCleanStep *m_step;
QString m_summary;
};
class QbsCleanStepFactory : public ProjectExplorer::BuildStepFactory

View File

@@ -283,11 +283,6 @@ QbsInstallStepConfigWidget::~QbsInstallStepConfigWidget()
delete m_ui;
}
QString QbsInstallStepConfigWidget::summaryText() const
{
return m_summary;
}
void QbsInstallStepConfigWidget::updateState()
{
if (!m_ignoreChange) {
@@ -301,11 +296,7 @@ void QbsInstallStepConfigWidget::updateState()
m_ui->commandLineTextEdit->setPlainText(command);
QString summary = tr("<b>Qbs:</b> %1").arg(command);
if (m_summary != summary) {
m_summary = summary;
emit updateSummary();
}
setSummaryText(tr("<b>Qbs:</b> %1").arg(command));
}
void QbsInstallStepConfigWidget::changeRemoveFirst(bool rf)

View File

@@ -99,7 +99,6 @@ class QbsInstallStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public:
QbsInstallStepConfigWidget(QbsInstallStep *step);
~QbsInstallStepConfigWidget() override;
QString summaryText() const override;
private:
void updateState();
@@ -112,7 +111,6 @@ private:
Ui::QbsInstallStepConfigWidget *m_ui;
QbsInstallStep *m_step;
QString m_summary;
bool m_ignoreChange;
};