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

CppTools: Do not add LocatorFilters to global object pool

Browse Source 
Not needed anymore, they are more directly accessible nowadays.

Change-Id: Ibe16ab1281a16b05e02fb20c0722d87196d99365
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
hjk
2018-03-02 12:25:04 +01:00
parent 554adb7fac
commit efbcf6308b
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -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));