forked from qt-creator/qt-creator
SearchResult: Rename cancelled() into canceled()
Make it consistent with Qt American style. Change-Id: I01a70f282d654d23f2341352cf4f6fea22aa49fa Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -859,7 +859,7 @@ void ClangdClient::Private::findUsages(TextDocument *document,
|
|||||||
finishSearch(refData, false);
|
finishSearch(refData, false);
|
||||||
return;
|
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);
|
const auto refData = runningFindUsages.find(key);
|
||||||
if (refData == runningFindUsages.end())
|
if (refData == runningFindUsages.end())
|
||||||
return;
|
return;
|
||||||
@@ -1062,7 +1062,7 @@ void ClangdClient::Private::handleFindUsagesResult(quint64 key, const QList<Loca
|
|||||||
return;
|
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);
|
const auto refData = runningFindUsages.find(key);
|
||||||
if (refData == runningFindUsages.end())
|
if (refData == runningFindUsages.end())
|
||||||
return;
|
return;
|
||||||
|
@@ -486,7 +486,7 @@ void SearchResultWidget::continueAfterSizeWarning()
|
|||||||
void SearchResultWidget::cancelAfterSizeWarning()
|
void SearchResultWidget::cancelAfterSizeWarning()
|
||||||
{
|
{
|
||||||
m_infoBar.suppressInfo(Id(SIZE_WARNING_ID));
|
m_infoBar.suppressInfo(Id(SIZE_WARNING_ID));
|
||||||
emit cancelled();
|
emit canceled();
|
||||||
emit paused(false);
|
emit paused(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -513,7 +513,7 @@ void SearchResultWidget::cancel()
|
|||||||
if (m_infoBar.containsInfo(Id(SIZE_WARNING_ID)))
|
if (m_infoBar.containsInfo(Id(SIZE_WARNING_ID)))
|
||||||
cancelAfterSizeWarning();
|
cancelAfterSizeWarning();
|
||||||
else
|
else
|
||||||
emit cancelled();
|
emit canceled();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchResultWidget::searchAgain()
|
void SearchResultWidget::searchAgain()
|
||||||
|
@@ -100,7 +100,7 @@ signals:
|
|||||||
void replaceButtonClicked(const QString &replaceText, const QList<Core::SearchResultItem> &checkedItems, bool preserveCase);
|
void replaceButtonClicked(const QString &replaceText, const QList<Core::SearchResultItem> &checkedItems, bool preserveCase);
|
||||||
void replaceTextChanged(const QString &replaceText);
|
void replaceTextChanged(const QString &replaceText);
|
||||||
void searchAgainRequested();
|
void searchAgainRequested();
|
||||||
void cancelled();
|
void canceled();
|
||||||
void paused(bool paused);
|
void paused(bool paused);
|
||||||
void restarted();
|
void restarted();
|
||||||
void visibilityChanged(bool visible);
|
void visibilityChanged(bool visible);
|
||||||
|
@@ -752,7 +752,7 @@ SearchResult::SearchResult(SearchResultWidget *widget)
|
|||||||
this, &SearchResult::replaceButtonClicked);
|
this, &SearchResult::replaceButtonClicked);
|
||||||
connect(widget, &SearchResultWidget::replaceTextChanged,
|
connect(widget, &SearchResultWidget::replaceTextChanged,
|
||||||
this, &SearchResult::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::paused, this, &SearchResult::paused);
|
||||||
connect(widget, &SearchResultWidget::visibilityChanged,
|
connect(widget, &SearchResultWidget::visibilityChanged,
|
||||||
this, &SearchResult::visibilityChanged);
|
this, &SearchResult::visibilityChanged);
|
||||||
|
@@ -91,7 +91,7 @@ signals:
|
|||||||
void activated(const Core::SearchResultItem &item);
|
void activated(const Core::SearchResultItem &item);
|
||||||
void replaceButtonClicked(const QString &replaceText, const QList<Core::SearchResultItem> &checkedItems, bool preserveCase);
|
void replaceButtonClicked(const QString &replaceText, const QList<Core::SearchResultItem> &checkedItems, bool preserveCase);
|
||||||
void replaceTextChanged(const QString &replaceText);
|
void replaceTextChanged(const QString &replaceText);
|
||||||
void cancelled();
|
void canceled();
|
||||||
void paused(bool paused);
|
void paused(bool paused);
|
||||||
void visibilityChanged(bool visible);
|
void visibilityChanged(bool visible);
|
||||||
void countChanged(int count);
|
void countChanged(int count);
|
||||||
|
@@ -885,7 +885,7 @@ void CppFindReferences::createWatcher(const QFuture<CPlusPlus::Usage> &future, S
|
|||||||
connect(watcher, &QFutureWatcherBase::finished, search, [search, watcher]() {
|
connect(watcher, &QFutureWatcherBase::finished, search, [search, watcher]() {
|
||||||
search->finishSearch(watcher->isCanceled());
|
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) {
|
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->setPaused(paused);
|
||||||
|
@@ -109,7 +109,7 @@ void SymbolsFindFilter::findAll(const QString &txt, FindFlags findFlags)
|
|||||||
search->setSearchAgainSupported(true);
|
search->setSearchAgainSupported(true);
|
||||||
connect(search, &SearchResult::activated,
|
connect(search, &SearchResult::activated,
|
||||||
this, &SymbolsFindFilter::openEditor);
|
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::paused, this, &SymbolsFindFilter::setPaused);
|
||||||
connect(search, &SearchResult::searchAgainRequested, this, &SymbolsFindFilter::searchAgain);
|
connect(search, &SearchResult::searchAgainRequested, this, &SymbolsFindFilter::searchAgain);
|
||||||
connect(this, &IFindFilter::enabledChanged, search, &SearchResult::setSearchAgainEnabled);
|
connect(this, &IFindFilter::enabledChanged, search, &SearchResult::setSearchAgainEnabled);
|
||||||
|
@@ -1031,7 +1031,7 @@ void FindReferences::displayResults(int first, int last)
|
|||||||
[](const Core::SearchResultItem& item) {
|
[](const Core::SearchResultItem& item) {
|
||||||
Core::EditorManager::openEditorAtSearchResult(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);
|
connect(m_currentSearch.data(), &SearchResult::paused, this, &FindReferences::setPaused);
|
||||||
SearchResultWindow::instance()->popup(IOutputPane::Flags(IOutputPane::ModeSwitch | IOutputPane::WithFocus));
|
SearchResultWindow::instance()->popup(IOutputPane::Flags(IOutputPane::ModeSwitch | IOutputPane::WithFocus));
|
||||||
|
|
||||||
|
@@ -310,7 +310,7 @@ void BaseFileFind::runSearch(SearchResult *search)
|
|||||||
watcher->setPendingResultsLimit(1);
|
watcher->setPendingResultsLimit(1);
|
||||||
// search is deleted if it is removed from search panel
|
// search is deleted if it is removed from search panel
|
||||||
connect(search, &QObject::destroyed, watcher, &QFutureWatcherBase::cancel);
|
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) {
|
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->setPaused(paused);
|
||||||
|
Reference in New Issue
Block a user