Skip to content

Commit

Permalink
remove 'BuildStepConfigWidget'
Browse files Browse the repository at this point in the history
  • Loading branch information
christian-rauch committed Jan 13, 2021
1 parent b17b680 commit 3c5ec6a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 30 deletions.
9 changes: 1 addition & 8 deletions src/project_manager/ros_catkin_make_step.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions src/project_manager/ros_catkin_make_step.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -77,7 +76,7 @@ class ROSCatkinMakeStep : public ProjectExplorer::AbstractProcessStep
QRegExp m_percentProgress;
};

class ROSCatkinMakeStepWidget : public ProjectExplorer::BuildStepConfigWidget
class ROSCatkinMakeStepWidget : public QWidget
{
Q_OBJECT

Expand Down
9 changes: 1 addition & 8 deletions src/project_manager/ros_catkin_tools_step.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions src/project_manager/ros_catkin_tools_step.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -92,7 +91,7 @@ class ROSCatkinToolsStep : public ProjectExplorer::AbstractProcessStep
QRegExp m_percentProgress;
};

class ROSCatkinToolsStepWidget : public ProjectExplorer::BuildStepConfigWidget
class ROSCatkinToolsStepWidget : public QWidget
{
Q_OBJECT

Expand Down
9 changes: 1 addition & 8 deletions src/project_manager/ros_colcon_step.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions src/project_manager/ros_colcon_step.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -78,7 +77,7 @@ class ROSColconStep : public ProjectExplorer::AbstractProcessStep
QRegExp m_percentProgress;
};

class ROSColconStepWidget : public ProjectExplorer::BuildStepConfigWidget
class ROSColconStepWidget : public QWidget
{
Q_OBJECT

Expand Down

0 comments on commit 3c5ec6a

Please sign in to comment.