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

Core: Remove StatusBarContext

Browse Source 
It was apparently not adding functionality.

Change-Id: Ia6277a3df5ff65d4b797a5ca34909cf1dc4d48bc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2024-07-05 09:49:02 +02:00
parent f6ed7edd0a
commit 1642a6b2f6
1 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/coreplugin/statusbarmanager.cpp
View File

@@ -4,7 +4,6 @@
#include "statusbarmanager.h" #include "statusbarmanager.h"
#include "icore.h" #include "icore.h"
#include "imode.h"
#include "minisplitter.h" #include "minisplitter.h"
#include "modemanager.h" #include "modemanager.h"
@@ -27,17 +26,6 @@ static QPointer<QSplitter> m_splitter;
static QList<QPointer<QWidget>> m_statusBarWidgets; static QList<QPointer<QWidget>> m_statusBarWidgets;
static QList<QPointer<IContext>> m_contexts; static QList<QPointer<IContext>> 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) static QWidget *createWidget(QWidget *parent)
{ {
QWidget *w = new QWidget(parent); QWidget *w = new QWidget(parent);
@@ -77,10 +65,6 @@ static void createStatusBarManager()
bar->insertPermanentWidget(1, rightCornerWidget); bar->insertPermanentWidget(1, rightCornerWidget);
m_statusBarWidgets.append(rightCornerWidget); m_statusBarWidgets.append(rightCornerWidget);
auto statusContext = new StatusBarContext(bar);
statusContext->setWidget(bar);
ICore::addContextObject(statusContext);
QObject::connect(ICore::instance(), &ICore::saveSettingsRequested, ICore::instance(), [] { QObject::connect(ICore::instance(), &ICore::saveSettingsRequested, ICore::instance(), [] {
QtcSettings *s = ICore::settings(); QtcSettings *s = ICore::settings();
s->beginGroup(kSettingsGroup); s->beginGroup(kSettingsGroup);
@@ -88,8 +72,7 @@ static void createStatusBarManager()
s->endGroup(); s->endGroup();
}); });
QObject::connect(ICore::instance(), &ICore::coreAboutToClose, statusContext, [statusContext] { QObject::connect(ICore::instance(), &ICore::coreAboutToClose, bar, [] {
delete statusContext;
// This is the catch-all on rampdown. Individual items may // This is the catch-all on rampdown. Individual items may
// have been removed earlier by destroyStatusBarWidget(). // have been removed earlier by destroyStatusBarWidget().
for (const QPointer<IContext> &context : std::as_const(m_contexts)) { for (const QPointer<IContext> &context : std::as_const(m_contexts)) {
@@ -149,16 +132,4 @@ void StatusBarManager::restoreSettings()
m_splitter->setSizes(QList<int>() << leftSplitWidth << (sum - leftSplitWidth)); m_splitter->setSizes(QList<int>() << leftSplitWidth << (sum - leftSplitWidth));
} }
StatusBarContext::StatusBarContext(QObject *parent)
: IContext(parent)
{
}
Context StatusBarContext::context() const
{
if (IMode *currentMode = ModeManager::currentMode())
return currentMode->context();
return {};
}
} // Core } // Core