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

Utils: Move SearchResultItem/Color into Utils

Browse Source 
It's going to be reused inside FileSearch.

Change-Id: I8993d7158ff31c311c2283d32bc43465a8946a52
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2023-05-05 15:51:11 +02:00
parent 2c61eac1cb
commit 8b3aa900da
38 changed files with 266 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmljseditor/qmljsfindreferences.cpp
View File

@@ -992,7 +992,7 @@ void FindReferences::displayResults(int first, int last)
this, &FindReferences::onReplaceButtonClicked);
}
connect(m_currentSearch.data(), &SearchResult::activated,
[](const Core::SearchResultItem& item) {
[](const Utils::SearchResultItem& item) {
Core::EditorManager::openEditorAtSearchResult(item);
});
connect(m_currentSearch.data(), &SearchResult::canceled, this, &FindReferences::cancel);
@@ -1013,7 +1013,7 @@ void FindReferences::displayResults(int first, int last)
}
for (int index = first; index != last; ++index) {
Usage result = m_watcher.future().resultAt(index);
SearchResultItem item;
Utils::SearchResultItem item;
item.setFilePath(result.path);
item.setLineText(result.lineText);
item.setMainRange(result.line, result.col, result.len);
@@ -1041,7 +1041,8 @@ void FindReferences::setPaused(bool paused)
m_watcher.setPaused(paused);
}
void FindReferences::onReplaceButtonClicked(const QString &text, const QList<SearchResultItem> &items, bool preserveCase)
void FindReferences::onReplaceButtonClicked(const QString &text,
const QList<Utils::SearchResultItem> &items, bool preserveCase)
{
const Utils::FilePaths filePaths = TextEditor::BaseFileFind::replaceAll(text,
items,

9
src/plugins/qmljseditor/qmljsfindreferences.h
View File

@@ -7,6 +7,7 @@
#include <utils/filepath.h>
#include <utils/futuresynchronizer.h>
#include <utils/searchresultitem.h>
#include <QObject>
#include <QFutureWatcher>
@@ -14,10 +15,7 @@
QT_FORWARD_DECLARE_CLASS(QTimer)
namespace Core {
class SearchResultItem;
class SearchResult;
} // namespace Core
namespace Core { class SearchResult; }
namespace QmlJSEditor {
@@ -64,7 +62,8 @@ private:
void searchFinished();
void cancel();
void setPaused(bool paused);
void onReplaceButtonClicked(const QString &text, const QList<Core::SearchResultItem> &items, bool preserveCase);
void onReplaceButtonClicked(const QString &text, const QList<Utils::SearchResultItem> &items,
bool preserveCase);
QPointer<Core::SearchResult> m_currentSearch;
QFutureWatcher<Usage> m_watcher;