From 438195ae8344054f3ba3c32cb4e702d080381913 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 18 Mar 2020 09:50:26 +0100 Subject: OutputFormatter: Remove unneeded function and include statement Change-Id: I7372a340660e0e927c3e8e83dd438d5fa32304eb Reviewed-by: hjk --- src/libs/utils/outputformatter.h | 2 -- src/plugins/projectexplorer/appoutputpane.cpp | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h index 9c9302c4df3..747084d0d9e 100644 --- a/src/libs/utils/outputformatter.h +++ b/src/libs/utils/outputformatter.h @@ -29,7 +29,6 @@ #include "outputformat.h" #include -#include QT_BEGIN_NAMESPACE class QPlainTextEdit; @@ -57,7 +56,6 @@ public: void appendMessage(const QString &text, OutputFormat format); virtual void handleLink(const QString &href); - virtual QList toolbarWidgets() const { return {}; } virtual void clear(); void setBoldFontEnabled(bool enabled); static QTextCharFormat linkFormat(const QTextCharFormat &inputFormat, const QString &href); diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 4cc128cc0c2..f9a3dfae6cf 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -83,15 +83,6 @@ static QString msgAttachDebuggerTooltip(const QString &handleDescription = QStri AppOutputPane::tr("Attach debugger to %1").arg(handleDescription); } -static void replaceAllChildWidgets(QLayout *layout, const QList &newChildren) -{ - while (QLayoutItem *child = layout->takeAt(0)) - delete child; - - for (QWidget *widget : newChildren) - layout->addWidget(widget); -} - namespace { const char SETTINGS_KEY[] = "ProjectExplorer/AppOutput/Zoom"; const char C_APP_OUTPUT[] = "ProjectExplorer.ApplicationOutput"; @@ -702,10 +693,6 @@ void AppOutputPane::enableButtons(const RunControl *rc) m_attachButton->setToolTip(msgAttachDebuggerTooltip()); } setZoomButtonsEnabled(true); - - replaceAllChildWidgets(m_formatterWidget->layout(), rc->outputFormatter() ? - rc->outputFormatter()->toolbarWidgets() : - QList()); } else { m_reRunButton->setEnabled(false); m_reRunButton->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR.icon()); -- cgit v1.2.3