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

Various Plugins: Replace setPaused() with setSuspended()

Browse Source 
Fix warnings about deprecated QFutureWatcherBase::setPaused().

Change-Id: I7c4637bcaf141bbda46e34da48306a25c68f039f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2024-07-22 08:02:51 +02:00
parent 2145023c8c
commit dcaa3afd6d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cppeditor/cppfindreferences.cpp
View File

@@ -858,7 +858,7 @@ void CppFindReferences::createWatcher(const QFuture<CPlusPlus::Usage> &future, S
connect(search, &SearchResult::canceled, watcher, [watcher]() { watcher->cancel(); }); connect(search, &SearchResult::canceled, watcher, [watcher]() { watcher->cancel(); });
connect(search, &SearchResult::paused, watcher, [watcher](bool paused) { connect(search, &SearchResult::paused, watcher, [watcher](bool paused) {
if (!paused || watcher->isRunning()) // guard against pausing when the search is finished if (!paused || watcher->isRunning()) // guard against pausing when the search is finished
watcher->setPaused(paused); watcher->setSuspended(paused);
}); });
watcher->setPendingResultsLimit(1); watcher->setPendingResultsLimit(1);
watcher->setFuture(future); watcher->setFuture(future);

2
src/plugins/cppeditor/symbolsfindfilter.cpp
View File

@@ -75,7 +75,7 @@ void SymbolsFindFilter::setPaused(SearchResult *search, bool paused)
QFutureWatcher<SearchResultItem> *watcher = m_watchers.key(search); QFutureWatcher<SearchResultItem> *watcher = m_watchers.key(search);
QTC_ASSERT(watcher, return); QTC_ASSERT(watcher, return);
if (!paused || watcher->isRunning()) // guard against pausing when the search is finished if (!paused || watcher->isRunning()) // guard against pausing when the search is finished
watcher->setPaused(paused); watcher->setSuspended(paused);
} }
void SymbolsFindFilter::findAll(const QString &txt, FindFlags findFlags) void SymbolsFindFilter::findAll(const QString &txt, FindFlags findFlags)

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

@@ -1048,7 +1048,7 @@ void FindReferences::cancel()
void FindReferences::setPaused(bool paused) void FindReferences::setPaused(bool paused)
{ {
if (!paused || m_watcher.isRunning()) // guard against pausing when the search is finished if (!paused || m_watcher.isRunning()) // guard against pausing when the search is finished
m_watcher.setPaused(paused); m_watcher.setSuspended(paused);
} }
void FindReferences::onReplaceButtonClicked(const QString &text, void FindReferences::onReplaceButtonClicked(const QString &text,

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

@@ -347,7 +347,7 @@ void BaseFileFind::runSearch(SearchResult *search)
connect(search, &SearchResult::canceled, watcher, &QFutureWatcherBase::cancel); connect(search, &SearchResult::canceled, watcher, &QFutureWatcherBase::cancel);
connect(search, &SearchResult::paused, watcher, [watcher](bool paused) { connect(search, &SearchResult::paused, watcher, [watcher](bool paused) {
if (!paused || watcher->isRunning()) // guard against pausing when the search is finished if (!paused || watcher->isRunning()) // guard against pausing when the search is finished
watcher->setPaused(paused); watcher->setSuspended(paused);
}); });
connect(watcher, &QFutureWatcherBase::resultReadyAt, search, [watcher, search](int index) { connect(watcher, &QFutureWatcherBase::resultReadyAt, search, [watcher, search](int index) {
search->addResults(watcher->resultAt(index), SearchResult::AddOrdered); search->addResults(watcher->resultAt(index), SearchResult::AddOrdered);