From 8f449640593c21717572c4fcd382e169492fbfe2 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 7 Apr 2023 08:31:21 +0200
Subject: [PATCH] CppCurrentDocumentFilter: Get rid of the arg from c'tor

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>
---
 src/plugins/cppeditor/cppcurrentdocumentfilter.cpp | 6 +++---
 src/plugins/cppeditor/cppcurrentdocumentfilter.h   | 2 +-
 src/plugins/cppeditor/cppmodelmanager.cpp          | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/plugins/cppeditor/cppcurrentdocumentfilter.cpp b/src/plugins/cppeditor/cppcurrentdocumentfilter.cpp
index e148525b3b3..6777ca1c11d 100644
--- a/src/plugins/cppeditor/cppcurrentdocumentfilter.cpp
+++ b/src/plugins/cppeditor/cppcurrentdocumentfilter.cpp
@@ -19,8 +19,8 @@ using namespace CPlusPlus;
 
 namespace CppEditor::Internal {
 
-CppCurrentDocumentFilter::CppCurrentDocumentFilter(CppModelManager *manager)
-    : m_modelManager(manager)
+CppCurrentDocumentFilter::CppCurrentDocumentFilter()
+    : m_modelManager(CppModelManager::instance())
 {
     setId(Constants::CURRENT_DOCUMENT_FILTER_ID);
     setDisplayName(Tr::tr(Constants::CURRENT_DOCUMENT_FILTER_DISPLAY_NAME));
@@ -34,7 +34,7 @@ CppCurrentDocumentFilter::CppCurrentDocumentFilter(CppModelManager *manager)
                                  SymbolSearcher::Functions |
                                  SymbolSearcher::Classes);
 
-    connect(manager, &CppModelManager::documentUpdated,
+    connect(m_modelManager, &CppModelManager::documentUpdated,
             this, &CppCurrentDocumentFilter::onDocumentUpdated);
     connect(EditorManager::instance(), &EditorManager::currentEditorChanged,
             this, &CppCurrentDocumentFilter::onCurrentEditorChanged);
diff --git a/src/plugins/cppeditor/cppcurrentdocumentfilter.h b/src/plugins/cppeditor/cppcurrentdocumentfilter.h
index 72a8359b097..cd53f37b810 100644
--- a/src/plugins/cppeditor/cppcurrentdocumentfilter.h
+++ b/src/plugins/cppeditor/cppcurrentdocumentfilter.h
@@ -20,7 +20,7 @@ class CppCurrentDocumentFilter : public  Core::ILocatorFilter
     Q_OBJECT
 
 public:
-    explicit CppCurrentDocumentFilter(CppModelManager *manager);
+    explicit CppCurrentDocumentFilter();
     ~CppCurrentDocumentFilter() override = default;
 
     void makeAuxiliary();
diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp
index 9cc3b1c214b..1e22d03d901 100644
--- a/src/plugins/cppeditor/cppmodelmanager.cpp
+++ b/src/plugins/cppeditor/cppmodelmanager.cpp
@@ -902,8 +902,7 @@ void CppModelManager::initCppTools()
     setIncludesFilter(std::make_unique<CppIncludesFilter>());
     setFunctionsFilter(std::make_unique<CppFunctionsFilter>());
     setSymbolsFindFilter(std::make_unique<SymbolsFindFilter>(this));
-    setCurrentDocumentFilter(
-                std::make_unique<Internal::CppCurrentDocumentFilter>(this));
+    setCurrentDocumentFilter(std::make_unique<CppCurrentDocumentFilter>());
     // Setup matchers
     LocatorMatcher::addLocatorMatcherCreator([] { return QList{CppEditor::cppLocatorMatcher()}; });
     LocatorMatcher::addClassMatcherCreator([] { return QList{CppEditor::cppClassMatcher()}; });
@@ -2021,7 +2020,7 @@ void CppModelManager::switchDeclDef(const CursorInEditor &data,
 
 ILocatorFilter *CppModelManager::createAuxiliaryCurrentDocumentFilter()
 {
-    const auto filter = new Internal::CppCurrentDocumentFilter(instance());
+    const auto filter = new Internal::CppCurrentDocumentFilter;
     filter->makeAuxiliary();
     return filter;
 }