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

ClangRefactoring: Remove some noise from QtCreatorSearch use

Browse Source 
Change-Id: I54a6b0e0943b1352e6c0f85b63a5c0e358d0df51
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
hjk
2018-03-02 13:08:06 +01:00
parent 91619d20e7
commit 14034f1727
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/clangrefactoring/clangrefactoringplugin.cpp
View File

@@ -40,7 +40,6 @@
#include <cpptools/cppmodelmanager.h> #include <cpptools/cppmodelmanager.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/find/searchresultwindow.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <refactoringdatabaseinitializer.h> #include <refactoringdatabaseinitializer.h>
@@ -84,7 +83,7 @@ public:
SymbolQuery<QuerySqliteReadStatementFactory> symbolQuery{statementFactory}; SymbolQuery<QuerySqliteReadStatementFactory> symbolQuery{statementFactory};
RefactoringEngine engine{connectionClient.serverProxy(), refactoringClient, filePathCache, symbolQuery}; RefactoringEngine engine{connectionClient.serverProxy(), refactoringClient, filePathCache, symbolQuery};
QtCreatorSearch qtCreatorSearch{*Core::SearchResultWindow::instance()}; QtCreatorSearch qtCreatorSearch;
QtCreatorClangQueryFindFilter qtCreatorfindFilter{connectionClient.serverProxy(), QtCreatorClangQueryFindFilter qtCreatorfindFilter{connectionClient.serverProxy(),
qtCreatorSearch, qtCreatorSearch,
refactoringClient}; refactoringClient};

8
src/plugins/clangrefactoring/qtcreatorsearch.cpp
View File

@@ -29,19 +29,17 @@
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <QDir>
namespace ClangRefactoring { namespace ClangRefactoring {
QtCreatorSearch::QtCreatorSearch(Core::SearchResultWindow &searchResultWindow) QtCreatorSearch::QtCreatorSearch()
: searchResultWindow(searchResultWindow)
{ {
} }
std::unique_ptr<SearchHandle> QtCreatorSearch::startNewSearch(const QString &searchLabel, std::unique_ptr<SearchHandle> 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, searchLabel,
{}, {},
searchTerm, searchTerm,

11
src/plugins/clangrefactoring/qtcreatorsearch.h
View File

@@ -27,24 +27,15 @@
#include "searchinterface.h" #include "searchinterface.h"
#include <coreplugin/find/searchresultwindow.h>
namespace Core {
class SearchResultItem;
}
namespace ClangRefactoring { namespace ClangRefactoring {
class QtCreatorSearch final : public SearchInterface class QtCreatorSearch final : public SearchInterface
{ {
public: public:
QtCreatorSearch(Core::SearchResultWindow &searchResultWindow); QtCreatorSearch();
std::unique_ptr<SearchHandle> startNewSearch(const QString &searchLabel, std::unique_ptr<SearchHandle> startNewSearch(const QString &searchLabel,
const QString &searchTerm); const QString &searchTerm);
private:
Core::SearchResultWindow &searchResultWindow;
}; };
} // namespace ClangRefactoring } // namespace ClangRefactoring