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

Core: Remove a few explicit uses of the global plugin pool

Browse Source 
Change-Id: I8627af8fa132b727450ee703910a39485eea58ad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2018-01-31 10:45:07 +01:00
parent d01b474b46
commit 7fea244019
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -237,12 +237,6 @@ MainWindow::~MainWindow()
delete m_windowSupport; delete m_windowSupport;
m_windowSupport = nullptr; m_windowSupport = nullptr;
PluginManager::removeObject(m_shortcutSettings);
PluginManager::removeObject(m_generalSettings);
PluginManager::removeObject(m_systemSettings);
PluginManager::removeObject(m_toolSettings);
PluginManager::removeObject(m_mimeTypeSettings);
PluginManager::removeObject(m_systemEditor);
delete m_externalToolManager; delete m_externalToolManager;
m_externalToolManager = nullptr; m_externalToolManager = nullptr;
delete m_messageManager; delete m_messageManager;
@@ -279,7 +273,6 @@ MainWindow::~MainWindow()
delete m_progressManager; delete m_progressManager;
m_progressManager = nullptr; m_progressManager = nullptr;
PluginManager::removeObject(m_coreImpl);
delete m_coreImpl; delete m_coreImpl;
m_coreImpl = nullptr; m_coreImpl = nullptr;
@@ -299,16 +292,7 @@ bool MainWindow::init(QString *errorMessage)
{ {
Q_UNUSED(errorMessage) Q_UNUSED(errorMessage)
PluginManager::addObject(m_coreImpl);
m_progressManager->init(); // needs the status bar manager m_progressManager->init(); // needs the status bar manager
PluginManager::addObject(m_generalSettings);
PluginManager::addObject(m_systemSettings);
PluginManager::addObject(m_shortcutSettings);
PluginManager::addObject(m_toolSettings);
PluginManager::addObject(m_mimeTypeSettings);
PluginManager::addObject(m_systemEditor);
MessageManager::init(); MessageManager::init();
return true; return true;
} }