From 98fb412e6e735184927f6d23e392566576904633 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 8 Apr 2020 09:42:51 +0200 Subject: IOutputParser: Replace std{Out,Err} with a single parameterized function Another step towards parser/formatter unification. Task-number: QTCREATORBUG-22665 Change-Id: I6de86b3aee2c54585cdd4b06d21b0ea67300aeac Reviewed-by: hjk --- src/plugins/projectexplorer/osparser.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/plugins/projectexplorer/osparser.cpp') diff --git a/src/plugins/projectexplorer/osparser.cpp b/src/plugins/projectexplorer/osparser.cpp index 6fffa257a5..c543aac393 100644 --- a/src/plugins/projectexplorer/osparser.cpp +++ b/src/plugins/projectexplorer/osparser.cpp @@ -36,6 +36,14 @@ OsParser::OsParser() setObjectName(QLatin1String("OsParser")); } +void OsParser::handleLine(const QString &line, Utils::OutputFormat type) +{ + if (type == Utils::StdOutFormat) + stdOutput(line); + else + stdError(line); +} + void OsParser::stdError(const QString &line) { if (Utils::HostOsInfo::isLinuxHost()) { @@ -43,7 +51,7 @@ void OsParser::stdError(const QString &line) if (trimmed.contains(QLatin1String(": error while loading shared libraries:"))) emit addTask(CompileTask(Task::Error, trimmed)); } - IOutputParser::stdError(line); + IOutputParser::handleLine(line, Utils::StdErrFormat); } void OsParser::stdOutput(const QString &line) @@ -57,7 +65,7 @@ void OsParser::stdOutput(const QString &line) m_hasFatalError = true; } } - IOutputParser::stdOutput(line); + IOutputParser::handleLine(line, Utils::StdOutFormat); } bool OsParser::hasFatalErrors() const -- cgit v1.2.3