diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp index 27d3f57b1b1..b466aa25373 100644 --- a/src/plugins/clangcodemodel/clangdclient.cpp +++ b/src/plugins/clangcodemodel/clangdclient.cpp @@ -859,7 +859,7 @@ void ClangdClient::Private::findUsages(TextDocument *document, finishSearch(refData, false); return; } - QObject::connect(refData.search, &SearchResult::cancelled, q, [this, requestId, key = refData.key] { + QObject::connect(refData.search, &SearchResult::canceled, q, [this, requestId, key = refData.key] { const auto refData = runningFindUsages.find(key); if (refData == runningFindUsages.end()) return; @@ -1062,7 +1062,7 @@ void ClangdClient::Private::handleFindUsagesResult(quint64 key, const QListsearch, &SearchResult::cancelled, q, [this, key] { + QObject::connect(refData->search, &SearchResult::canceled, q, [this, key] { const auto refData = runningFindUsages.find(key); if (refData == runningFindUsages.end()) return; diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp index e9f2319038f..d45f4fbc99c 100644 --- a/src/plugins/coreplugin/find/searchresultwidget.cpp +++ b/src/plugins/coreplugin/find/searchresultwidget.cpp @@ -486,7 +486,7 @@ void SearchResultWidget::continueAfterSizeWarning() void SearchResultWidget::cancelAfterSizeWarning() { m_infoBar.suppressInfo(Id(SIZE_WARNING_ID)); - emit cancelled(); + emit canceled(); emit paused(false); } @@ -513,7 +513,7 @@ void SearchResultWidget::cancel() if (m_infoBar.containsInfo(Id(SIZE_WARNING_ID))) cancelAfterSizeWarning(); else - emit cancelled(); + emit canceled(); } void SearchResultWidget::searchAgain() diff --git a/src/plugins/coreplugin/find/searchresultwidget.h b/src/plugins/coreplugin/find/searchresultwidget.h index a576c2a630c..90e4cb43f7d 100644 --- a/src/plugins/coreplugin/find/searchresultwidget.h +++ b/src/plugins/coreplugin/find/searchresultwidget.h @@ -100,7 +100,7 @@ signals: void replaceButtonClicked(const QString &replaceText, const QList &checkedItems, bool preserveCase); void replaceTextChanged(const QString &replaceText); void searchAgainRequested(); - void cancelled(); + void canceled(); void paused(bool paused); void restarted(); void visibilityChanged(bool visible); diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index 7886ec3f7c7..752bfaa0b61 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/src/plugins/coreplugin/find/searchresultwindow.cpp @@ -752,7 +752,7 @@ SearchResult::SearchResult(SearchResultWidget *widget) this, &SearchResult::replaceButtonClicked); connect(widget, &SearchResultWidget::replaceTextChanged, this, &SearchResult::replaceTextChanged); - connect(widget, &SearchResultWidget::cancelled, this, &SearchResult::cancelled); + connect(widget, &SearchResultWidget::canceled, this, &SearchResult::canceled); connect(widget, &SearchResultWidget::paused, this, &SearchResult::paused); connect(widget, &SearchResultWidget::visibilityChanged, this, &SearchResult::visibilityChanged); diff --git a/src/plugins/coreplugin/find/searchresultwindow.h b/src/plugins/coreplugin/find/searchresultwindow.h index c7f4af7c569..194aae07f7e 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.h +++ b/src/plugins/coreplugin/find/searchresultwindow.h @@ -91,7 +91,7 @@ signals: void activated(const Core::SearchResultItem &item); void replaceButtonClicked(const QString &replaceText, const QList &checkedItems, bool preserveCase); void replaceTextChanged(const QString &replaceText); - void cancelled(); + void canceled(); void paused(bool paused); void visibilityChanged(bool visible); void countChanged(int count); diff --git a/src/plugins/cppeditor/cppfindreferences.cpp b/src/plugins/cppeditor/cppfindreferences.cpp index 1b4f78bef97..90bfae8b29a 100644 --- a/src/plugins/cppeditor/cppfindreferences.cpp +++ b/src/plugins/cppeditor/cppfindreferences.cpp @@ -885,7 +885,7 @@ void CppFindReferences::createWatcher(const QFuture &future, S connect(watcher, &QFutureWatcherBase::finished, search, [search, watcher]() { search->finishSearch(watcher->isCanceled()); }); - connect(search, &SearchResult::cancelled, watcher, [watcher]() { watcher->cancel(); }); + connect(search, &SearchResult::canceled, watcher, [watcher]() { watcher->cancel(); }); connect(search, &SearchResult::paused, watcher, [watcher](bool paused) { if (!paused || watcher->isRunning()) // guard against pausing when the search is finished watcher->setPaused(paused); diff --git a/src/plugins/cppeditor/symbolsfindfilter.cpp b/src/plugins/cppeditor/symbolsfindfilter.cpp index 05e16624a15..10f11022397 100644 --- a/src/plugins/cppeditor/symbolsfindfilter.cpp +++ b/src/plugins/cppeditor/symbolsfindfilter.cpp @@ -109,7 +109,7 @@ void SymbolsFindFilter::findAll(const QString &txt, FindFlags findFlags) search->setSearchAgainSupported(true); connect(search, &SearchResult::activated, this, &SymbolsFindFilter::openEditor); - connect(search, &SearchResult::cancelled, this, &SymbolsFindFilter::cancel); + connect(search, &SearchResult::canceled, this, &SymbolsFindFilter::cancel); connect(search, &SearchResult::paused, this, &SymbolsFindFilter::setPaused); connect(search, &SearchResult::searchAgainRequested, this, &SymbolsFindFilter::searchAgain); connect(this, &IFindFilter::enabledChanged, search, &SearchResult::setSearchAgainEnabled); diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp index 89695ed73d4..4fad73b1ee5 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.cpp +++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp @@ -1031,7 +1031,7 @@ void FindReferences::displayResults(int first, int last) [](const Core::SearchResultItem& item) { Core::EditorManager::openEditorAtSearchResult(item); }); - connect(m_currentSearch.data(), &SearchResult::cancelled, this, &FindReferences::cancel); + connect(m_currentSearch.data(), &SearchResult::canceled, this, &FindReferences::cancel); connect(m_currentSearch.data(), &SearchResult::paused, this, &FindReferences::setPaused); SearchResultWindow::instance()->popup(IOutputPane::Flags(IOutputPane::ModeSwitch | IOutputPane::WithFocus)); diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index f0fe19cc349..a202f7c832e 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -310,7 +310,7 @@ void BaseFileFind::runSearch(SearchResult *search) watcher->setPendingResultsLimit(1); // search is deleted if it is removed from search panel connect(search, &QObject::destroyed, watcher, &QFutureWatcherBase::cancel); - connect(search, &SearchResult::cancelled, watcher, &QFutureWatcherBase::cancel); + connect(search, &SearchResult::canceled, watcher, &QFutureWatcherBase::cancel); connect(search, &SearchResult::paused, watcher, [watcher](bool paused) { if (!paused || watcher->isRunning()) // guard against pausing when the search is finished watcher->setPaused(paused);