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

Remove unnecessary removeContextObject calls

Browse Source 
They are removed on deletion now.

Change-Id: I08461ea4938e24ab450df013a0f8f820032381da
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-05-26 14:48:38 +02:00
parent 7b5481f75c
commit e5bb7d1ffe
24 changed files with 46 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,9 +98,9 @@ static void createStatusBarManager()
bar->insertPermanentWidget(1, rightCornerWidget);
m_statusBarWidgets.append(rightCornerWidget);
auto context = new StatusBarContext(bar);
context->setWidget(bar);
ICore::addContextObject(context);
auto statusContext = new StatusBarContext(bar);
statusContext->setWidget(bar);
ICore::addContextObject(statusContext);
QObject::connect(ICore::instance(), &ICore::saveSettingsRequested, [] {
QSettings *s = ICore::settings();
@@ -109,7 +109,8 @@ static void createStatusBarManager()
s->endGroup();
});
QObject::connect(ICore::instance(), &ICore::coreAboutToClose, [] {
QObject::connect(ICore::instance(), &ICore::coreAboutToClose, [statusContext] {
delete statusContext;
// This is the catch-all on rampdown. Individual items may
// have been removed earlier by destroyStatusBarWidget().
for (const QPointer<IContext> &context : m_contexts) {
@@ -144,8 +145,8 @@ void StatusBarManager::destroyStatusBarWidget(QWidget *widget)
QTC_ASSERT(widget, return);
for (const QPointer<IContext> &context : m_contexts) {
if (context->widget() == widget) {
ICore::removeContextObject(context);
m_contexts.removeAll(context);
delete context;
break;
}
}