summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppmodelmanager.cpp
diff options
context:
space:
mode:
authorIvan Donchevskii <ivan.donchevskii@qt.io>2018-03-08 12:43:33 +0100
committerIvan Donchevskii <ivan.donchevskii@qt.io>2018-03-09 08:35:10 +0000
commit6010fd855d4eece76dfd932914c6f6f9b2344829 (patch)
treebc6c073663a89e1243049ce7b706f67ad477237a /src/plugins/cpptools/cppmodelmanager.cpp
parentf333a2998ced12c21727f9c6f1ba93324230acf7 (diff)
downloadqt-creator-6010fd855d4eece76dfd932914c6f6f9b2344829.tar.gz
CppTools: Remove resetFilters from CppModelManager
Without object pool resetting filters does nothing and therefore is not needed anymore. Change-Id: Id5439d11b0ee2564d7573b95c0c922d7fd7da59e Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
-rw-r--r--src/plugins/cpptools/cppmodelmanager.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index c02930769e..c28995c709 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -355,8 +355,7 @@ template<class FilterClass>
static void setFilter(std::unique_ptr<FilterClass> &filter,
std::unique_ptr<FilterClass> &&newFilter)
{
- if (!newFilter)
- return;
+ QTC_ASSERT(newFilter, return;);
filter = std::move(newFilter);
}
@@ -433,16 +432,6 @@ CppModelManager *CppModelManager::instance()
return m_instance;
}
-void CppModelManager::resetFilters()
-{
- setLocatorFilter();
- setClassesFilter();
- setIncludesFilter();
- setFunctionsFilter();
- setSymbolsFindFilter();
- setCurrentDocumentFilter();
-}
-
void CppModelManager::createCppModelManager(Internal::CppToolsPlugin *parent)
{
QTC_ASSERT(!m_instance, return;);
@@ -536,7 +525,6 @@ CppModelManager::CppModelManager()
CppModelManager::~CppModelManager()
{
delete d->m_internalIndexingSupport;
- resetFilters();
delete d;
}