Remove autotoolsBuildConfiguration() from all steps

All of the steps are just using standard buildconfiguration methods.

Change-Id: Ibdef14e0e845e0bfc8828922a985070665e5f172
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2012-11-01 18:15:09 +01:00
parent 4e93ce81a8
commit 3d9ce0f687
8 changed files with 12 additions and 40 deletions

View File

@@ -151,14 +151,9 @@ void AutogenStep::ctor()
setDefaultDisplayName(tr("Autogen")); setDefaultDisplayName(tr("Autogen"));
} }
AutotoolsBuildConfiguration *AutogenStep::autotoolsBuildConfiguration() const
{
return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration());
}
bool AutogenStep::init() bool AutogenStep::init()
{ {
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration(); BuildConfiguration *bc = buildConfiguration();
ProcessParameters *pp = processParameters(); ProcessParameters *pp = processParameters();
pp->setMacroExpander(bc->macroExpander()); pp->setMacroExpander(bc->macroExpander());
@@ -172,7 +167,7 @@ bool AutogenStep::init()
void AutogenStep::run(QFutureInterface<bool> &interface) void AutogenStep::run(QFutureInterface<bool> &interface)
{ {
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration(); BuildConfiguration *bc = buildConfiguration();
// Check whether we need to run autogen.sh // Check whether we need to run autogen.sh
const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure")); const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure"));
@@ -273,7 +268,7 @@ QString AutogenStepConfigWidget::summaryText() const
void AutogenStepConfigWidget::updateDetails() void AutogenStepConfigWidget::updateDetails()
{ {
AutotoolsBuildConfiguration *bc = m_autogenStep->autotoolsBuildConfiguration(); BuildConfiguration *bc = m_autogenStep->buildConfiguration();
ProcessParameters param; ProcessParameters param;
param.setMacroExpander(bc->macroExpander()); param.setMacroExpander(bc->macroExpander());

View File

@@ -42,7 +42,6 @@ namespace AutotoolsProjectManager {
namespace Internal { namespace Internal {
class AutotoolsProject; class AutotoolsProject;
class AutotoolsBuildConfiguration;
class AutogenStep; class AutogenStep;
class AutogenStepConfigWidget; class AutogenStepConfigWidget;
@@ -96,7 +95,6 @@ class AutogenStep : public ProjectExplorer::AbstractProcessStep
public: public:
AutogenStep(ProjectExplorer::BuildStepList *bsl); AutogenStep(ProjectExplorer::BuildStepList *bsl);
AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const;
bool init(); bool init();
void run(QFutureInterface<bool> &interface); void run(QFutureInterface<bool> &interface);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget();

View File

@@ -150,14 +150,9 @@ void AutoreconfStep::ctor()
setDefaultDisplayName(tr("Autoreconf")); setDefaultDisplayName(tr("Autoreconf"));
} }
AutotoolsBuildConfiguration *AutoreconfStep::autotoolsBuildConfiguration() const
{
return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration());
}
bool AutoreconfStep::init() bool AutoreconfStep::init()
{ {
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration(); BuildConfiguration *bc = buildConfiguration();
ProcessParameters *pp = processParameters(); ProcessParameters *pp = processParameters();
pp->setMacroExpander(bc->macroExpander()); pp->setMacroExpander(bc->macroExpander());
@@ -171,7 +166,7 @@ bool AutoreconfStep::init()
void AutoreconfStep::run(QFutureInterface<bool> &interface) void AutoreconfStep::run(QFutureInterface<bool> &interface)
{ {
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration(); BuildConfiguration *bc = buildConfiguration();
// Check whether we need to run autoreconf // Check whether we need to run autoreconf
const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure")); const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure"));
@@ -267,7 +262,7 @@ QString AutoreconfStepConfigWidget::summaryText() const
void AutoreconfStepConfigWidget::updateDetails() void AutoreconfStepConfigWidget::updateDetails()
{ {
AutotoolsBuildConfiguration *bc = m_autoreconfStep->autotoolsBuildConfiguration(); BuildConfiguration *bc = m_autoreconfStep->buildConfiguration();
ProcessParameters param; ProcessParameters param;
param.setMacroExpander(bc->macroExpander()); param.setMacroExpander(bc->macroExpander());

View File

@@ -42,7 +42,6 @@ namespace AutotoolsProjectManager {
namespace Internal { namespace Internal {
class AutotoolsProject; class AutotoolsProject;
class AutotoolsBuildConfiguration;
class AutoreconfStep; class AutoreconfStep;
//////////////////////////////// ////////////////////////////////
@@ -96,7 +95,6 @@ class AutoreconfStep : public ProjectExplorer::AbstractProcessStep
public: public:
AutoreconfStep(ProjectExplorer::BuildStepList *bsl); AutoreconfStep(ProjectExplorer::BuildStepList *bsl);
AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const;
bool init(); bool init();
void run(QFutureInterface<bool> &interface); void run(QFutureInterface<bool> &interface);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget();

View File

@@ -151,14 +151,9 @@ void ConfigureStep::ctor()
setDefaultDisplayName(tr("Configure")); setDefaultDisplayName(tr("Configure"));
} }
AutotoolsBuildConfiguration *ConfigureStep::autotoolsBuildConfiguration() const
{
return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration());
}
bool ConfigureStep::init() bool ConfigureStep::init()
{ {
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration(); BuildConfiguration *bc = buildConfiguration();
ProcessParameters *pp = processParameters(); ProcessParameters *pp = processParameters();
pp->setMacroExpander(bc->macroExpander()); pp->setMacroExpander(bc->macroExpander());
@@ -172,7 +167,7 @@ bool ConfigureStep::init()
void ConfigureStep::run(QFutureInterface<bool>& interface) void ConfigureStep::run(QFutureInterface<bool>& interface)
{ {
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration(); BuildConfiguration *bc = buildConfiguration();
//Check whether we need to run configure //Check whether we need to run configure
const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure")); const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure"));
@@ -271,7 +266,7 @@ QString ConfigureStepConfigWidget::summaryText() const
void ConfigureStepConfigWidget::updateDetails() void ConfigureStepConfigWidget::updateDetails()
{ {
AutotoolsBuildConfiguration *bc = m_configureStep->autotoolsBuildConfiguration(); BuildConfiguration *bc = m_configureStep->buildConfiguration();
ProcessParameters param; ProcessParameters param;
param.setMacroExpander(bc->macroExpander()); param.setMacroExpander(bc->macroExpander());

View File

@@ -42,7 +42,6 @@ namespace AutotoolsProjectManager {
namespace Internal { namespace Internal {
class AutotoolsProject; class AutotoolsProject;
class AutotoolsBuildConfiguration;
class ConfigureStepConfigWidget; class ConfigureStepConfigWidget;
////////////////////////////////// //////////////////////////////////
@@ -95,7 +94,6 @@ class ConfigureStep : public ProjectExplorer::AbstractProcessStep
public: public:
ConfigureStep(ProjectExplorer::BuildStepList *bsl); ConfigureStep(ProjectExplorer::BuildStepList *bsl);
AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const;
bool init(); bool init();
void run(QFutureInterface<bool> &interface); void run(QFutureInterface<bool> &interface);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget();

View File

@@ -154,11 +154,6 @@ void MakeStep::ctor()
setDefaultDisplayName(tr("Make")); setDefaultDisplayName(tr("Make"));
} }
AutotoolsBuildConfiguration *MakeStep::autotoolsBuildConfiguration() const
{
return static_cast<AutotoolsBuildConfiguration *>(buildConfiguration());
}
void MakeStep::setClean(bool clean) void MakeStep::setClean(bool clean)
{ {
m_clean = clean; m_clean = clean;
@@ -166,9 +161,9 @@ void MakeStep::setClean(bool clean)
bool MakeStep::init() bool MakeStep::init()
{ {
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration(); BuildConfiguration *bc = buildConfiguration();
if (!bc) if (!bc)
bc = static_cast<AutotoolsBuildConfiguration *>(target()->activeBuildConfiguration()); bc = target()->activeBuildConfiguration();
m_tasks.clear(); m_tasks.clear();
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit()); ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
@@ -310,7 +305,7 @@ QString MakeStepConfigWidget::summaryText() const
void MakeStepConfigWidget::updateDetails() void MakeStepConfigWidget::updateDetails()
{ {
AutotoolsBuildConfiguration *bc = m_makeStep->autotoolsBuildConfiguration(); BuildConfiguration *bc = m_makeStep->buildConfiguration();
ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(m_makeStep->target()->kit()); ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(m_makeStep->target()->kit());
if (tc) { if (tc) {

View File

@@ -43,7 +43,6 @@ namespace AutotoolsProjectManager {
namespace Internal { namespace Internal {
class AutotoolsProject; class AutotoolsProject;
class AutotoolsBuildConfiguration;
class MakeStep; class MakeStep;
/////////////////////////// ///////////////////////////
@@ -94,7 +93,6 @@ class MakeStep : public ProjectExplorer::AbstractProcessStep
public: public:
MakeStep(ProjectExplorer::BuildStepList *bsl); MakeStep(ProjectExplorer::BuildStepList *bsl);
AutotoolsBuildConfiguration *autotoolsBuildConfiguration() const;
bool init(); bool init();
void run(QFutureInterface<bool> &interface); void run(QFutureInterface<bool> &interface);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget();