feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GenericMakeStep: Remove genericBuildConfiguration()

Browse Source 
None of the callers needed anything beyond BuildConfiguration

Change-Id: I4d8a9c6deb433b2003727fead9de5defa83cf3e9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2012-11-01 18:23:02 +01:00
parent cfadfd6f3f
commit e1ed7ec151
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/genericprojectmanager/genericmakestep.cpp
View File

@@ -96,16 +96,11 @@ GenericMakeStep::~GenericMakeStep()
{ {
} }
GenericBuildConfiguration *GenericMakeStep::genericBuildConfiguration() const
{
return static_cast<GenericBuildConfiguration *>(buildConfiguration());
}
bool GenericMakeStep::init() bool GenericMakeStep::init()
{ {
GenericBuildConfiguration *bc = genericBuildConfiguration(); BuildConfiguration *bc = buildConfiguration();
if (!bc) if (!bc)
bc = static_cast<GenericBuildConfiguration *>(target()->activeBuildConfiguration()); bc = target()->activeBuildConfiguration();
m_tasks.clear(); m_tasks.clear();
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit()); ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
@@ -285,18 +280,18 @@ QString GenericMakeStepConfigWidget::displayName() const
void GenericMakeStepConfigWidget::updateMakeOverrrideLabel() void GenericMakeStepConfigWidget::updateMakeOverrrideLabel()
{ {
GenericBuildConfiguration *bc = m_makeStep->genericBuildConfiguration(); BuildConfiguration *bc = m_makeStep->buildConfiguration();
if (!bc) 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()))); m_ui->makeLabel->setText(tr("Override %1:").arg(m_makeStep->makeCommand(bc->environment())));
} }
void GenericMakeStepConfigWidget::updateDetails() void GenericMakeStepConfigWidget::updateDetails()
{ {
GenericBuildConfiguration *bc = m_makeStep->genericBuildConfiguration(); BuildConfiguration *bc = m_makeStep->buildConfiguration();
if (!bc) if (!bc)
bc = static_cast<GenericBuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration()); bc = m_makeStep->target()->activeBuildConfiguration();
ProcessParameters param; ProcessParameters param;
param.setMacroExpander(bc->macroExpander()); param.setMacroExpander(bc->macroExpander());

3
src/plugins/genericprojectmanager/genericmakestep.h
View File

@@ -39,7 +39,6 @@ QT_END_NAMESPACE
namespace GenericProjectManager { namespace GenericProjectManager {
namespace Internal { namespace Internal {
class GenericBuildConfiguration;
class GenericMakeStepConfigWidget; class GenericMakeStepConfigWidget;
class GenericMakeStepFactory; class GenericMakeStepFactory;
namespace Ui { class GenericMakeStep; } namespace Ui { class GenericMakeStep; }
@@ -55,8 +54,6 @@ public:
GenericMakeStep(ProjectExplorer::BuildStepList *parent); GenericMakeStep(ProjectExplorer::BuildStepList *parent);
~GenericMakeStep(); ~GenericMakeStep();
GenericBuildConfiguration *genericBuildConfiguration() const;
bool init(); bool init();
void run(QFutureInterface<bool> &fi); void run(QFutureInterface<bool> &fi);