ProjectExplorer: Simplify BuildStep::init() signature

The extra parameter was always computed but used only in one place,
and that use got removed lately.

Change-Id: Ie10c0107ca70ee97ce03f83294992aab8d1a3ffe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-01-10 15:31:44 +01:00
parent ca24877c93
commit f007bc7593
54 changed files with 69 additions and 87 deletions

View File

@@ -133,7 +133,7 @@ AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent)
setImmutable(true);
}
bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
bool AndroidBuildApkStep::init()
{
ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
@@ -193,7 +193,7 @@ bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
m_apkPath = AndroidManager::apkPath(target()).toString();
qCDebug(buildapkstepLog) << "APK path:" << m_apkPath;
if (!AbstractProcessStep::init(earlierSteps))
if (!AbstractProcessStep::init())
return false;
QString command = version->qmakeProperty("QT_HOST_BINS");

View File

@@ -77,7 +77,7 @@ public:
private:
Q_INVOKABLE void showInGraphicalShell();
bool init(QList<const BuildStep *> &earlierSteps) override;
bool init() override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
void processStarted() override;
void processFinished(int exitCode, QProcess::ExitStatus status) override;

View File

@@ -106,9 +106,8 @@ AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent)
this, &AndroidDeployQtStep::slotSetSerialNumber);
}
bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps)
bool AndroidDeployQtStep::init()
{
Q_UNUSED(earlierSteps);
m_androiddeployqtArgs.clear();
m_targetArch = AndroidManager::targetArch(target());

View File

@@ -86,7 +86,7 @@ signals:
private:
void runCommand(const QString &program, const QStringList &arguments);
bool init(QList<const BuildStep *> &earlierSteps) override;
bool init() override;
void run(QFutureInterface<bool> &fi) override;
void gatherFilesToPull();
DeployErrorCode runDeploy(QFutureInterface<bool> &fi);

View File

@@ -58,7 +58,7 @@ AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bs
setImmutable(true);
}
bool AndroidPackageInstallationStep::init(QList<const BuildStep *> &earlierSteps)
bool AndroidPackageInstallationStep::init()
{
BuildConfiguration *bc = buildConfiguration();
QString dirPath = bc->buildDirectory().appendPath(Constants::ANDROID_BUILDDIRECTORY).toString();
@@ -92,7 +92,7 @@ bool AndroidPackageInstallationStep::init(QList<const BuildStep *> &earlierSteps
m_androidDirsToClean << dirPath + "/assets";
m_androidDirsToClean << dirPath + "/libs";
return AbstractProcessStep::init(earlierSteps);
return AbstractProcessStep::init();
}
void AndroidPackageInstallationStep::run(QFutureInterface<bool> &fi)

View File

@@ -40,7 +40,7 @@ class ANDROID_EXPORT AndroidPackageInstallationStep : public ProjectExplorer::Ab
public:
explicit AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl);
bool init(QList<const BuildStep *> &earlierSteps) override;
bool init() override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;