From 3ec173bfdd18ad738fba4f235d965979be16f7d2 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 9 Dec 2010 10:41:13 +0100
Subject: [PATCH] Qt4: Simplify makestep
* Remove unnecessary member variable.
---
src/plugins/qt4projectmanager/makestep.cpp | 13 +++++++------
src/plugins/qt4projectmanager/makestep.h | 1 -
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index dbdbe033f7f..03bfb06cb88 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -180,14 +180,15 @@ bool MakeStep::init()
setEnabled(true);
pp->setArguments(args);
- m_makeParser = bc->qtVersion()->createOutputParser();
- m_makeParser->appendOutputParser(new QtParser);
+ ProjectExplorer::IOutputParser *parser = bc->qtVersion()->createOutputParser();
+ Q_ASSERT(parser);
+ parser->appendOutputParser(new QtParser);
if (toolchain)
- m_makeParser->appendOutputParser(toolchain->outputParser());
+ parser->appendOutputParser(toolchain->outputParser());
- m_makeParser->setWorkingDirectory(workingDirectory);
+ parser->setWorkingDirectory(workingDirectory);
- setOutputParser(m_makeParser);
+ setOutputParser(parser);
return AbstractProcessStep::init();
}
@@ -205,7 +206,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
bool MakeStep::processSucceeded(int exitCode, QProcess::ExitStatus status)
{
// Symbian does retun 0, even on failed makes! So we check for fatal make errors here.
- if (m_makeParser && m_makeParser->hasFatalErrors())
+ if (outputParser() && outputParser()->hasFatalErrors())
return false;
return AbstractProcessStep::processSucceeded(exitCode, status);
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index a0ed6a0ac71..1170ae2b31e 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -111,7 +111,6 @@ private:
bool m_clean;
QString m_userArgs;
QString m_makeCmd;
- ProjectExplorer::IOutputParser *m_makeParser;
};
class MakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
--
GitLab