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

BaseFileFind: Centralize waiting for search to finish

Browse Source 
Instead of adding a FutureSynchronizer to all backends, we can use a
central one in BaseFileFind.

Amends 269f15df6b

Change-Id: Iad0145317b53a95b686c091017b8197d759dc253
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2021-06-07 13:17:25 +02:00
parent 4445876013
commit 9a8a7a88a6
5 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/gitgrep.cpp
View File

@@ -235,7 +235,6 @@ static bool isGitDirectory(const QString &path)
GitGrep::GitGrep(GitClient *client)
: m_client(client)
{
m_futureSynchronizer.setCancelOnWait(true);
m_widget = new QWidget;
auto layout = new QHBoxLayout(m_widget);
layout->setContentsMargins(0, 0, 0, 0);
@@ -305,9 +304,7 @@ void GitGrep::writeSettings(QSettings *settings) const
QFuture<FileSearchResultList> GitGrep::executeSearch(const TextEditor::FileFindParameters &parameters,
TextEditor::BaseFileFind * /*baseFileFind*/)
{
auto future = Utils::runAsync(GitGrepRunner(parameters));
m_futureSynchronizer.addFuture(future);
return future;
return Utils::runAsync(GitGrepRunner(parameters));
}
IEditor *GitGrep::openEditor(const SearchResultItem &item,