From 48c2bc1ed79b49c20a009ee28c76b26f0b9b9aa1 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 19 Sep 2014 08:17:33 +0200 Subject: [PATCH] Locator: Fix local variable name Change-Id: I3803fbd6d99a4b2d113997f56ab8f05e5c169937 Reviewed-by: Nikolai Kosjar --- src/plugins/coreplugin/locator/locatorsearchutils.cpp | 8 ++++---- src/plugins/coreplugin/locator/locatorsearchutils.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/coreplugin/locator/locatorsearchutils.cpp b/src/plugins/coreplugin/locator/locatorsearchutils.cpp index 189449fc663..62bdc08f125 100644 --- a/src/plugins/coreplugin/locator/locatorsearchutils.cpp +++ b/src/plugins/coreplugin/locator/locatorsearchutils.cpp @@ -45,19 +45,19 @@ uint qHash(const Core::LocatorFilterEntry &entry) } // namespace Core -void Core::Internal::runSearch(QFutureInterface &entries, +void Core::Internal::runSearch(QFutureInterface &future, QList filters, QString searchText) { QSet alreadyAdded; const bool checkDuplicates = (filters.size() > 1); foreach (ILocatorFilter *filter, filters) { - if (entries.isCanceled()) + if (future.isCanceled()) break; - foreach (const LocatorFilterEntry &entry, filter->matchesFor(entries, searchText)) { + foreach (const LocatorFilterEntry &entry, filter->matchesFor(future, searchText)) { if (checkDuplicates && alreadyAdded.contains(entry)) continue; - entries.reportResult(entry); + future.reportResult(entry); if (checkDuplicates) alreadyAdded.insert(entry); } diff --git a/src/plugins/coreplugin/locator/locatorsearchutils.h b/src/plugins/coreplugin/locator/locatorsearchutils.h index 1abf03a8fd6..3d6b1c70390 100644 --- a/src/plugins/coreplugin/locator/locatorsearchutils.h +++ b/src/plugins/coreplugin/locator/locatorsearchutils.h @@ -35,7 +35,7 @@ namespace Core { namespace Internal { -void CORE_EXPORT runSearch(QFutureInterface &entries, +void CORE_EXPORT runSearch(QFutureInterface &future, QList filters, QString searchText);