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

IOutputParser: Replace std{Out,Err} with a single parameterized function

Browse Source 
Another step towards parser/formatter unification.

Task-number: QTCREATORBUG-22665
Change-Id: I6de86b3aee2c54585cdd4b06d21b0ea67300aeac
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-04-08 09:42:51 +02:00
parent ad1f79075d
commit 98fb412e6e
44 changed files with 253 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/cmakeparser.cpp
View File

@@ -57,10 +57,14 @@ void CMakeParser::setSourceDirectory(const QString &sourceDir)
m_sourceDirectory = QDir(sourceDir);
}
void CMakeParser::stdError(const QString &line)
void CMakeParser::handleLine(const QString &line, OutputFormat type)
{
QString trimmedLine = rightTrimmed(line);
if (type != StdErrFormat) {
IOutputParser::handleLine(line, type);
return;
}
QString trimmedLine = rightTrimmed(line);
switch (m_expectTripleLineErrorData) {
case NONE:
if (trimmedLine.isEmpty() && !m_lastTask.isNull()) {
@@ -110,7 +114,7 @@ void CMakeParser::stdError(const QString &line)
// Do not pass on lines starting with "-- " or "* ". Those are typical CMake output
return;
}
IOutputParser::stdError(line);
IOutputParser::handleLine(line, StdErrFormat);
return;
case LINE_LOCATION:
{