diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-03-18 09:53:07 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-03-18 13:54:31 +0000 |
| commit | f4473a6da8f4e77393ad05b8b8959dfd4655ba70 (patch) | |
| tree | 0192fb0b459ef692b095833531f15286ea53b35a | |
| parent | 438195ae8344054f3ba3c32cb4e702d080381913 (diff) | |
OutputFormatter: De-virtualize the clear() function
... and make it also clear the text edit.
Change-Id: Ifd073167b8afc27f3adafca1bdaf95316be7fdaa
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/libs/utils/outputformatter.cpp | 1 | ||||
| -rw-r--r-- | src/libs/utils/outputformatter.h | 2 | ||||
| -rw-r--r-- | src/plugins/android/androidsdkmanagerwidget.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/coreplugin/outputwindow.cpp | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index a22a7a19dc..9c3cee4879 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/src/libs/utils/outputformatter.cpp @@ -147,6 +147,7 @@ void OutputFormatter::handleLink(const QString &href) void OutputFormatter::clear() { d->prependCarriageReturn = false; + plainTextEdit()->clear(); } void OutputFormatter::setBoldFontEnabled(bool enabled) diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h index 747084d0d9..e20316b411 100644 --- a/src/libs/utils/outputformatter.h +++ b/src/libs/utils/outputformatter.h @@ -56,7 +56,7 @@ public: void appendMessage(const QString &text, OutputFormat format); virtual void handleLink(const QString &href); - virtual void clear(); + void clear(); void setBoldFontEnabled(bool enabled); static QTextCharFormat linkFormat(const QTextCharFormat &inputFormat, const QString &href); diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp index a56707d297..8595957931 100644 --- a/src/plugins/android/androidsdkmanagerwidget.cpp +++ b/src/plugins/android/androidsdkmanagerwidget.cpp @@ -436,10 +436,8 @@ void AndroidSdkManagerWidget::cancelPendingOperations() void AndroidSdkManagerWidget::switchView(AndroidSdkManagerWidget::View view) { - if (m_currentView == PackageListing) { + if (m_currentView == PackageListing) m_formatter->clear(); - m_ui->outputEdit->clear(); - } m_currentView = view; if (m_currentView == PackageListing) emit updatingSdkFinished(); diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp index eb605b51f8..fc61bcc750 100644 --- a/src/plugins/coreplugin/outputwindow.cpp +++ b/src/plugins/coreplugin/outputwindow.cpp @@ -445,7 +445,6 @@ QMimeData *OutputWindow::createMimeDataFromSelection() const void OutputWindow::clear() { - QPlainTextEdit::clear(); d->formatter->clear(); } |