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

6
src/plugins/designer/formeditorw.cpp
View File

@@ -211,7 +211,6 @@ public:
QMenu *m_previewInStyleMenu = nullptr;
QAction *m_actionAboutPlugins = nullptr;
DesignerContext *m_context = nullptr;
Context m_contexts;
QList<Id> m_toolActionIds;
@@ -275,8 +274,6 @@ FormEditorData::FormEditorData() :
FormEditorData::~FormEditorData()
{
if (m_context)
ICore::removeContextObject(m_context);
if (m_initStage == FormEditorW::FullyInitialized) {
QSettings *s = ICore::settings();
s->beginGroup(settingsGroupC);
@@ -423,8 +420,7 @@ void FormEditorData::fullInit()
Context designerContexts = m_contexts;
designerContexts.add(Core::Constants::C_EDITORMANAGER);
m_context = new DesignerContext(designerContexts, m_modeWidget, m_instance);
ICore::addContextObject(m_context);
ICore::addContextObject(new DesignerContext(designerContexts, m_modeWidget, m_instance));
DesignMode::registerDesignWidget(m_modeWidget, QStringList(FORM_MIMETYPE), m_contexts);