From 84e24dee8214eb88c883cc8fc507c99a5e04b5cc Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Fri, 15 Feb 2013 13:09:36 +0100
Subject: [PATCH] Kit: Simplify code a bit
Change-Id: I5b092dacd6ebcbd3bf914829f2810c4b1d38c351
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/projectexplorer/ioutputparser.cpp | 3 ++-
src/plugins/projectexplorer/kit.cpp | 7 ++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/plugins/projectexplorer/ioutputparser.cpp b/src/plugins/projectexplorer/ioutputparser.cpp
index 9d3f4403b9f..c313da831aa 100644
--- a/src/plugins/projectexplorer/ioutputparser.cpp
+++ b/src/plugins/projectexplorer/ioutputparser.cpp
@@ -123,7 +123,8 @@ IOutputParser::~IOutputParser()
void IOutputParser::appendOutputParser(IOutputParser *parser)
{
- QTC_ASSERT(parser, return);
+ if (!parser)
+ return;
if (m_parser) {
m_parser->appendOutputParser(parser);
return;
diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp
index 0ab29c274ff..3b6b99983db 100644
--- a/src/plugins/projectexplorer/kit.cpp
+++ b/src/plugins/projectexplorer/kit.cpp
@@ -398,17 +398,14 @@ void Kit::addToEnvironment(Utils::Environment &env) const
IOutputParser *Kit::createOutputParser() const
{
- IOutputParser *last = 0;
IOutputParser *first = 0;
QList<KitInformation *> infoList = KitManager::instance()->kitInformation();
foreach (KitInformation *ki, infoList) {
IOutputParser *next = ki->createOutputParser(this);
if (!first)
first = next;
- if (last && next)
- last->appendOutputParser(next);
- if (next)
- last = next;
+ else
+ first->appendOutputParser(next);
}
return first;
}
--
GitLab