From c879aeb56550494a27d12d004cff6fb6f42fc511 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 5 May 2023 19:12:47 +0200 Subject: [PATCH] SearchResultItem: Introduce SearchResultItems And reuse it. Change-Id: Ia052297340f2bf2478fbfdb2427b45e30bd9d067 Reviewed-by: Eike Ziller Reviewed-by: Qt CI Bot --- src/libs/utils/searchresultitem.h | 3 ++ src/plugins/clangcodemodel/clangdclient.h | 2 +- .../clangcodemodel/clangdfindreferences.cpp | 12 +++---- .../clangcodemodel/clangdfindreferences.h | 2 +- .../clangcodemodel/test/clangdtests.cpp | 33 +++++++++---------- src/plugins/clangcodemodel/test/clangdtests.h | 2 +- .../coreplugin/find/searchresulttreemodel.cpp | 15 +++++---- .../coreplugin/find/searchresulttreemodel.h | 2 +- .../coreplugin/find/searchresulttreeview.cpp | 2 +- .../coreplugin/find/searchresulttreeview.h | 2 +- .../coreplugin/find/searchresultwidget.cpp | 6 ++-- .../coreplugin/find/searchresultwidget.h | 6 ++-- .../coreplugin/find/searchresultwindow.cpp | 4 +-- .../coreplugin/find/searchresultwindow.h | 5 +-- src/plugins/cppeditor/cppfindreferences.cpp | 6 ++-- src/plugins/cppeditor/cppfindreferences.h | 2 +- src/plugins/cppeditor/cppindexingsupport.cpp | 2 +- src/plugins/cppeditor/symbolsearcher_test.cpp | 2 +- src/plugins/cppeditor/symbolsfindfilter.cpp | 2 +- .../languageclientsymbolsupport.cpp | 12 +++---- .../languageclientsymbolsupport.h | 2 +- .../qmljseditor/qmljsfindreferences.cpp | 4 +-- src/plugins/qmljseditor/qmljsfindreferences.h | 2 +- src/plugins/texteditor/basefilefind.cpp | 12 +++---- src/plugins/texteditor/basefilefind.h | 7 ++-- 25 files changed, 73 insertions(+), 76 deletions(-) diff --git a/src/libs/utils/searchresultitem.h b/src/libs/utils/searchresultitem.h index 558374704e8..ea0de8ceece 100644 --- a/src/libs/utils/searchresultitem.h +++ b/src/libs/utils/searchresultitem.h @@ -115,7 +115,10 @@ private: std::optional m_containingFunctionName; }; +using SearchResultItems = QList; + } // namespace Utils Q_DECLARE_METATYPE(Utils::SearchResultItem) +Q_DECLARE_METATYPE(Utils::SearchResultItems) Q_DECLARE_METATYPE(Utils::Search::TextPosition) diff --git a/src/plugins/clangcodemodel/clangdclient.h b/src/plugins/clangcodemodel/clangdclient.h index c8a71edf3ce..27ec66a3017 100644 --- a/src/plugins/clangcodemodel/clangdclient.h +++ b/src/plugins/clangcodemodel/clangdclient.h @@ -119,7 +119,7 @@ public: signals: void indexingFinished(); - void foundReferences(const QList &items); + void foundReferences(const Utils::SearchResultItems &items); void findUsagesDone(); void helpItemGathered(const Core::HelpItem &helpItem); void highlightingResultsReady(const TextEditor::HighlightingResults &results, diff --git a/src/plugins/clangcodemodel/clangdfindreferences.cpp b/src/plugins/clangcodemodel/clangdfindreferences.cpp index 12f860c87c1..b44fd41a828 100644 --- a/src/plugins/clangcodemodel/clangdfindreferences.cpp +++ b/src/plugins/clangcodemodel/clangdfindreferences.cpp @@ -72,7 +72,7 @@ public: const Position linkAsPosition; const QPointer search; const LinkHandler callback; - QList declDefItems; + SearchResultItems declDefItems; bool openedExtraFileForLink = false; bool declHasUsedTag = false; bool recursiveCallDetected = false; @@ -89,7 +89,7 @@ public: const SearchResult *search, const ReplacementData &replacementData, const QString &newSymbolName, - const QList &checkedItems, + const SearchResultItems &checkedItems, bool preserveCase); void handleFindUsagesResult(const QList &locations); void finishSearch(); @@ -143,7 +143,7 @@ ClangdFindReferences::ClangdFindReferences(ClangdClient *client, TextDocument *d d->search->setAdditionalReplaceWidget(renameFilesCheckBox); const auto renameHandler = [search = d->search](const QString &newSymbolName, - const QList &checkedItems, + const SearchResultItems &checkedItems, bool preserveCase) { const auto replacementData = search->userData().value(); Private::handleRenameRequest(search, replacementData, newSymbolName, checkedItems, @@ -151,7 +151,7 @@ ClangdFindReferences::ClangdFindReferences(ClangdClient *client, TextDocument *d }; connect(d->search, &SearchResult::replaceButtonClicked, renameHandler); } - connect(d->search, &SearchResult::activated, [](const SearchResultItem& item) { + connect(d->search, &SearchResult::activated, [](const SearchResultItem &item) { EditorManager::openEditorAtSearchResult(item); }); if (d->search->isInteractive()) @@ -243,7 +243,7 @@ void ClangdFindReferences::Private::handleRenameRequest( const SearchResult *search, const ReplacementData &replacementData, const QString &newSymbolName, - const QList &checkedItems, + const SearchResultItems &checkedItems, bool preserveCase) { const Utils::FilePaths filePaths = BaseFileFind::replaceAll(newSymbolName, checkedItems, @@ -391,7 +391,7 @@ static Usage::Tags getUsageType(const ClangdAstPath &path, const QString &search void ClangdFindReferences::Private::addSearchResultsForFile(const FilePath &file, const ReferencesFileData &fileData) { - QList items; + SearchResultItems items; qCDebug(clangdLog) << file << "has valid AST:" << fileData.ast.isValid(); const auto expectedDeclTypes = [this]() -> QStringList { if (checkUnusedData) diff --git a/src/plugins/clangcodemodel/clangdfindreferences.h b/src/plugins/clangcodemodel/clangdfindreferences.h index c975fc164f3..e110b355434 100644 --- a/src/plugins/clangcodemodel/clangdfindreferences.h +++ b/src/plugins/clangcodemodel/clangdfindreferences.h @@ -35,7 +35,7 @@ public: ~ClangdFindReferences(); signals: - void foundReferences(const QList &items); + void foundReferences(const Utils::SearchResultItems &items); void done(); private: diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp index 5fdff3164d9..e66515365b2 100644 --- a/src/plugins/clangcodemodel/test/clangdtests.cpp +++ b/src/plugins/clangcodemodel/test/clangdtests.cpp @@ -191,7 +191,7 @@ void ClangdTestFindReferences::initTestCase() ClangdTest::initTestCase(); CppEditor::codeModelSettings()->setCategorizeFindReferences(true); connect(client(), &ClangdClient::foundReferences, this, - [this](const QList &results) { + [this](const SearchResultItems &results) { if (results.isEmpty()) return; if (results.first().path().first().endsWith("defs.h")) @@ -205,8 +205,7 @@ void ClangdTestFindReferences::test_data() { QTest::addColumn("fileName"); QTest::addColumn("pos"); - using ItemList = QList; - QTest::addColumn("expectedResults"); + QTest::addColumn("expectedResults"); static const auto makeItem = [](int line, int column, Usage::Tags tags) { SearchResultItem item; @@ -215,7 +214,7 @@ void ClangdTestFindReferences::test_data() return item; }; - QTest::newRow("struct member") << "defs.h" << 55 << ItemList{ + QTest::newRow("struct member") << "defs.h" << 55 << SearchResultItems{ makeItem(2, 17, Usage::Tag::Read), makeItem(3, 15, Usage::Tag::Declaration), makeItem(6, 17, Usage::Tag::WritableRef), makeItem(8, 11, Usage::Tag::WritableRef), makeItem(9, 13, Usage::Tag::WritableRef), makeItem(10, 12, Usage::Tag::WritableRef), @@ -232,23 +231,23 @@ void ClangdTestFindReferences::test_data() makeItem(56, 7, Usage::Tag::Write), makeItem(56, 25, Usage::Tags()), makeItem(58, 13, Usage::Tag::Read), makeItem(58, 25, Usage::Tag::Read), makeItem(59, 7, Usage::Tag::Write), makeItem(59, 24, Usage::Tag::Read)}; - QTest::newRow("constructor member initialization") << "defs.h" << 68 << ItemList{ + QTest::newRow("constructor member initialization") << "defs.h" << 68 << SearchResultItems{ makeItem(2, 10, Usage::Tag::Write), makeItem(4, 8, Usage::Tag::Declaration)}; - QTest::newRow("direct member initialization") << "defs.h" << 101 << ItemList{ + QTest::newRow("direct member initialization") << "defs.h" << 101 << SearchResultItems{ makeItem(5, 21, Initialization), makeItem(45, 16, Usage::Tag::Read)}; - ItemList pureVirtualRefs{makeItem(17, 17, Usage::Tag::Declaration), + SearchResultItems pureVirtualRefs{makeItem(17, 17, Usage::Tag::Declaration), makeItem(21, 9, {Usage::Tag::Declaration, Usage::Tag::Override})}; QTest::newRow("pure virtual declaration") << "defs.h" << 420 << pureVirtualRefs; - QTest::newRow("pointer variable") << "main.cpp" << 52 << ItemList{ + QTest::newRow("pointer variable") << "main.cpp" << 52 << SearchResultItems{ makeItem(6, 10, Initialization), makeItem(8, 4, Usage::Tag::Write), makeItem(10, 4, Usage::Tag::Write), makeItem(24, 5, Usage::Tag::Write), makeItem(25, 11, Usage::Tag::WritableRef), makeItem(26, 11, Usage::Tag::Read), makeItem(27, 10, Usage::Tag::WritableRef), makeItem(28, 10, Usage::Tag::Read), makeItem(29, 11, Usage::Tag::Read), makeItem(30, 15, Usage::Tag::WritableRef), makeItem(31, 22, Usage::Tag::Read)}; - QTest::newRow("struct variable") << "main.cpp" << 39 << ItemList{ + QTest::newRow("struct variable") << "main.cpp" << 39 << SearchResultItems{ makeItem(5, 7, Usage::Tag::Declaration), makeItem(6, 15, Usage::Tag::WritableRef), makeItem(8, 9, Usage::Tag::WritableRef), makeItem(9, 11, Usage::Tag::WritableRef), makeItem(11, 4, Usage::Tag::Write), makeItem(11, 11, Usage::Tag::WritableRef), @@ -269,7 +268,7 @@ void ClangdTestFindReferences::test_data() // Some of these are conceptually questionable, as S is a type and thus we cannot "read from" // or "write to" it. But it probably matches the intuitive user expectation. - QTest::newRow("struct type") << "defs.h" << 7 << ItemList{ + QTest::newRow("struct type") << "defs.h" << 7 << SearchResultItems{ makeItem(1, 7, Usage::Tag::Declaration), makeItem(2, 4, (Usage::Tags{Usage::Tag::Declaration, Usage::Tag::ConstructorDestructor})), makeItem(20, 19, Usage::Tags()), makeItem(10, 9, Usage::Tag::WritableRef), @@ -281,24 +280,24 @@ void ClangdTestFindReferences::test_data() makeItem(58, 10, Usage::Tag::Read), makeItem(58, 22, Usage::Tag::Read), makeItem(59, 4, Usage::Tag::Write), makeItem(59, 21, Usage::Tag::Read)}; - QTest::newRow("struct type 2") << "defs.h" << 450 << ItemList{ + QTest::newRow("struct type 2") << "defs.h" << 450 << SearchResultItems{ makeItem(20, 7, Usage::Tag::Declaration), makeItem(5, 4, Usage::Tags()), makeItem(13, 21, Usage::Tags()), makeItem(32, 8, Usage::Tags())}; - QTest::newRow("constructor") << "defs.h" << 627 << ItemList{ + QTest::newRow("constructor") << "defs.h" << 627 << SearchResultItems{ makeItem(31, 4, (Usage::Tags{Usage::Tag::Declaration, Usage::Tag::ConstructorDestructor})), makeItem(36, 7, Usage::Tag::ConstructorDestructor)}; - QTest::newRow("subclass") << "defs.h" << 450 << ItemList{ + QTest::newRow("subclass") << "defs.h" << 450 << SearchResultItems{ makeItem(20, 7, Usage::Tag::Declaration), makeItem(5, 4, Usage::Tags()), makeItem(13, 21, Usage::Tags()), makeItem(32, 8, Usage::Tags())}; - QTest::newRow("array variable") << "main.cpp" << 1134 << ItemList{ + QTest::newRow("array variable") << "main.cpp" << 1134 << SearchResultItems{ makeItem(57, 8, Usage::Tag::Declaration), makeItem(58, 4, Usage::Tag::Write), makeItem(59, 15, Usage::Tag::Read)}; - QTest::newRow("free function") << "defs.h" << 510 << ItemList{ + QTest::newRow("free function") << "defs.h" << 510 << SearchResultItems{ makeItem(24, 5, Usage::Tag::Declaration), makeItem(19, 4, Usage::Tags()), makeItem(25, 4, Usage::Tags()), makeItem(60, 26, Usage::Tag::Read)}; - QTest::newRow("member function") << "defs.h" << 192 << ItemList{ + QTest::newRow("member function") << "defs.h" << 192 << SearchResultItems{ makeItem(9, 12, Usage::Tag::Declaration), makeItem(40, 8, Usage::Tags())}; } @@ -309,7 +308,7 @@ void ClangdTestFindReferences::test() { QFETCH(QString, fileName); QFETCH(int, pos); - QFETCH(QList, expectedResults); + QFETCH(SearchResultItems, expectedResults); TextEditor::TextDocument * const doc = document(fileName); QVERIFY(doc); diff --git a/src/plugins/clangcodemodel/test/clangdtests.h b/src/plugins/clangcodemodel/test/clangdtests.h index f5740db5ec6..90f4eca45af 100644 --- a/src/plugins/clangcodemodel/test/clangdtests.h +++ b/src/plugins/clangcodemodel/test/clangdtests.h @@ -74,7 +74,7 @@ private slots: void test(); private: - QList m_actualResults; + Utils::SearchResultItems m_actualResults; }; class ClangdTestFollowSymbol : public ClangdTest diff --git a/src/plugins/coreplugin/find/searchresulttreemodel.cpp b/src/plugins/coreplugin/find/searchresulttreemodel.cpp index 6692848f9f8..769c63a6bca 100644 --- a/src/plugins/coreplugin/find/searchresulttreemodel.cpp +++ b/src/plugins/coreplugin/find/searchresulttreemodel.cpp @@ -41,7 +41,7 @@ public: QModelIndex next(const QModelIndex &idx, bool includeGenerated = false, bool *wrapped = nullptr) const; QModelIndex prev(const QModelIndex &idx, bool includeGenerated = false, bool *wrapped = nullptr) const; - QList addResults(const QList &items, SearchResult::AddMode mode); + QList addResults(const SearchResultItems &items, SearchResult::AddMode mode); static SearchResultTreeItem *treeItemAtIndex(const QModelIndex &idx); @@ -54,7 +54,7 @@ public slots: private: QModelIndex index(SearchResultTreeItem *item) const; - void addResultsToCurrentParent(const QList &items, SearchResult::AddMode mode); + void addResultsToCurrentParent(const SearchResultItems &items, SearchResult::AddMode mode); QSet addPath(const QStringList &path); QVariant data(const SearchResultTreeItem *row, int role) const; bool setCheckState(const QModelIndex &idx, Qt::CheckState checkState, bool firstCall = true); @@ -385,7 +385,8 @@ QSet SearchResultTreeModel::addPath(const QStringList &p return pathNodes; } -void SearchResultTreeModel::addResultsToCurrentParent(const QList &items, SearchResult::AddMode mode) +void SearchResultTreeModel::addResultsToCurrentParent(const SearchResultItems &items, + SearchResult::AddMode mode) { if (!m_currentParent) return; @@ -436,12 +437,12 @@ static bool lessThanByPath(const SearchResultItem &a, const SearchResultItem &b) * Adds the search result to the list of results, creating nodes for the path when * necessary. */ -QList SearchResultTreeModel::addResults(const QList &items, SearchResult::AddMode mode) +QList SearchResultTreeModel::addResults(const SearchResultItems &items, SearchResult::AddMode mode) { QSet pathNodes; - QList sortedItems = items; + SearchResultItems sortedItems = items; std::stable_sort(sortedItems.begin(), sortedItems.end(), lessThanByPath); - QList itemSet; + SearchResultItems itemSet; for (const SearchResultItem &item : sortedItems) { m_editorFontIsUsed |= item.useTextEditorFont(); if (!m_currentParent || (m_currentPath != item.path())) { @@ -580,7 +581,7 @@ void SearchResultFilterModel::setTextEditorFont(const QFont &font, const SearchR sourceModel()->setTextEditorFont(font, colors); } -QList SearchResultFilterModel::addResults(const QList &items, +QList SearchResultFilterModel::addResults(const SearchResultItems &items, SearchResult::AddMode mode) { QList sourceIndexes = sourceModel()->addResults(items, mode); diff --git a/src/plugins/coreplugin/find/searchresulttreemodel.h b/src/plugins/coreplugin/find/searchresulttreemodel.h index 37f163fe0ad..716bcccca32 100644 --- a/src/plugins/coreplugin/find/searchresulttreemodel.h +++ b/src/plugins/coreplugin/find/searchresulttreemodel.h @@ -25,7 +25,7 @@ public: void setFilter(SearchResultFilter *filter); void setShowReplaceUI(bool show); void setTextEditorFont(const QFont &font, const Utils::SearchResultColors &colors); - QList addResults(const QList &items, + QList addResults(const Utils::SearchResultItems &items, SearchResult::AddMode mode); void clear(); QModelIndex next(const QModelIndex &idx, bool includeGenerated = false, diff --git a/src/plugins/coreplugin/find/searchresulttreeview.cpp b/src/plugins/coreplugin/find/searchresulttreeview.cpp index dca9f0835d0..d8026ccd847 100644 --- a/src/plugins/coreplugin/find/searchresulttreeview.cpp +++ b/src/plugins/coreplugin/find/searchresulttreeview.cpp @@ -73,7 +73,7 @@ void SearchResultTreeView::clear() m_model->clear(); } -void SearchResultTreeView::addResults(const QList &items, SearchResult::AddMode mode) +void SearchResultTreeView::addResults(const SearchResultItems &items, SearchResult::AddMode mode) { const QList addedParents = m_model->addResults(items, mode); if (m_autoExpandResults && !addedParents.isEmpty()) { diff --git a/src/plugins/coreplugin/find/searchresulttreeview.h b/src/plugins/coreplugin/find/searchresulttreeview.h index 4e81ed86920..06996fefe09 100644 --- a/src/plugins/coreplugin/find/searchresulttreeview.h +++ b/src/plugins/coreplugin/find/searchresulttreeview.h @@ -26,7 +26,7 @@ public: void setTabWidth(int tabWidth); SearchResultFilterModel *model() const; - void addResults(const QList &items, SearchResult::AddMode mode); + void addResults(const Utils::SearchResultItems &items, SearchResult::AddMode mode); void setFilter(SearchResultFilter *filter); bool hasFilter() const; void showFilterWidget(QWidget *parent); diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp index 5959cd40fda..ec2ab2c0f64 100644 --- a/src/plugins/coreplugin/find/searchresultwidget.cpp +++ b/src/plugins/coreplugin/find/searchresultwidget.cpp @@ -226,7 +226,7 @@ void SearchResultWidget::setAdditionalReplaceWidget(QWidget *widget) m_additionalReplaceWidget = widget; } -void SearchResultWidget::addResults(const QList &items, SearchResult::AddMode mode) +void SearchResultWidget::addResults(const SearchResultItems &items, SearchResult::AddMode mode) { bool firstItems = (m_count == 0); m_count += items.size(); @@ -496,9 +496,9 @@ void SearchResultWidget::searchAgain() emit searchAgainRequested(); } -QList SearchResultWidget::checkedItems() const +SearchResultItems SearchResultWidget::checkedItems() const { - QList result; + SearchResultItems result; SearchResultFilterModel *model = m_searchResultTreeView->model(); const int fileCount = model->rowCount(); for (int i = 0; i < fileCount; ++i) { diff --git a/src/plugins/coreplugin/find/searchresultwidget.h b/src/plugins/coreplugin/find/searchresultwidget.h index 3761606ccce..6722af579eb 100644 --- a/src/plugins/coreplugin/find/searchresultwidget.h +++ b/src/plugins/coreplugin/find/searchresultwidget.h @@ -34,7 +34,7 @@ public: QWidget *additionalReplaceWidget() const; void setAdditionalReplaceWidget(QWidget *widget); - void addResults(const QList &items, SearchResult::AddMode mode); + void addResults(const Utils::SearchResultItems &items, SearchResult::AddMode mode); int count() const; bool isSearching() const { return m_searching; } @@ -79,7 +79,7 @@ public slots: signals: void activated(const Utils::SearchResultItem &item); void replaceButtonClicked(const QString &replaceText, - const QList &checkedItems, bool preserveCase); + const Utils::SearchResultItems &checkedItems, bool preserveCase); void replaceTextChanged(const QString &replaceText); void searchAgainRequested(); void canceled(); @@ -103,7 +103,7 @@ private: void continueAfterSizeWarning(); void cancelAfterSizeWarning(); - QList checkedItems() const; + Utils::SearchResultItems checkedItems() const; void updateMatchesFoundLabel(); SearchResultTreeView *m_searchResultTreeView = nullptr; diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index 524629289fc..a9cc493681a 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/src/plugins/coreplugin/find/searchresultwindow.cpp @@ -261,7 +261,7 @@ using namespace Core::Internal; /*! \fn void Core::SearchResult::replaceButtonClicked(const QString &replaceText, - const QList &checkedItems, + const Utils::SearchResultItems &checkedItems, bool preserveCase) Indicates that the user initiated a text replace by selecting @@ -843,7 +843,7 @@ void SearchResult::addResult(const Utils::SearchResultItem &item) \sa addResult() */ -void SearchResult::addResults(const QList &items, AddMode mode) +void SearchResult::addResults(const Utils::SearchResultItems &items, AddMode mode) { m_widget->addResults(items, mode); emit countChanged(m_widget->count()); diff --git a/src/plugins/coreplugin/find/searchresultwindow.h b/src/plugins/coreplugin/find/searchresultwindow.h index d2a0dc8d31c..ae611926818 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.h +++ b/src/plugins/coreplugin/find/searchresultwindow.h @@ -60,7 +60,7 @@ public: public slots: void addResult(const Utils::SearchResultItem &item); - void addResults(const QList &items, AddMode mode); + void addResults(const Utils::SearchResultItems &items, AddMode mode); void setFilter(SearchResultFilter *filter); // Takes ownership void finishSearch(bool canceled, const QString &reason = {}); void setTextToReplace(const QString &textToReplace); @@ -71,7 +71,8 @@ public slots: signals: void activated(const Utils::SearchResultItem &item); - void replaceButtonClicked(const QString &replaceText, const QList &checkedItems, bool preserveCase); + void replaceButtonClicked(const QString &replaceText, + const Utils::SearchResultItems &checkedItems, bool preserveCase); void replaceTextChanged(const QString &replaceText); void canceled(); void paused(bool paused); diff --git a/src/plugins/cppeditor/cppfindreferences.cpp b/src/plugins/cppeditor/cppfindreferences.cpp index 6194e649cb4..5da22854386 100644 --- a/src/plugins/cppeditor/cppfindreferences.cpp +++ b/src/plugins/cppeditor/cppfindreferences.cpp @@ -456,10 +456,8 @@ void CppFindReferences::setupSearch(Core::SearchResult *search) std::bind(&CppFindReferences::onReplaceButtonClicked, this, search, _1, _2, _3)); } -void CppFindReferences::onReplaceButtonClicked(Core::SearchResult *search, - const QString &text, - const QList &items, - bool preserveCase) +void CppFindReferences::onReplaceButtonClicked(Core::SearchResult *search, const QString &text, + const SearchResultItems &items, bool preserveCase) { const Utils::FilePaths filePaths = TextEditor::BaseFileFind::replaceAll(text, items, preserveCase); if (!filePaths.isEmpty()) { diff --git a/src/plugins/cppeditor/cppfindreferences.h b/src/plugins/cppeditor/cppfindreferences.h index cbd1a9bf4ab..b05ce723c4e 100644 --- a/src/plugins/cppeditor/cppfindreferences.h +++ b/src/plugins/cppeditor/cppfindreferences.h @@ -78,7 +78,7 @@ public: private: void setupSearch(Core::SearchResult *search); void onReplaceButtonClicked(Core::SearchResult *search, const QString &text, - const QList &items, bool preserveCase); + const Utils::SearchResultItems &items, bool preserveCase); void searchAgain(Core::SearchResult *search); void findUsages(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context, diff --git a/src/plugins/cppeditor/cppindexingsupport.cpp b/src/plugins/cppeditor/cppindexingsupport.cpp index be150b2d393..22ff93cdaa0 100644 --- a/src/plugins/cppeditor/cppindexingsupport.cpp +++ b/src/plugins/cppeditor/cppindexingsupport.cpp @@ -264,7 +264,7 @@ void SymbolSearcher::runSearch(QPromise &promise) if (promise.isCanceled()) break; if (m_fileNames.isEmpty() || m_fileNames.contains(it.value()->filePath().path())) { - QList resultItems; + SearchResultItems resultItems; auto filter = [&](const IndexItem::Ptr &info) -> IndexItem::VisitorResult { if (matcher.match(info->symbolName()).hasMatch()) { QString text = info->symbolName(); diff --git a/src/plugins/cppeditor/symbolsearcher_test.cpp b/src/plugins/cppeditor/symbolsearcher_test.cpp index ade5b356207..688df3d924f 100644 --- a/src/plugins/cppeditor/symbolsearcher_test.cpp +++ b/src/plugins/cppeditor/symbolsearcher_test.cpp @@ -35,7 +35,7 @@ public: return m_symbolName == other.m_symbolName && m_scope == other.m_scope; } - static ResultDataList fromSearchResultList(const QList &entries) + static ResultDataList fromSearchResultList(const Utils::SearchResultItems &entries) { ResultDataList result; for (const Utils::SearchResultItem &entry : entries) diff --git a/src/plugins/cppeditor/symbolsfindfilter.cpp b/src/plugins/cppeditor/symbolsfindfilter.cpp index 6fd8e78618f..eb6a4c81dab 100644 --- a/src/plugins/cppeditor/symbolsfindfilter.cpp +++ b/src/plugins/cppeditor/symbolsfindfilter.cpp @@ -136,7 +136,7 @@ void SymbolsFindFilter::addResults(QFutureWatcher *watcher, in watcher->cancel(); return; } - QList items; + SearchResultItems items; for (int i = begin; i < end; ++i) items << watcher->resultAt(i); search->addResults(items, SearchResult::AddSorted); diff --git a/src/plugins/languageclient/languageclientsymbolsupport.cpp b/src/plugins/languageclient/languageclientsymbolsupport.cpp index 73317fb6fe4..04267ebb074 100644 --- a/src/plugins/languageclient/languageclientsymbolsupport.cpp +++ b/src/plugins/languageclient/languageclientsymbolsupport.cpp @@ -216,12 +216,12 @@ QStringList SymbolSupport::getFileContents(const Utils::FilePath &filePath) return fileContent.split("\n"); } -QList generateSearchResultItems( +Utils::SearchResultItems generateSearchResultItems( const QMap> &rangesInDocument, Core::SearchResult *search = nullptr, bool limitToProjects = false) { - QList result; + Utils::SearchResultItems result; const bool renaming = search && search->supportsReplace(); QString oldSymbolName; QVariantList userData; @@ -264,7 +264,7 @@ QList generateSearchResultItems( return result; } -QList generateSearchResultItems( +Utils::SearchResultItems generateSearchResultItems( const LanguageClientArray &locations, const DocumentUri::PathMapper &pathMapper) { if (locations.isNull()) @@ -463,7 +463,7 @@ void SymbolSupport::requestRename(const TextDocumentPositionParams &positionPara search->popup(); } -QList generateReplaceItems(const WorkspaceEdit &edits, +Utils::SearchResultItems generateReplaceItems(const WorkspaceEdit &edits, Core::SearchResult *search, bool limitToProjects, const DocumentUri::PathMapper &pathMapper) @@ -524,7 +524,7 @@ Core::SearchResult *SymbolSupport::createSearch(const TextDocumentPositionParams connect(search, &Core::SearchResult::replaceButtonClicked, this, [this, search, resetConnection](const QString & /*replaceText*/, - const QList &checkedItems) { + const Utils::SearchResultItems &checkedItems) { applyRename(checkedItems, search); disconnect(resetConnection); }); @@ -571,7 +571,7 @@ void SymbolSupport::handleRenameResponse(Core::SearchResult *search, } } -void SymbolSupport::applyRename(const QList &checkedItems, +void SymbolSupport::applyRename(const Utils::SearchResultItems &checkedItems, Core::SearchResult *search) { QSet affectedNonOpenFilePaths; diff --git a/src/plugins/languageclient/languageclientsymbolsupport.h b/src/plugins/languageclient/languageclientsymbolsupport.h index c9960c5c1c3..e52b80471ad 100644 --- a/src/plugins/languageclient/languageclientsymbolsupport.h +++ b/src/plugins/languageclient/languageclientsymbolsupport.h @@ -73,7 +73,7 @@ private: const std::function &callback, bool preferLowerCaseFileNames); void handleRenameResponse(Core::SearchResult *search, const LanguageServerProtocol::RenameRequest::Response &response); - void applyRename(const QList &checkedItems, Core::SearchResult *search); + void applyRename(const Utils::SearchResultItems &checkedItems, Core::SearchResult *search); QString derivePlaceholder(const QString &oldSymbol, const QString &newSymbol); Client *m_client = nullptr; diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp index a660dbbb986..5e72cd642b9 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.cpp +++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp @@ -992,7 +992,7 @@ void FindReferences::displayResults(int first, int last) this, &FindReferences::onReplaceButtonClicked); } connect(m_currentSearch.data(), &SearchResult::activated, - [](const Utils::SearchResultItem& item) { + [](const Utils::SearchResultItem &item) { Core::EditorManager::openEditorAtSearchResult(item); }); connect(m_currentSearch.data(), &SearchResult::canceled, this, &FindReferences::cancel); @@ -1042,7 +1042,7 @@ void FindReferences::setPaused(bool paused) } void FindReferences::onReplaceButtonClicked(const QString &text, - const QList &items, bool preserveCase) + const Utils::SearchResultItems &items, bool preserveCase) { const Utils::FilePaths filePaths = TextEditor::BaseFileFind::replaceAll(text, items, diff --git a/src/plugins/qmljseditor/qmljsfindreferences.h b/src/plugins/qmljseditor/qmljsfindreferences.h index b4040f080b3..c45d77ac180 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.h +++ b/src/plugins/qmljseditor/qmljsfindreferences.h @@ -62,7 +62,7 @@ private: void searchFinished(); void cancel(); void setPaused(bool paused); - void onReplaceButtonClicked(const QString &text, const QList &items, + void onReplaceButtonClicked(const QString &text, const Utils::SearchResultItems &items, bool preserveCase); QPointer m_currentSearch; diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 5dabbda05b1..9a57b083e69 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -223,7 +223,7 @@ static void displayResult(QFutureWatcher *watcher, SearchResult *search, int index) { const FileSearchResultList results = watcher->resultAt(index); - QList items; + SearchResultItems items; for (const FileSearchResult &result : results) { SearchResultItem item; item.setFilePath(result.fileName); @@ -330,8 +330,7 @@ void BaseFileFind::addSearchEngine(SearchEngine *searchEngine) setCurrentSearchEngine(0); } -void BaseFileFind::doReplace(const QString &text, - const QList &items, +void BaseFileFind::doReplace(const QString &text, const SearchResultItems &items, bool preserveCase) { const FilePaths files = replaceAll(text, items, preserveCase); @@ -472,8 +471,7 @@ void BaseFileFind::recheckEnabled(SearchResult *search) search->setSearchAgainEnabled(isEnabled()); } -FilePaths BaseFileFind::replaceAll(const QString &text, - const QList &items, +FilePaths BaseFileFind::replaceAll(const QString &text, const SearchResultItems &items, bool preserveCase) { if (items.isEmpty()) @@ -481,7 +479,7 @@ FilePaths BaseFileFind::replaceAll(const QString &text, RefactoringChanges refactoring; - QHash > changes; + QHash changes; for (const SearchResultItem &item : items) changes[FilePath::fromUserInput(item.path().constFirst())].append(item); @@ -502,7 +500,7 @@ FilePaths BaseFileFind::replaceAll(const QString &text, for (auto it = changes.cbegin(), end = changes.cend(); it != end; ++it) { const FilePath filePath = it.key(); - const QList changeItems = it.value(); + const SearchResultItems changeItems = it.value(); ChangeSet changeSet; RefactoringFilePtr file = refactoring.file(filePath); diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h index 53d085662a1..5864eccf365 100644 --- a/src/plugins/texteditor/basefilefind.h +++ b/src/plugins/texteditor/basefilefind.h @@ -85,8 +85,7 @@ public: void addSearchEngine(SearchEngine *searchEngine); /* returns the list of unique files that were passed in items */ - static Utils::FilePaths replaceAll(const QString &txt, - const QList &items, + static Utils::FilePaths replaceAll(const QString &txt, const Utils::SearchResultItems &items, bool preserveCase = false); virtual Utils::FileIterator *files(const QStringList &nameFilters, const QStringList &exclusionFilters, @@ -116,9 +115,7 @@ signals: private: void openEditor(Core::SearchResult *result, const Utils::SearchResultItem &item); - void doReplace(const QString &txt, - const QList &items, - bool preserveCase); + void doReplace(const QString &txt, const Utils::SearchResultItems &items, bool preserveCase); void hideHighlightAll(bool visible); void searchAgain(Core::SearchResult *search); virtual void recheckEnabled(Core::SearchResult *search);