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

SearchResultItem: Introduce SearchResultItems

Browse Source 
And reuse it.

Change-Id: Ia052297340f2bf2478fbfdb2427b45e30bd9d067
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2023-05-05 19:12:47 +02:00
parent 8b3aa900da
commit c879aeb565
25 changed files with 73 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/texteditor/basefilefind.cpp
View File

@@ -223,7 +223,7 @@ static void displayResult(QFutureWatcher<FileSearchResultList> *watcher,
SearchResult *search, int index)
{
const FileSearchResultList results = watcher->resultAt(index);
QList<SearchResultItem> 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<SearchResultItem> &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<SearchResultItem> &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<FilePath, QList<SearchResultItem> > changes;
QHash<FilePath, SearchResultItems> 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<SearchResultItem> changeItems = it.value();
const SearchResultItems changeItems = it.value();
ChangeSet changeSet;
RefactoringFilePtr file = refactoring.file(filePath);

7
src/plugins/texteditor/basefilefind.h
View File

@@ -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<Utils::SearchResultItem> &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<Utils::SearchResultItem> &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);