ProjectExplorer: Remove BuildStepConfigWidget

After the previous changes it was only an empty wrapper around QWidget.

Change-Id: I58dcd82d8342c7de5e2df537044f6cf3de878a67
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/android/androidbuildapkstep.cpp

@@ -127,7 +127,7 @@ private:
 
 // AndroidBuildApkWidget
 
-class AndroidBuildApkWidget : public BuildStepConfigWidget
+class AndroidBuildApkWidget : public QWidget
 {
     Q_DECLARE_TR_FUNCTIONS(Android::Internal::AndroidBuildApkStep)
 
@@ -157,7 +157,7 @@ private:
 };
 
 AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
-    : BuildStepConfigWidget(step), m_step(step)
+    : m_step(step)
 {
     auto vbox = new QVBoxLayout(this);
     vbox->addWidget(createSignPackageGroup());
@@ -662,7 +662,7 @@ void AndroidBuildApkStep::showInGraphicalShell()
     Core::FileUtils::showInGraphicalShell(Core::ICore::dialogParent(), m_packagePath);
 }
 
-ProjectExplorer::BuildStepConfigWidget *AndroidBuildApkStep::createConfigWidget()
+QWidget *AndroidBuildApkStep::createConfigWidget()
 {
     return new AndroidBuildApkWidget(this);
 }

src/plugins/android/androidbuildapkstep.h

@@ -83,7 +83,7 @@ private:
 
     bool init() override;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+    QWidget *createConfigWidget() override;
     void processStarted() override;
     void processFinished(int exitCode, QProcess::ExitStatus status) override;
     bool verifyKeystorePassword();

src/plugins/android/androiddeployqtstep.cpp

@@ -473,9 +473,9 @@ void AndroidDeployQtStep::runCommand(const CommandLine &command)
     }
 }
 
-BuildStepConfigWidget *AndroidDeployQtStep::createConfigWidget()
+QWidget *AndroidDeployQtStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
     setDisplayName(QString("<b>%1</b>").arg(displayName()));
     setSummaryText(displayName());

src/plugins/android/androiddeployqtstep.h

@@ -87,7 +87,7 @@ private:
 
     bool runImpl();
 
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+    QWidget *createConfigWidget() override;
 
     void processReadyReadStdOutput(DeployErrorCode &errorCode);
     void stdOutput(const QString &line);

src/plugins/cmakeprojectmanager/cmakebuildstep.cpp

@@ -432,9 +432,9 @@ QString CMakeBuildStep::activeRunConfigTarget() const
     return rc ? rc->buildKey() : QString();
 }
 
-BuildStepConfigWidget *CMakeBuildStep::createConfigWidget()
+QWidget *CMakeBuildStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
     auto updateDetails = [this] {
         ProcessParameters param;

src/plugins/cmakeprojectmanager/cmakebuildstep.h

@@ -89,7 +89,7 @@ private:
     bool init() override;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
     void doRun() override;
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+    QWidget *createConfigWidget() override;
 
     QString defaultBuildTarget() const;
 

src/plugins/ios/iosbuildstep.cpp

@@ -69,7 +69,7 @@ public:
     IosBuildStep(BuildStepList *stepList, Utils::Id id);
 
 private:
-    BuildStepConfigWidget *createConfigWidget() final;
+    QWidget *createConfigWidget() final;
     void setBaseArguments(const QStringList &args);
     void setExtraArguments(const QStringList &extraArgs);
     QStringList baseArguments() const;
@@ -88,9 +88,9 @@ private:
     bool m_useDefaultArguments = true;
 };
 
-BuildStepConfigWidget *IosBuildStep::createConfigWidget()
+QWidget *IosBuildStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
     auto buildArgumentsLabel = new QLabel(tr("Base arguments:"), widget);
 

src/plugins/ios/iosdeploystep.cpp

@@ -83,7 +83,7 @@ private:
     void updateDisplayNames();
 
     bool init() final;
-    BuildStepConfigWidget *createConfigWidget() final;
+    QWidget *createConfigWidget() final;
     IDevice::ConstPtr device() const;
     IosDevice::ConstPtr iosdevice() const;
     IosSimulator::ConstPtr iossimulator() const;
@@ -230,9 +230,9 @@ void IosDeployStep::handleErrorMsg(IosToolHandler *handler, const QString &msg)
     emit addOutput(msg, OutputFormat::ErrorMessage);
 }
 
-BuildStepConfigWidget *IosDeployStep::createConfigWidget()
+QWidget *IosDeployStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
     widget->setObjectName("IosDeployStepWidget");
     setDisplayName(QString("<b>%1</b>").arg(displayName()));

src/plugins/ios/iosdsymbuildstep.cpp

@@ -203,9 +203,9 @@ QStringList IosDsymBuildStep::arguments() const
 }
 
 
-BuildStepConfigWidget *IosDsymBuildStep::createConfigWidget()
+QWidget *IosDsymBuildStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
     auto commandLabel = new QLabel(tr("Command:"), widget);
 

src/plugins/ios/iosdsymbuildstep.h

@@ -39,7 +39,7 @@ class IosDsymBuildStep : public ProjectExplorer::AbstractProcessStep
 public:
     IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Utils::Id id);
 
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+    QWidget *createConfigWidget() override;
     void setArguments(const QStringList &args);
     QStringList arguments() const;
     QStringList defaultArguments() const;

src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp

@@ -70,9 +70,9 @@ NinjaBuildStep::NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id
             &NinjaBuildStep::commandChanged);
 }
 
-BuildStepConfigWidget *NinjaBuildStep::createConfigWidget()
+QWidget *NinjaBuildStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget{this};
+    auto widget = new QWidget;
     setDisplayName(tr("Build", "MesonProjectManager::MesonBuildStepConfigWidget display name."));
 
     auto buildTargetsList = new QListWidget(widget);

src/plugins/mesonprojectmanager/project/ninjabuildstep.h

@@ -38,7 +38,7 @@ class NinjaBuildStep final : public ProjectExplorer::AbstractProcessStep
 public:
     NinjaBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
 
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() final;
+    QWidget *createConfigWidget() final;
     Utils::CommandLine command();
     QStringList projectTargets();
     void setBuildTarget(const QString &targetName);

src/plugins/nim/project/nimbletaskstep.cpp

@@ -60,7 +60,7 @@ public:
     NimbleTaskStep(BuildStepList *parentList, Id id);
 
 private:
-    BuildStepConfigWidget *createConfigWidget() final;
+    QWidget *createConfigWidget() final;
 
     void setTaskName(const QString &name);
 
@@ -100,9 +100,9 @@ NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList, Id id)
     m_taskArgs->setLabelText(tr("Task arguments:"));
 }
 
-BuildStepConfigWidget *NimbleTaskStep::createConfigWidget()
+QWidget *NimbleTaskStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
     auto taskList = new QListView(widget);
     taskList->setFrameShape(QFrame::StyledPanel);

src/plugins/nim/project/nimcompilerbuildstep.cpp

@@ -107,9 +107,9 @@ void NimCompilerBuildStep::setupOutputFormatter(OutputFormatter *formatter)
     AbstractProcessStep::setupOutputFormatter(formatter);
 }
 
-BuildStepConfigWidget *NimCompilerBuildStep::createConfigWidget()
+QWidget *NimCompilerBuildStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
     setDisplayName(tr("Nim build step"));
     setSummaryText(tr("Nim build step"));

src/plugins/nim/project/nimcompilerbuildstep.h

@@ -46,7 +46,7 @@ public:
 
 private:
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+    QWidget *createConfigWidget() override;
 
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;

src/plugins/projectexplorer/buildstep.cpp

@@ -157,17 +157,15 @@ void BuildStep::cancel()
     doCancel();
 }
 
-BuildStepConfigWidget *BuildStep::createConfigWidget()
+QWidget *BuildStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
-    {
-        LayoutBuilder builder(widget);
-        for (BaseAspect *aspect : qAsConst(m_aspects)) {
-            if (aspect->isVisible())
-                aspect->addToLayout(builder.finishRow());
-            connect(aspect, &BaseAspect::changed, this, &BuildStep::recreateSummary);
-        }
+    LayoutBuilder builder(widget);
+    for (BaseAspect *aspect : qAsConst(m_aspects)) {
+        if (aspect->isVisible())
+            aspect->addToLayout(builder.finishRow());
+        connect(aspect, &BaseAspect::changed, this, &BuildStep::recreateSummary);
     }
 
     connect(buildConfiguration(), &BuildConfiguration::buildDirectoryChanged,
@@ -483,10 +481,6 @@ BuildStep *BuildStepFactory::restore(BuildStepList *parent, const QVariantMap &m
     return bs;
 }
 
-BuildStepConfigWidget::BuildStepConfigWidget(BuildStep *)
-{
-}
-
 QString BuildStep::summaryText() const
 {
     if (m_summaryText.isEmpty())

src/plugins/projectexplorer/buildstep.h

@@ -50,12 +50,10 @@ class OutputFormatter;
 namespace ProjectExplorer {
 
 class BuildConfiguration;
-class BuildStepConfigWidget;
 class BuildStepFactory;
 class BuildStepList;
 class BuildSystem;
 class DeployConfiguration;
-class Target;
 class Task;
 
 // Documentation inside.
@@ -72,7 +70,7 @@ public:
     virtual bool init() = 0;
     void run();
     void cancel();
-    virtual BuildStepConfigWidget *createConfigWidget();
+    virtual QWidget *createConfigWidget();
 
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
@@ -231,13 +229,6 @@ private:
     bool m_isRepeatable = true;
 };
 
-class PROJECTEXPLORER_EXPORT BuildStepConfigWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit BuildStepConfigWidget(BuildStep *step);
-};
-
 } // namespace ProjectExplorer
 
 Q_DECLARE_METATYPE(ProjectExplorer::BuildStep::OutputFormat)

src/plugins/projectexplorer/buildstepspage.h

@@ -82,7 +82,7 @@ public:
     ~BuildStepsWidgetData();
 
     BuildStep *step;
-    BuildStepConfigWidget *widget;
+    QWidget *widget;
     Utils::DetailsWidget *detailsWidget;
     ToolWidget *toolWidget;
 };

src/plugins/projectexplorer/makestep.cpp

@@ -342,9 +342,9 @@ CommandLine MakeStep::effectiveMakeCommand(MakeCommandType type) const
     return cmd;
 }
 
-BuildStepConfigWidget *MakeStep::createConfigWidget()
+QWidget *MakeStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
     auto targetsLabel = new QLabel(widget);
     targetsLabel->setText(tr("Targets:"));

src/plugins/projectexplorer/makestep.h

@@ -34,8 +34,6 @@ namespace Utils { class Environment; }
 
 namespace ProjectExplorer {
 
-namespace Internal { class MakeStepConfigWidget; }
-
 class PROJECTEXPLORER_EXPORT MakeStep : public ProjectExplorer::AbstractProcessStep
 {
     Q_OBJECT
@@ -52,7 +50,7 @@ public:
 
     bool init() override;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+    QWidget *createConfigWidget() override;
     bool buildsTarget(const QString &target) const;
     void setBuildTarget(const QString &target, bool on);
     QStringList availableTargets() const;
@@ -86,8 +84,6 @@ protected:
     virtual QStringList displayArguments() const;
 
 private:
-    friend class Internal::MakeStepConfigWidget;
-
     static int defaultJobCount();
     QStringList jobArguments() const;
 

src/plugins/qbsprojectmanager/qbsbuildstep.cpp

@@ -72,7 +72,7 @@ using namespace Utils;
 namespace QbsProjectManager {
 namespace Internal {
 
-class QbsBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
+class QbsBuildStepConfigWidget : public QWidget
 {
     Q_OBJECT
 public:
@@ -191,7 +191,7 @@ void QbsBuildStep::doRun()
     parseProject();
 }
 
-ProjectExplorer::BuildStepConfigWidget *QbsBuildStep::createConfigWidget()
+QWidget *QbsBuildStep::createConfigWidget()
 {
     return new QbsBuildStepConfigWidget(this);
 }
@@ -544,7 +544,6 @@ void QbsBuildStep::dropSession()
 // --------------------------------------------------------------------
 
 QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
-    BuildStepConfigWidget(step),
     m_qbsStep(step),
     m_ignoreChange(false)
 {

src/plugins/qbsprojectmanager/qbsbuildstep.h

@@ -83,7 +83,7 @@ private:
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
     void doRun() override;
     void doCancel() override;
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+    QWidget *createConfigWidget() override;
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
 

src/plugins/qbsprojectmanager/qbsinstallstep.cpp

@@ -179,9 +179,9 @@ QbsBuildStepData QbsInstallStep::stepData() const
     return data;
 }
 
-BuildStepConfigWidget *QbsInstallStep::createConfigWidget()
+QWidget *QbsInstallStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
     auto installRootValueLabel = new QLabel(installRoot());
 

src/plugins/qbsprojectmanager/qbsinstallstep.h

@@ -54,7 +54,7 @@ private:
     bool init() override;
     void doRun() override;
     void doCancel() override;
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+    QWidget *createConfigWidget() override;
 
     const QbsBuildConfiguration *buildConfig() const;
     void installDone(const ErrorInfo &error);

src/plugins/qmakeprojectmanager/qmakestep.cpp

@@ -491,9 +491,9 @@ bool QMakeStep::fromMap(const QVariantMap &map)
     return BuildStep::fromMap(map);
 }
 
-BuildStepConfigWidget *QMakeStep::createConfigWidget()
+QWidget *QMakeStep::createConfigWidget()
 {
-    auto widget = new BuildStepConfigWidget(this);
+    auto widget = new QWidget;
 
     auto label_0 = new QLabel(tr("qmake build configuration:"), widget);
 

src/plugins/qmakeprojectmanager/qmakestep.h

@@ -122,7 +122,7 @@ public:
     bool init() override;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
     void doRun() override;
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+    QWidget *createConfigWidget() override;
     void setForced(bool b);
 
     enum class ArgumentFlag {

src/plugins/remotelinux/makeinstallstep.cpp

@@ -120,8 +120,9 @@ QString MakeInstallStep::displayName()
     return tr("Install into temporary host directory");
 }
 
-BuildStepConfigWidget *MakeInstallStep::createConfigWidget()
+QWidget *MakeInstallStep::createConfigWidget()
 {
+    // Note: this intentionally skips the MakeStep::createConfigWidget() level.
     return BuildStep::createConfigWidget();
 }
 

src/plugins/remotelinux/makeinstallstep.h

@@ -48,7 +48,7 @@ public:
 
 private:
     bool fromMap(const QVariantMap &map) override;
-    ProjectExplorer::BuildStepConfigWidget * createConfigWidget() override;
+    QWidget *createConfigWidget() override;
     bool init() override;
     void finish(bool success) override;
     void stdError(const QString &line) override;