diff --git a/src/plugins/clangrefactoring/clangrefactoringplugin.cpp b/src/plugins/clangrefactoring/clangrefactoringplugin.cpp index 3cc4496ce3a..7205b287e47 100644 --- a/src/plugins/clangrefactoring/clangrefactoringplugin.cpp +++ b/src/plugins/clangrefactoring/clangrefactoringplugin.cpp @@ -40,7 +40,6 @@ #include #include -#include #include #include @@ -84,7 +83,7 @@ public: SymbolQuery symbolQuery{statementFactory}; RefactoringEngine engine{connectionClient.serverProxy(), refactoringClient, filePathCache, symbolQuery}; - QtCreatorSearch qtCreatorSearch{*Core::SearchResultWindow::instance()}; + QtCreatorSearch qtCreatorSearch; QtCreatorClangQueryFindFilter qtCreatorfindFilter{connectionClient.serverProxy(), qtCreatorSearch, refactoringClient}; diff --git a/src/plugins/clangrefactoring/qtcreatorsearch.cpp b/src/plugins/clangrefactoring/qtcreatorsearch.cpp index d5802c9c971..341bfe76ac5 100644 --- a/src/plugins/clangrefactoring/qtcreatorsearch.cpp +++ b/src/plugins/clangrefactoring/qtcreatorsearch.cpp @@ -29,19 +29,17 @@ #include -#include - namespace ClangRefactoring { -QtCreatorSearch::QtCreatorSearch(Core::SearchResultWindow &searchResultWindow) - : searchResultWindow(searchResultWindow) +QtCreatorSearch::QtCreatorSearch() { } std::unique_ptr QtCreatorSearch::startNewSearch(const QString &searchLabel, - const QString &searchTerm) + const QString &searchTerm) { - Core::SearchResult *searchResult = searchResultWindow.startNewSearch( + auto searchResultWindow = Core::SearchResultWindow::instance(); + Core::SearchResult *searchResult = searchResultWindow->startNewSearch( searchLabel, {}, searchTerm, diff --git a/src/plugins/clangrefactoring/qtcreatorsearch.h b/src/plugins/clangrefactoring/qtcreatorsearch.h index ebef545d90d..cb0dcf83419 100644 --- a/src/plugins/clangrefactoring/qtcreatorsearch.h +++ b/src/plugins/clangrefactoring/qtcreatorsearch.h @@ -27,24 +27,15 @@ #include "searchinterface.h" -#include - -namespace Core { -class SearchResultItem; -} - namespace ClangRefactoring { class QtCreatorSearch final : public SearchInterface { public: - QtCreatorSearch(Core::SearchResultWindow &searchResultWindow); + QtCreatorSearch(); std::unique_ptr startNewSearch(const QString &searchLabel, const QString &searchTerm); - -private: - Core::SearchResultWindow &searchResultWindow; }; } // namespace ClangRefactoring