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

OutputFormatter: De-virtualize the clear() function

Browse Source 
... and make it also clear the text edit.

Change-Id: Ifd073167b8afc27f3adafca1bdaf95316be7fdaa
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-03-18 09:53:07 +01:00
parent 438195ae83
commit f4473a6da8
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,6 +147,7 @@ void OutputFormatter::handleLink(const QString &href)
void OutputFormatter::clear() void OutputFormatter::clear()
{ {
d->prependCarriageReturn = false; d->prependCarriageReturn = false;
plainTextEdit()->clear();
} }
void OutputFormatter::setBoldFontEnabled(bool enabled) void OutputFormatter::setBoldFontEnabled(bool enabled)

2
src/libs/utils/outputformatter.h
View File

@@ -56,7 +56,7 @@ public:
void appendMessage(const QString &text, OutputFormat format); void appendMessage(const QString &text, OutputFormat format);
virtual void handleLink(const QString &href); virtual void handleLink(const QString &href);
virtual void clear(); void clear();
void setBoldFontEnabled(bool enabled); void setBoldFontEnabled(bool enabled);
static QTextCharFormat linkFormat(const QTextCharFormat &inputFormat, const QString &href); static QTextCharFormat linkFormat(const QTextCharFormat &inputFormat, const QString &href);

4
src/plugins/android/androidsdkmanagerwidget.cpp
View File

@@ -436,10 +436,8 @@ void AndroidSdkManagerWidget::cancelPendingOperations()
void AndroidSdkManagerWidget::switchView(AndroidSdkManagerWidget::View view) void AndroidSdkManagerWidget::switchView(AndroidSdkManagerWidget::View view)
{ {
if (m_currentView == PackageListing) { if (m_currentView == PackageListing)
m_formatter->clear(); m_formatter->clear();
m_ui->outputEdit->clear();
}
m_currentView = view; m_currentView = view;
if (m_currentView == PackageListing) if (m_currentView == PackageListing)
emit updatingSdkFinished(); emit updatingSdkFinished();

1
src/plugins/coreplugin/outputwindow.cpp
View File

@@ -445,7 +445,6 @@ QMimeData *OutputWindow::createMimeDataFromSelection() const
void OutputWindow::clear() void OutputWindow::clear()
{ {
QPlainTextEdit::clear();
d->formatter->clear(); d->formatter->clear();
} }