aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/coreplugin/outputwindow.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/coreplugin/outputwindow.h')
-rw-r--r--src/plugins/coreplugin/outputwindow.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/plugins/coreplugin/outputwindow.h b/src/plugins/coreplugin/outputwindow.h
index 509ae6dfab..c29d1a5a07 100644
--- a/src/plugins/coreplugin/outputwindow.h
+++ b/src/plugins/coreplugin/outputwindow.h
@@ -30,11 +30,12 @@
#include <utils/outputformat.h>
-#include <QElapsedTimer>
#include <QPlainTextEdit>
-#include <QTimer>
-namespace Utils { class OutputFormatter; }
+namespace Utils {
+class OutputFormatter;
+class OutputLineParser;
+}
namespace Core {
@@ -56,15 +57,15 @@ public:
OutputWindow(Context context, const QString &settingsKey, QWidget *parent = nullptr);
~OutputWindow() override;
- Utils::OutputFormatter *formatter() const;
- void setFormatter(Utils::OutputFormatter *formatter);
+ void setLineParsers(const QList<Utils::OutputLineParser *> &parsers);
+ Utils::OutputFormatter *outputFormatter() const;
void appendMessage(const QString &out, Utils::OutputFormat format);
- /// appends a \p text using \p format without using formater
- void appendText(const QString &text, const QTextCharFormat &format = QTextCharFormat());
void grayOutOldContent();
void clear();
+ void flush();
+ void reset();
void scrollToBottom();
@@ -91,6 +92,7 @@ public slots:
protected:
bool isScrollbarAtBottom() const;
+ virtual void handleLink(const QPoint &pos);
private:
QMimeData *createMimeDataFromSelection() const override;
@@ -103,11 +105,10 @@ private:
void wheelEvent(QWheelEvent *e) override;
using QPlainTextEdit::setFont; // call setBaseFont instead, which respects the zoom factor
- QTimer m_scrollTimer;
- QElapsedTimer m_lastMessage;
void enableUndoRedo();
- QString doNewlineEnforcement(const QString &out);
void filterNewContent();
+ void handleNextOutputChunk();
+ void handleOutputChunk(const QString &output, Utils::OutputFormat format);
Internal::OutputWindowPrivate *d = nullptr;
};