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

CppTools: Remove resetFilters from CppModelManager

Browse Source 
Without object pool resetting filters does nothing
and therefore is not needed anymore.

Change-Id: Id5439d11b0ee2564d7573b95c0c922d7fd7da59e
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-03-08 12:43:33 +01:00
parent f333a2998c
commit 6010fd855d
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

13
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -214,12 +214,12 @@ public:
RefactoringEngineInterface *refactoringEngine);
static void removeRefactoringEngine(RefactoringEngineType type);
void setLocatorFilter(std::unique_ptr<Core::ILocatorFilter> &&filter = nullptr);
void setClassesFilter(std::unique_ptr<Core::ILocatorFilter> &&filter = nullptr);
void setIncludesFilter(std::unique_ptr<Core::ILocatorFilter> &&filter = nullptr);
void setFunctionsFilter(std::unique_ptr<Core::ILocatorFilter> &&filter = nullptr);
void setSymbolsFindFilter(std::unique_ptr<Core::IFindFilter> &&filter = nullptr);
void setCurrentDocumentFilter(std::unique_ptr<Core::ILocatorFilter> &&filter = nullptr);
void setLocatorFilter(std::unique_ptr<Core::ILocatorFilter> &&filter);
void setClassesFilter(std::unique_ptr<Core::ILocatorFilter> &&filter);
void setIncludesFilter(std::unique_ptr<Core::ILocatorFilter> &&filter);
void setFunctionsFilter(std::unique_ptr<Core::ILocatorFilter> &&filter);
void setSymbolsFindFilter(std::unique_ptr<Core::IFindFilter> &&filter);
void setCurrentDocumentFilter(std::unique_ptr<Core::ILocatorFilter> &&filter);
void renameIncludes(const QString &oldFileName, const QString &newFileName);
@@ -274,7 +274,6 @@ private:
void dumpModelManagerConfiguration(const QString &logFileId);
void initCppTools();
void resetFilters();
private:
Internal::CppModelManagerPrivate *d;