forked from qt-creator/qt-creator
BuildStep: Remove finished() signal and use FutureInterface to report
Remove the finished() signal that is (sometimes) used to report that a buildstep is done and use the FutureInterface for that purpose consistently. Change-Id: Ibe5520b562b91f1a7f4fc73ee898b33b930029ec Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
@@ -157,7 +157,7 @@ bool AutogenStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
}
|
||||
|
||||
void AutogenStep::run(QFutureInterface<bool> &interface)
|
||||
void AutogenStep::run(QFutureInterface<bool> &fi)
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
|
||||
@@ -175,13 +175,12 @@ void AutogenStep::run(QFutureInterface<bool> &interface)
|
||||
|
||||
if (!m_runAutogen) {
|
||||
emit addOutput(tr("Configuration unchanged, skipping autogen step."), BuildStep::MessageOutput);
|
||||
interface.reportResult(true);
|
||||
emit finished();
|
||||
reportRunResult(fi, true);
|
||||
return;
|
||||
}
|
||||
|
||||
m_runAutogen = false;
|
||||
AbstractProcessStep::run(interface);
|
||||
AbstractProcessStep::run(fi);
|
||||
}
|
||||
|
||||
BuildStepConfigWidget *AutogenStep::createConfigWidget()
|
||||
|
||||
@@ -91,7 +91,7 @@ public:
|
||||
explicit AutogenStep(ProjectExplorer::BuildStepList *bsl);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
void run(QFutureInterface<bool> &interface) override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
bool immutable() const override;
|
||||
QString additionalArguments() const;
|
||||
|
||||
@@ -158,7 +158,7 @@ bool AutoreconfStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
}
|
||||
|
||||
void AutoreconfStep::run(QFutureInterface<bool> &interface)
|
||||
void AutoreconfStep::run(QFutureInterface<bool> &fi)
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
|
||||
@@ -170,13 +170,12 @@ void AutoreconfStep::run(QFutureInterface<bool> &interface)
|
||||
|
||||
if (!m_runAutoreconf) {
|
||||
emit addOutput(tr("Configuration unchanged, skipping autoreconf step."), BuildStep::MessageOutput);
|
||||
interface.reportResult(true);
|
||||
emit finished();
|
||||
reportRunResult(fi, true);
|
||||
return;
|
||||
}
|
||||
|
||||
m_runAutoreconf = false;
|
||||
AbstractProcessStep::run(interface);
|
||||
AbstractProcessStep::run(fi);
|
||||
}
|
||||
|
||||
BuildStepConfigWidget *AutoreconfStep::createConfigWidget()
|
||||
|
||||
@@ -91,7 +91,7 @@ public:
|
||||
explicit AutoreconfStep(ProjectExplorer::BuildStepList *bsl);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
void run(QFutureInterface<bool> &interface) override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
bool immutable() const override;
|
||||
QString additionalArguments() const;
|
||||
|
||||
@@ -171,7 +171,7 @@ bool ConfigureStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
}
|
||||
|
||||
void ConfigureStep::run(QFutureInterface<bool>& interface)
|
||||
void ConfigureStep::run(QFutureInterface<bool>& fi)
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
|
||||
@@ -187,13 +187,12 @@ void ConfigureStep::run(QFutureInterface<bool>& interface)
|
||||
|
||||
if (!m_runConfigure) {
|
||||
emit addOutput(tr("Configuration unchanged, skipping configure step."), BuildStep::MessageOutput);
|
||||
interface.reportResult(true);
|
||||
emit finished();
|
||||
reportRunResult(fi, true);
|
||||
return;
|
||||
}
|
||||
|
||||
m_runConfigure = false;
|
||||
AbstractProcessStep::run(interface);
|
||||
AbstractProcessStep::run(fi);
|
||||
}
|
||||
|
||||
BuildStepConfigWidget *ConfigureStep::createConfigWidget()
|
||||
|
||||
@@ -90,7 +90,7 @@ public:
|
||||
explicit ConfigureStep(ProjectExplorer::BuildStepList *bsl);
|
||||
|
||||
bool init(QList<const BuildStep *> &earlierSteps) override;
|
||||
void run(QFutureInterface<bool> &interface) override;
|
||||
void run(QFutureInterface<bool> &fi) override;
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
bool immutable() const override;
|
||||
QString additionalArguments() const;
|
||||
|
||||
Reference in New Issue
Block a user