diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp index 8e81265636a2775bc9f86dfcbdefa07bde0a4c72..fc8059044881f75681e711a1df7889f8bacf76ec 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.cpp +++ b/src/plugins/genericprojectmanager/genericmakestep.cpp @@ -96,16 +96,11 @@ GenericMakeStep::~GenericMakeStep() { } -GenericBuildConfiguration *GenericMakeStep::genericBuildConfiguration() const -{ - return static_cast<GenericBuildConfiguration *>(buildConfiguration()); -} - bool GenericMakeStep::init() { - GenericBuildConfiguration *bc = genericBuildConfiguration(); + BuildConfiguration *bc = buildConfiguration(); if (!bc) - bc = static_cast<GenericBuildConfiguration *>(target()->activeBuildConfiguration()); + bc = target()->activeBuildConfiguration(); m_tasks.clear(); ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit()); @@ -285,18 +280,18 @@ QString GenericMakeStepConfigWidget::displayName() const void GenericMakeStepConfigWidget::updateMakeOverrrideLabel() { - GenericBuildConfiguration *bc = m_makeStep->genericBuildConfiguration(); + BuildConfiguration *bc = m_makeStep->buildConfiguration(); if (!bc) - bc = static_cast<GenericBuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration()); + bc = m_makeStep->target()->activeBuildConfiguration(); m_ui->makeLabel->setText(tr("Override %1:").arg(m_makeStep->makeCommand(bc->environment()))); } void GenericMakeStepConfigWidget::updateDetails() { - GenericBuildConfiguration *bc = m_makeStep->genericBuildConfiguration(); + BuildConfiguration *bc = m_makeStep->buildConfiguration(); if (!bc) - bc = static_cast<GenericBuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration()); + bc = m_makeStep->target()->activeBuildConfiguration(); ProcessParameters param; param.setMacroExpander(bc->macroExpander()); diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h index 2d1113a2b407750b79aeffe02425e3d3ae14e1c4..54cd157399ebb9c9a5ce93489a27e703658138e6 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.h +++ b/src/plugins/genericprojectmanager/genericmakestep.h @@ -39,7 +39,6 @@ QT_END_NAMESPACE namespace GenericProjectManager { namespace Internal { -class GenericBuildConfiguration; class GenericMakeStepConfigWidget; class GenericMakeStepFactory; namespace Ui { class GenericMakeStep; } @@ -55,8 +54,6 @@ public: GenericMakeStep(ProjectExplorer::BuildStepList *parent); ~GenericMakeStep(); - GenericBuildConfiguration *genericBuildConfiguration() const; - bool init(); void run(QFutureInterface<bool> &fi);