ILocatorFilter: Refactor ILocatorFilter::matchers() function

Introduce LocatorStorage::storage() method, to be used
from the bodies of locator task handlers.

Replace the return value of ILocatorFilter::matchers()
with a list of ExecutableItems.

Change-Id: I467bb9f217465af74a017095d4fffdf74c4ba7bd
Reviewed-by: Eike Ziller <[email protected]>

1 files changed, 4 insertions, 7 deletions

diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
index c6f8dfa4fd0..21915e7be92 100644
--- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp
+++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
@@ -12,6 +12,7 @@
 
 using namespace Core;
 using namespace QmlJSTools::Internal;
+using namespace Tasking;
 using namespace Utils;
 
 Q_DECLARE_METATYPE(LocatorData::Entry)
@@ -74,13 +75,9 @@ static void matches(QPromise<void> &promise, const LocatorStorage &storage,
 
 LocatorMatcherTasks QmlJSFunctionsFilter::matchers()
 {
-    using namespace Tasking;
-
-    Storage<LocatorStorage> storage;
-
-    const auto onSetup = [storage, entries = m_data->entries()](Async<void> &async) {
-        async.setConcurrentCallData(matches, *storage, entries);
+    const auto onSetup = [entries = m_data->entries()](Async<void> &async) {
+        async.setConcurrentCallData(matches, *LocatorStorage::storage(), entries);
     };
 
-    return {{AsyncTask<void>(onSetup), storage}};
+    return {AsyncTask<void>(onSetup)};
 }