From 70bddbcab42759c3105db6801a918375449b848c Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 14 Apr 2020 12:18:50 +0200 Subject: Utils: Dissolve the AggregatingOutputFormatter class Inheritance is not the right design here (anymore), so we merge the derived class into the base for now. We will later re-split in a more sensible manner. Change-Id: I326e9f02287b3070f47147c771f3fa908d51b7fb Reviewed-by: hjk --- src/libs/utils/outputformatter.h | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'src/libs/utils/outputformatter.h') diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h index a08ecd6863..d38d573d79 100644 --- a/src/libs/utils/outputformatter.h +++ b/src/libs/utils/outputformatter.h @@ -43,11 +43,8 @@ class FormattedText; namespace Internal { class OutputFormatterPrivate; } -class QTCREATOR_UTILS_EXPORT AggregatingOutputFormatter; - class QTCREATOR_UTILS_EXPORT OutputFormatter : public QObject { - friend class AggregatingOutputFormatter; public: OutputFormatter(); ~OutputFormatter() override; @@ -55,6 +52,8 @@ public: QPlainTextEdit *plainTextEdit() const; void setPlainTextEdit(QPlainTextEdit *plainText); + void setFormatters(const QList &formatters); + void flush(); void appendMessage(const QString &text, OutputFormat format); @@ -109,20 +108,4 @@ private: Internal::OutputFormatterPrivate *d; }; -class QTCREATOR_UTILS_EXPORT AggregatingOutputFormatter : public OutputFormatter -{ -public: - AggregatingOutputFormatter(); - ~AggregatingOutputFormatter(); - - void setFormatters(const QList &formatters); - bool handleLink(const QString &href) override; - -private: - Result handleMessage(const QString &text, OutputFormat format) override; - - class Private; - Private * const d; -}; - } // namespace Utils -- cgit v1.2.3