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

OutputFormatter: Simplify logic

Browse Source 
Change-Id: I092cdb351f7530284e915cd4955973b21f2577b5
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-03-17 10:59:33 +01:00
parent 0fe2b961b9
commit 80293aac93
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/outputformatter.cpp
View File

@@ -204,12 +204,12 @@ void OutputFormatter::appendMessage(const QString &text, OutputFormat format)
out.chop(1); out.chop(1);
} }
if (format == ErrorMessageFormat || format == NormalMessageFormat) { if (format != StdOutFormatSameLine && format != StdErrFormatSameLine) {
doAppendMessage(doNewlineEnforcement(out), format); doAppendMessage(doNewlineEnforcement(out), format);
} else { return;
const bool sameLine = format == StdOutFormatSameLine || format == StdErrFormatSameLine; }
if (sameLine) {
bool enforceNewline = d->enforceNewline; const bool enforceNewline = d->enforceNewline;
d->enforceNewline = false; d->enforceNewline = false;
if (enforceNewline) { if (enforceNewline) {
out.prepend('\n'); out.prepend('\n');
@@ -231,10 +231,6 @@ void OutputFormatter::appendMessage(const QString &text, OutputFormat format)
} }
doAppendMessage(out, format); doAppendMessage(out, format);
} }
} else {
doAppendMessage(doNewlineEnforcement(out), format);
}
}
} }
QString OutputFormatter::doNewlineEnforcement(const QString &out) QString OutputFormatter::doNewlineEnforcement(const QString &out)