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

SearchResult: Rename cancelled() into canceled()

Browse Source 
Make it consistent with Qt American style.

Change-Id: I01a70f282d654d23f2341352cf4f6fea22aa49fa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2022-07-20 12:46:13 +02:00
parent ad35f08498
commit cfd002ebf0
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -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 QList<Loca
return;
}
QObject::connect(refData->search, &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;

4
src/plugins/coreplugin/find/searchresultwidget.cpp
View File

@@ -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()

2
src/plugins/coreplugin/find/searchresultwidget.h
View File

@@ -100,7 +100,7 @@ signals:
void replaceButtonClicked(const QString &replaceText, const QList<Core::SearchResultItem> &checkedItems, bool preserveCase);
void replaceTextChanged(const QString &replaceText);
void searchAgainRequested();
void cancelled();
void canceled();
void paused(bool paused);
void restarted();
void visibilityChanged(bool visible);

2
src/plugins/coreplugin/find/searchresultwindow.cpp
View File

@@ -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);

2
src/plugins/coreplugin/find/searchresultwindow.h
View File

@@ -91,7 +91,7 @@ signals:
void activated(const Core::SearchResultItem &item);
void replaceButtonClicked(const QString &replaceText, const QList<Core::SearchResultItem> &checkedItems, bool preserveCase);
void replaceTextChanged(const QString &replaceText);
void cancelled();
void canceled();
void paused(bool paused);
void visibilityChanged(bool visible);
void countChanged(int count);

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

@@ -885,7 +885,7 @@ void CppFindReferences::createWatcher(const QFuture<CPlusPlus::Usage> &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);

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

@@ -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);

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

@@ -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));

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

@@ -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);