From 3c5ec6a47de73b6568440c90bbd58920e7f8cff4 Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Wed, 13 Jan 2021 13:33:57 +0000 Subject: [PATCH] remove 'BuildStepConfigWidget' --- src/project_manager/ros_catkin_make_step.cpp | 9 +-------- src/project_manager/ros_catkin_make_step.h | 3 +-- src/project_manager/ros_catkin_tools_step.cpp | 9 +-------- src/project_manager/ros_catkin_tools_step.h | 3 +-- src/project_manager/ros_colcon_step.cpp | 9 +-------- src/project_manager/ros_colcon_step.h | 3 +-- 6 files changed, 6 insertions(+), 30 deletions(-) diff --git a/src/project_manager/ros_catkin_make_step.cpp b/src/project_manager/ros_catkin_make_step.cpp index 3081b0cb..ab5462a1 100644 --- a/src/project_manager/ros_catkin_make_step.cpp +++ b/src/project_manager/ros_catkin_make_step.cpp @@ -211,11 +211,6 @@ void ROSCatkinMakeStep::stdOutput(const QString &line) } } -BuildStepConfigWidget *ROSCatkinMakeStep::createConfigWidget() -{ - return new ROSCatkinMakeStepWidget(this); -} - ROSCatkinMakeStep::BuildTargets ROSCatkinMakeStep::buildTarget() const { return m_target; @@ -231,8 +226,7 @@ void ROSCatkinMakeStep::setBuildTarget(const BuildTargets &target) // ROSCatkinMakeStepWidget::ROSCatkinMakeStepWidget(ROSCatkinMakeStep *makeStep) - : ProjectExplorer::BuildStepConfigWidget(makeStep) - , m_makeStep(makeStep) + : m_makeStep(makeStep) { m_ui = new Ui::ROSCatkinMakeStep; m_ui->setupUi(this); @@ -294,7 +288,6 @@ void ROSCatkinMakeStepWidget::updateDetails() param.setEnvironment(bc->environment()); param.setCommandLine(m_makeStep->makeCommand(m_makeStep->allArguments(bc->cmakeBuildType(), false))); m_summaryText = param.summary(displayName()); - emit updateSummary(); } void ROSCatkinMakeStepWidget::updateBuildSystem(const ROSUtils::BuildSystem &buildSystem) diff --git a/src/project_manager/ros_catkin_make_step.h b/src/project_manager/ros_catkin_make_step.h index 663f2886..b4210ff9 100644 --- a/src/project_manager/ros_catkin_make_step.h +++ b/src/project_manager/ros_catkin_make_step.h @@ -52,7 +52,6 @@ class ROSCatkinMakeStep : public ProjectExplorer::AbstractProcessStep bool init() override; void setupOutputFormatter(Utils::OutputFormatter *formatter) override; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; ROSBuildConfiguration *rosBuildConfiguration() const; BuildTargets buildTarget() const; @@ -77,7 +76,7 @@ class ROSCatkinMakeStep : public ProjectExplorer::AbstractProcessStep QRegExp m_percentProgress; }; -class ROSCatkinMakeStepWidget : public ProjectExplorer::BuildStepConfigWidget +class ROSCatkinMakeStepWidget : public QWidget { Q_OBJECT diff --git a/src/project_manager/ros_catkin_tools_step.cpp b/src/project_manager/ros_catkin_tools_step.cpp index 034d666e..107e1e69 100644 --- a/src/project_manager/ros_catkin_tools_step.cpp +++ b/src/project_manager/ros_catkin_tools_step.cpp @@ -237,11 +237,6 @@ void ROSCatkinToolsStep::stdOutput(const QString &line) } } -BuildStepConfigWidget *ROSCatkinToolsStep::createConfigWidget() -{ - return new ROSCatkinToolsStepWidget(this); -} - ROSCatkinToolsStep::BuildTargets ROSCatkinToolsStep::buildTarget() const { return m_target; @@ -267,8 +262,7 @@ void ROSCatkinToolsStep::setActiveProfile(const QString &profileName) // ROSCatkinToolsStepWidget::ROSCatkinToolsStepWidget(ROSCatkinToolsStep *makeStep) - : ProjectExplorer::BuildStepConfigWidget(makeStep) - , m_makeStep(makeStep) + : m_makeStep(makeStep) { m_ui = new Ui::ROSCatkinToolsStep; m_ui->setupUi(this); @@ -376,7 +370,6 @@ void ROSCatkinToolsStepWidget::updateDetails() param.setWorkingDirectory(Utils::FilePath::fromString(m_makeStep->m_catkinToolsWorkingDir)); param.setCommandLine(m_makeStep->makeCommand(m_makeStep->allArguments(bc->cmakeBuildType(), false))); m_summaryText = param.summary(displayName()); - emit updateSummary(); } void ROSCatkinToolsStepWidget::updateBuildSystem(const ROSUtils::BuildSystem &buildSystem) diff --git a/src/project_manager/ros_catkin_tools_step.h b/src/project_manager/ros_catkin_tools_step.h index a8d89c12..99e73d88 100644 --- a/src/project_manager/ros_catkin_tools_step.h +++ b/src/project_manager/ros_catkin_tools_step.h @@ -60,7 +60,6 @@ class ROSCatkinToolsStep : public ProjectExplorer::AbstractProcessStep bool init() override; void setupOutputFormatter(Utils::OutputFormatter *formatter) override; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; ROSBuildConfiguration *rosBuildConfiguration() const; BuildTargets buildTarget() const; @@ -92,7 +91,7 @@ class ROSCatkinToolsStep : public ProjectExplorer::AbstractProcessStep QRegExp m_percentProgress; }; -class ROSCatkinToolsStepWidget : public ProjectExplorer::BuildStepConfigWidget +class ROSCatkinToolsStepWidget : public QWidget { Q_OBJECT diff --git a/src/project_manager/ros_colcon_step.cpp b/src/project_manager/ros_colcon_step.cpp index 45f9e99d..95180107 100644 --- a/src/project_manager/ros_colcon_step.cpp +++ b/src/project_manager/ros_colcon_step.cpp @@ -220,11 +220,6 @@ void ROSColconStep::stdOutput(const QString &line) } } -BuildStepConfigWidget *ROSColconStep::createConfigWidget() -{ - return new ROSColconStepWidget(this); -} - ROSColconStep::BuildTargets ROSColconStep::buildTarget() const { return m_target; @@ -240,8 +235,7 @@ void ROSColconStep::setBuildTarget(const BuildTargets &target) // ROSColconStepWidget::ROSColconStepWidget(ROSColconStep *makeStep) - : ProjectExplorer::BuildStepConfigWidget(makeStep) - , m_makeStep(makeStep) + : m_makeStep(makeStep) { m_ui = new Ui::ROSColconStep; m_ui->setupUi(this); @@ -303,7 +297,6 @@ void ROSColconStepWidget::updateDetails() param.setEnvironment(bc->environment()); param.setCommandLine(m_makeStep->makeCommand(m_makeStep->allArguments(bc->cmakeBuildType(), false))); m_summaryText = param.summary(displayName()); - emit updateSummary(); } void ROSColconStepWidget::updateBuildSystem(const ROSUtils::BuildSystem &buildSystem) diff --git a/src/project_manager/ros_colcon_step.h b/src/project_manager/ros_colcon_step.h index e3883012..e03cc867 100644 --- a/src/project_manager/ros_colcon_step.h +++ b/src/project_manager/ros_colcon_step.h @@ -52,7 +52,6 @@ class ROSColconStep : public ProjectExplorer::AbstractProcessStep bool init() override; void setupOutputFormatter(Utils::OutputFormatter *formatter) override; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; ROSBuildConfiguration *rosBuildConfiguration() const; BuildTargets buildTarget() const; @@ -78,7 +77,7 @@ class ROSColconStep : public ProjectExplorer::AbstractProcessStep QRegExp m_percentProgress; }; -class ROSColconStepWidget : public ProjectExplorer::BuildStepConfigWidget +class ROSColconStepWidget : public QWidget { Q_OBJECT