diff --git a/src/plugins/bookmarks/bookmarkfilter.cpp b/src/plugins/bookmarks/bookmarkfilter.cpp index 220d5d308b0..e8322877c27 100644 --- a/src/plugins/bookmarks/bookmarkfilter.cpp +++ b/src/plugins/bookmarks/bookmarkfilter.cpp @@ -31,10 +31,7 @@ LocatorMatcherTasks BookmarkFilter::matchers() TreeStorage storage; - const auto onSetup = [=] { - storage->reportOutput(match(storage->input())); - return true; - }; + const auto onSetup = [=] { storage->reportOutput(match(storage->input())); }; return {{Sync(onSetup), storage}}; } diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp index e89db528d70..589a30d1ae2 100644 --- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp @@ -73,7 +73,6 @@ static LocatorMatcherTasks cmakeMatchers(const CMakeTargetLocatorFilter::BuildAc } } storage->reportOutput(entries); - return true; }; return {{Sync(onSetup), storage}}; } diff --git a/src/plugins/coreplugin/locator/commandlocator.cpp b/src/plugins/coreplugin/locator/commandlocator.cpp index 681c9e1281d..9d076c13060 100644 --- a/src/plugins/coreplugin/locator/commandlocator.cpp +++ b/src/plugins/coreplugin/locator/commandlocator.cpp @@ -89,7 +89,6 @@ LocatorMatcherTasks CommandLocator::matchers() } } storage->reportOutput(betterEntries + goodEntries); - return true; }; return {{Sync(onSetup), storage}}; } diff --git a/src/plugins/coreplugin/locator/executefilter.cpp b/src/plugins/coreplugin/locator/executefilter.cpp index 3d1bfb51ed4..3419c117adb 100644 --- a/src/plugins/coreplugin/locator/executefilter.cpp +++ b/src/plugins/coreplugin/locator/executefilter.cpp @@ -71,7 +71,6 @@ LocatorMatcherTasks ExecuteFilter::matchers() } } storage->reportOutput(entries + others); - return true; }; return {{Sync(onSetup), storage}}; } diff --git a/src/plugins/coreplugin/locator/externaltoolsfilter.cpp b/src/plugins/coreplugin/locator/externaltoolsfilter.cpp index d62a9903071..c3d2d1705c2 100644 --- a/src/plugins/coreplugin/locator/externaltoolsfilter.cpp +++ b/src/plugins/coreplugin/locator/externaltoolsfilter.cpp @@ -79,7 +79,6 @@ LocatorMatcherTasks ExternalToolsFilter::matchers() storage->reportOutput(bestEntries + betterEntries + goodEntries + LocatorFilterEntries{configEntry}); - return true; }; return {{Sync(onSetup), storage}}; } diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp index 4ac12091ffc..a602be27848 100644 --- a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp +++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp @@ -33,9 +33,9 @@ LocatorMatcherTasks LocatorFiltersFilter::matchers() TreeStorage storage; - const auto onSetup = [=] { + const auto onSetup = [storage, icon = m_icon] { if (!storage->input().isEmpty()) - return true; + return; QMap uniqueFilters; const QList allFilters = Locator::filters(); @@ -53,7 +53,7 @@ LocatorMatcherTasks LocatorFiltersFilter::matchers() entry.acceptor = [shortcutString] { return AcceptResult{shortcutString + ' ', int(shortcutString.size() + 1)}; }; - entry.displayIcon = m_icon; + entry.displayIcon = icon; entry.extraInfo = filter->displayName(); entry.toolTip = filter->description(); QString keyboardShortcut; @@ -64,7 +64,6 @@ LocatorMatcherTasks LocatorFiltersFilter::matchers() } } storage->reportOutput(entries); - return true; }; return {{Sync(onSetup), storage}}; } diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp index 9cfccb8ca67..2fd479568ab 100644 --- a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp +++ b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp @@ -29,7 +29,7 @@ OpenDocumentsFilter::OpenDocumentsFilter() setPriority(High); setDefaultIncludedByDefault(true); // TODO: Remove the refresh recipe - setRefreshRecipe(Tasking::Sync([this] { refreshInternally(); return true; })); + setRefreshRecipe(Tasking::Sync([this] { refreshInternally(); })); connect(DocumentModel::model(), &QAbstractItemModel::dataChanged, this, &OpenDocumentsFilter::slotDataChanged); diff --git a/src/plugins/coreplugin/locator/urllocatorfilter.cpp b/src/plugins/coreplugin/locator/urllocatorfilter.cpp index 2ab1d6f62cc..f2d22ee9083 100644 --- a/src/plugins/coreplugin/locator/urllocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/urllocatorfilter.cpp @@ -187,9 +187,7 @@ LocatorMatcherTasks UrlLocatorFilter::matchers() entries.append(entry); } storage->reportOutput(entries); - return true; }; - return {{Sync(onSetup), storage}}; } diff --git a/src/plugins/cppeditor/cppincludesfilter.cpp b/src/plugins/cppeditor/cppincludesfilter.cpp index 1c9cb298d4b..c4588bf78c7 100644 --- a/src/plugins/cppeditor/cppincludesfilter.cpp +++ b/src/plugins/cppeditor/cppincludesfilter.cpp @@ -107,7 +107,7 @@ CppIncludesFilter::CppIncludesFilter() "\"+\" or \":\" to jump to the column number as well.")); setDefaultShortcutString("ai"); setDefaultIncludedByDefault(true); - setRefreshRecipe(Tasking::Sync([this] { invalidateCache(); return true; })); + setRefreshRecipe(Tasking::Sync([this] { invalidateCache(); })); setPriority(ILocatorFilter::Low); connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::fileListChanged, diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp index 4c4b5be0251..a55cf0e6504 100644 --- a/src/plugins/help/helpindexfilter.cpp +++ b/src/plugins/help/helpindexfilter.cpp @@ -30,7 +30,7 @@ HelpIndexFilter::HelpIndexFilter() setDescription(Tr::tr("Locates help topics, for example in the Qt documentation.")); setDefaultIncludedByDefault(false); setDefaultShortcutString("?"); - setRefreshRecipe(Utils::Tasking::Sync([this] { invalidateCache(); return true; })); + setRefreshRecipe(Utils::Tasking::Sync([this] { invalidateCache(); })); m_icon = Utils::Icons::BOOKMARK.icon(); connect(Core::HelpManager::Signals::instance(), &Core::HelpManager::Signals::setupFinished, diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp index dacb522f266..76201d09405 100644 --- a/src/plugins/macros/macrolocatorfilter.cpp +++ b/src/plugins/macros/macrolocatorfilter.cpp @@ -70,9 +70,7 @@ LocatorMatcherTasks MacroLocatorFilter::matchers() } } storage->reportOutput(betterEntries + goodEntries); - return true; }; - return {{Sync(onSetup), storage}}; } diff --git a/src/plugins/projectexplorer/allprojectsfilter.cpp b/src/plugins/projectexplorer/allprojectsfilter.cpp index d89e111150d..f4f9604b278 100644 --- a/src/plugins/projectexplorer/allprojectsfilter.cpp +++ b/src/plugins/projectexplorer/allprojectsfilter.cpp @@ -25,7 +25,7 @@ AllProjectsFilter::AllProjectsFilter() "\"+\" or \":\" to jump to the column number as well.")); setDefaultShortcutString("a"); setDefaultIncludedByDefault(true); - setRefreshRecipe(Tasking::Sync([this] { invalidateCache(); return true; })); + setRefreshRecipe(Tasking::Sync([this] { invalidateCache(); })); connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::fileListChanged, this, &AllProjectsFilter::invalidateCache); diff --git a/src/plugins/projectexplorer/currentprojectfilter.cpp b/src/plugins/projectexplorer/currentprojectfilter.cpp index c8d39d5403d..3d41eccee59 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.cpp +++ b/src/plugins/projectexplorer/currentprojectfilter.cpp @@ -25,7 +25,7 @@ CurrentProjectFilter::CurrentProjectFilter() "\"+\" or \":\" to jump to the column number as well.")); setDefaultShortcutString("p"); setDefaultIncludedByDefault(false); - setRefreshRecipe(Tasking::Sync([this] { invalidateCache(); return true; })); + setRefreshRecipe(Tasking::Sync([this] { invalidateCache(); })); connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged, this, &CurrentProjectFilter::currentProjectChanged); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index f0ec7269ae9..a48953623c0 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -4421,7 +4421,7 @@ static LocatorMatcherTasks runConfigurationMatchers( const QString input = storage->input(); const Target *target = ProjectManager::startupTarget(); if (!target) - return true; + return; LocatorFilterEntries entries; for (auto rc : target->runConfigurations()) { @@ -4439,7 +4439,6 @@ static LocatorMatcherTasks runConfigurationMatchers( } } storage->reportOutput(entries); - return true; }; return {{Sync(onSetup), storage}}; } diff --git a/src/plugins/texteditor/linenumberfilter.cpp b/src/plugins/texteditor/linenumberfilter.cpp index 1a7003877ee..cec55ecbffa 100644 --- a/src/plugins/texteditor/linenumberfilter.cpp +++ b/src/plugins/texteditor/linenumberfilter.cpp @@ -31,7 +31,7 @@ LocatorMatcherTasks LineNumberFilter::matchers() TreeStorage storage; - const auto onSetup = [=] { + const auto onSetup = [storage] { const QStringList lineAndColumn = storage->input().split(':'); int sectionCount = lineAndColumn.size(); int line = 0; @@ -42,7 +42,7 @@ LocatorMatcherTasks LineNumberFilter::matchers() if (ok && sectionCount > 1) column = lineAndColumn.at(1).toInt(&ok); if (!ok) - return true; + return; if (EditorManager::currentEditor() && (line > 0 || column > 0)) { QString text; if (line > 0 && column > 0) @@ -64,7 +64,6 @@ LocatorMatcherTasks LineNumberFilter::matchers() }; storage->reportOutput({entry}); } - return true; }; return {{Sync(onSetup), storage}}; }