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

CppCurrentDocumentFilter: Get rid of the arg from c'tor

Browse Source 
It's always CppModelManager::instance().

Change-Id: Ia049ad3bd452f8773d679549c33981460c2705d4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2023-04-07 08:31:21 +02:00
parent 1cc7342ef1
commit 8f44964059
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cppcurrentdocumentfilter.cpp
View File

@@ -19,8 +19,8 @@ using namespace CPlusPlus;
namespace CppEditor::Internal { namespace CppEditor::Internal {
CppCurrentDocumentFilter::CppCurrentDocumentFilter(CppModelManager *manager) CppCurrentDocumentFilter::CppCurrentDocumentFilter()
: m_modelManager(manager) : m_modelManager(CppModelManager::instance())
{ {
setId(Constants::CURRENT_DOCUMENT_FILTER_ID); setId(Constants::CURRENT_DOCUMENT_FILTER_ID);
setDisplayName(Tr::tr(Constants::CURRENT_DOCUMENT_FILTER_DISPLAY_NAME)); setDisplayName(Tr::tr(Constants::CURRENT_DOCUMENT_FILTER_DISPLAY_NAME));
@@ -34,7 +34,7 @@ CppCurrentDocumentFilter::CppCurrentDocumentFilter(CppModelManager *manager)
SymbolSearcher::Functions | SymbolSearcher::Functions |
SymbolSearcher::Classes); SymbolSearcher::Classes);
connect(manager, &CppModelManager::documentUpdated, connect(m_modelManager, &CppModelManager::documentUpdated,
this, &CppCurrentDocumentFilter::onDocumentUpdated); this, &CppCurrentDocumentFilter::onDocumentUpdated);
connect(EditorManager::instance(), &EditorManager::currentEditorChanged, connect(EditorManager::instance(), &EditorManager::currentEditorChanged,
this, &CppCurrentDocumentFilter::onCurrentEditorChanged); this, &CppCurrentDocumentFilter::onCurrentEditorChanged);

2
src/plugins/cppeditor/cppcurrentdocumentfilter.h
View File

@@ -20,7 +20,7 @@ class CppCurrentDocumentFilter : public Core::ILocatorFilter
Q_OBJECT Q_OBJECT
public: public:
explicit CppCurrentDocumentFilter(CppModelManager *manager); explicit CppCurrentDocumentFilter();
~CppCurrentDocumentFilter() override = default; ~CppCurrentDocumentFilter() override = default;
void makeAuxiliary(); void makeAuxiliary();

5
src/plugins/cppeditor/cppmodelmanager.cpp
View File

@@ -902,8 +902,7 @@ void CppModelManager::initCppTools()
setIncludesFilter(std::make_unique<CppIncludesFilter>()); setIncludesFilter(std::make_unique<CppIncludesFilter>());
setFunctionsFilter(std::make_unique<CppFunctionsFilter>()); setFunctionsFilter(std::make_unique<CppFunctionsFilter>());
setSymbolsFindFilter(std::make_unique<SymbolsFindFilter>(this)); setSymbolsFindFilter(std::make_unique<SymbolsFindFilter>(this));
setCurrentDocumentFilter( setCurrentDocumentFilter(std::make_unique<CppCurrentDocumentFilter>());
std::make_unique<Internal::CppCurrentDocumentFilter>(this));
// Setup matchers // Setup matchers
LocatorMatcher::addLocatorMatcherCreator([] { return QList{CppEditor::cppLocatorMatcher()}; }); LocatorMatcher::addLocatorMatcherCreator([] { return QList{CppEditor::cppLocatorMatcher()}; });
LocatorMatcher::addClassMatcherCreator([] { return QList{CppEditor::cppClassMatcher()}; }); LocatorMatcher::addClassMatcherCreator([] { return QList{CppEditor::cppClassMatcher()}; });
@@ -2021,7 +2020,7 @@ void CppModelManager::switchDeclDef(const CursorInEditor &data,
ILocatorFilter *CppModelManager::createAuxiliaryCurrentDocumentFilter() ILocatorFilter *CppModelManager::createAuxiliaryCurrentDocumentFilter()
{ {
const auto filter = new Internal::CppCurrentDocumentFilter(instance()); const auto filter = new Internal::CppCurrentDocumentFilter;
filter->makeAuxiliary(); filter->makeAuxiliary();
return filter; return filter;
} }