From 9388ab252ee62560f035c3deeccda187cbf173f8 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 11 Apr 2023 18:31:22 +0200
Subject: [PATCH] LocatorFiltersFilter: Use Acceptor for LocatorFilterEntry

Change-Id: I917ce346bf66cb18890d7d055501218d12a2c3ad
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 .../locator/locatorfiltersfilter.cpp          | 22 +++++--------------
 .../coreplugin/locator/locatorfiltersfilter.h |  3 ---
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
index b8cd9ef3007..b8c05aae97e 100644
--- a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
+++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp
@@ -60,8 +60,12 @@ QList<LocatorFilterEntry> LocatorFiltersFilter::matchesFor(QFutureInterface<Loca
     for (int i = 0; i < m_filterShortcutStrings.size(); ++i) {
         if (future.isCanceled())
             break;
-        LocatorFilterEntry filterEntry(this, m_filterShortcutStrings.at(i));
-        filterEntry.internalData = i;
+        const QString shortcutString = m_filterShortcutStrings.at(i);
+        LocatorFilterEntry filterEntry;
+        filterEntry.displayName = shortcutString;
+        filterEntry.acceptor = [shortcutString] {
+            return AcceptResult{shortcutString + ' ', int(shortcutString.size() + 1)};
+        };
         filterEntry.displayIcon = m_icon;
         filterEntry.extraInfo = m_filterDisplayNames.at(i);
         filterEntry.toolTip = m_filterDescriptions.at(i);
@@ -71,18 +75,4 @@ QList<LocatorFilterEntry> LocatorFiltersFilter::matchesFor(QFutureInterface<Loca
     return entries;
 }
 
-void LocatorFiltersFilter::accept(const LocatorFilterEntry &selection,
-                                  QString *newText, int *selectionStart, int *selectionLength) const
-{
-    Q_UNUSED(selectionLength)
-    bool ok;
-    int index = selection.internalData.toInt(&ok);
-    QTC_ASSERT(ok && index >= 0 && index < m_filterShortcutStrings.size(), return);
-    const QString shortcutString = m_filterShortcutStrings.at(index);
-    if (!shortcutString.isEmpty()) {
-        *newText = shortcutString + ' ';
-        *selectionStart = shortcutString.length() + 1;
-    }
-}
-
 } // Core::Internal
diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.h b/src/plugins/coreplugin/locator/locatorfiltersfilter.h
index f4679ec9c10..7ad19f8c4dd 100644
--- a/src/plugins/coreplugin/locator/locatorfiltersfilter.h
+++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.h
@@ -27,9 +27,6 @@ public:
     void prepareSearch(const QString &entry) override;
     QList<LocatorFilterEntry> matchesFor(QFutureInterface<LocatorFilterEntry> &future,
                                          const QString &entry) override;
-    void accept(const LocatorFilterEntry &selection,
-                QString *newText, int *selectionStart, int *selectionLength) const override;
-
 private:
     QStringList m_filterShortcutStrings;
     QStringList m_filterDisplayNames;