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

Core: Move MenuBarFilter closer to its peers

Browse Source 
Change-Id: I9d7eac297a06fae39ef7ee19841547e8b5bea45a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2018-01-26 15:52:02 +01:00
parent 8a8426d7ba
commit e783f883ea
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/coreplugin/coreplugin.cpp
View File

@@ -31,7 +31,6 @@
#include "infobar.h" #include "infobar.h"
#include "iwizardfactory.h" #include "iwizardfactory.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "menubarfilter.h"
#include "modemanager.h" #include "modemanager.h"
#include "reaper_p.h" #include "reaper_p.h"
#include "themechooser.h" #include "themechooser.h"
@@ -152,8 +151,6 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
InfoBar::initialize(ICore::settings(), creatorTheme()); InfoBar::initialize(ICore::settings(), creatorTheme());
} }
addAutoReleasedObject(new MenuBarFilter);
IWizardFactory::initialize(); IWizardFactory::initialize();
// Make sure we respect the process's umask when creating new files // Make sure we respect the process's umask when creating new files

2
src/plugins/coreplugin/locator/locator.cpp
View File

@@ -35,6 +35,7 @@
#include "locatormanager.h" #include "locatormanager.h"
#include "locatorsettingspage.h" #include "locatorsettingspage.h"
#include "locatorwidget.h" #include "locatorwidget.h"
#include "menubarfilter.h"
#include "opendocumentsfilter.h" #include "opendocumentsfilter.h"
#include <coreplugin/coreplugin.h> #include <coreplugin/coreplugin.h>
@@ -80,6 +81,7 @@ public:
ExecuteFilter m_executeFilter; ExecuteFilter m_executeFilter;
ExternalToolsFilter m_externalToolsFilter; ExternalToolsFilter m_externalToolsFilter;
LocatorFiltersFilter m_locatorsFiltersFilter; LocatorFiltersFilter m_locatorsFiltersFilter;
MenuBarFilter m_menubarFilter;
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
SpotlightLocatorFilter m_spotlightLocatorFilter; SpotlightLocatorFilter m_spotlightLocatorFilter;
#endif #endif