diff options
author | hjk <hjk@qt.io> | 2018-03-02 12:25:04 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-03-08 11:43:43 +0000 |
commit | efbcf6308b4a6fd1653f20ba1f20585908a4c86c (patch) | |
tree | 69bad4a914b1166565f059c4e3c0905cc21f1f49 /src/plugins/cpptools/cppmodelmanager.cpp | |
parent | 554adb7fac171a87446e5580bc17bd4902bd3c23 (diff) | |
download | qt-creator-efbcf6308b4a6fd1653f20ba1f20585908a4c86c.tar.gz |
CppTools: Do not add LocatorFilters to global object pool
Not needed anymore, they are more directly accessible nowadays.
Change-Id: Ibe16ab1281a16b05e02fb20c0722d87196d99365
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
-rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index ed9042b001..c02930769e 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -61,7 +61,6 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectmacro.h> #include <projectexplorer/session.h> -#include <extensionsystem/pluginmanager.h> #include <utils/fileutils.h> #include <utils/qtcassert.h> @@ -356,14 +355,9 @@ template<class FilterClass> static void setFilter(std::unique_ptr<FilterClass> &filter, std::unique_ptr<FilterClass> &&newFilter) { - if (!ExtensionSystem::PluginManager::instance()) - return; - if (filter) - ExtensionSystem::PluginManager::removeObject(filter.get()); if (!newFilter) return; filter = std::move(newFilter); - ExtensionSystem::PluginManager::addObject(filter.get()); } void CppModelManager::setLocatorFilter(std::unique_ptr<Core::ILocatorFilter> &&filter) @@ -473,9 +467,6 @@ void CppModelManager::initCppTools() connect(this, &CppModelManager::aboutToRemoveFiles, &d->m_locatorData, &CppLocatorData::onAboutToRemoveFiles); - ExtensionSystem::PluginManager *pluginManager = ExtensionSystem::PluginManager::instance(); - QTC_ASSERT(pluginManager, return;); - // Set up builtin filters setLocatorFilter(std::make_unique<CppLocatorFilter>(&d->m_locatorData)); setClassesFilter(std::make_unique<CppClassesFilter>(&d->m_locatorData)); |