From 1642a6b2f61839e7ad5c3a04a96fbf4330e1e45c Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 5 Jul 2024 09:49:02 +0200 Subject: [PATCH] Core: Remove StatusBarContext It was apparently not adding functionality. Change-Id: Ia6277a3df5ff65d4b797a5ca34909cf1dc4d48bc Reviewed-by: Eike Ziller --- src/plugins/coreplugin/statusbarmanager.cpp | 31 +-------------------- 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/src/plugins/coreplugin/statusbarmanager.cpp b/src/plugins/coreplugin/statusbarmanager.cpp index e85996b053a..9f6719f1f02 100644 --- a/src/plugins/coreplugin/statusbarmanager.cpp +++ b/src/plugins/coreplugin/statusbarmanager.cpp @@ -4,7 +4,6 @@ #include "statusbarmanager.h" #include "icore.h" -#include "imode.h" #include "minisplitter.h" #include "modemanager.h" @@ -27,17 +26,6 @@ static QPointer m_splitter; static QList> m_statusBarWidgets; static QList> m_contexts; -/* - Context that always returns the context of the active's mode widget (if available). -*/ -class StatusBarContext : public IContext -{ -public: - StatusBarContext(QObject *parent); - - Context context() const final; -}; - static QWidget *createWidget(QWidget *parent) { QWidget *w = new QWidget(parent); @@ -77,10 +65,6 @@ static void createStatusBarManager() bar->insertPermanentWidget(1, rightCornerWidget); m_statusBarWidgets.append(rightCornerWidget); - auto statusContext = new StatusBarContext(bar); - statusContext->setWidget(bar); - ICore::addContextObject(statusContext); - QObject::connect(ICore::instance(), &ICore::saveSettingsRequested, ICore::instance(), [] { QtcSettings *s = ICore::settings(); s->beginGroup(kSettingsGroup); @@ -88,8 +72,7 @@ static void createStatusBarManager() s->endGroup(); }); - QObject::connect(ICore::instance(), &ICore::coreAboutToClose, statusContext, [statusContext] { - delete statusContext; + QObject::connect(ICore::instance(), &ICore::coreAboutToClose, bar, [] { // This is the catch-all on rampdown. Individual items may // have been removed earlier by destroyStatusBarWidget(). for (const QPointer &context : std::as_const(m_contexts)) { @@ -149,16 +132,4 @@ void StatusBarManager::restoreSettings() m_splitter->setSizes(QList() << leftSplitWidth << (sum - leftSplitWidth)); } -StatusBarContext::StatusBarContext(QObject *parent) - : IContext(parent) -{ -} - -Context StatusBarContext::context() const -{ - if (IMode *currentMode = ModeManager::currentMode()) - return currentMode->context(); - return {}; -} - } // Core