OutputFormatter: Do the newline handling centrally

All output formatters are line-based, and they all did their own line
splitting and, if they didn't entirely ignore it, handling of partial
lines.
Instead, we now do all the book-keeping in the base class, and the
subclasses always work with complete lines.

Change-Id: I0b0df7951d0e4f6601f4d912230071784c87b3d3
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 10 insertions, 2 deletions

diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h
index 626e073e50..a5d9c4b331 100644
--- a/src/libs/utils/outputformatter.h
+++ b/src/libs/utils/outputformatter.h
@@ -61,16 +61,24 @@ public:
     static QTextCharFormat linkFormat(const QTextCharFormat &inputFormat, const QString &href);
 
 protected:
+    // text contains at most one line feed character, and if it does occur, it's the last character.
+    // Either way, the input is to be considered "complete" for formatting purposes.
+    virtual void doAppendMessage(const QString &text, OutputFormat format);
+
     virtual void clearLastLine();
+
     QTextCharFormat charFormat(OutputFormat format) const;
     QList<FormattedText> parseAnsi(const QString &text, const QTextCharFormat &format);
-    virtual void doAppendMessage(const QString &text, OutputFormat format);
     QTextCursor &cursor() const;
 
 private:
-    virtual void doAppendMessage(const QString &text, const QTextCharFormat &format);
+    void doAppendMessage(const QString &text, const QTextCharFormat &format);
+    virtual void reset() {}
+
     void append(const QString &text, const QTextCharFormat &format);
     void initFormats();
+    void flushIncompleteLine();
+    void dumpIncompleteLine(const QString &line, OutputFormat format);
 
     Internal::OutputFormatterPrivate *d;
 };