diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp index 76201d09405..f43758bd034 100644 --- a/src/plugins/macros/macrolocatorfilter.cpp +++ b/src/plugins/macros/macrolocatorfilter.cpp @@ -73,50 +73,3 @@ LocatorMatcherTasks MacroLocatorFilter::matchers() }; return {{Sync(onSetup), storage}}; } - -QList MacroLocatorFilter::matchesFor(QFutureInterface &future, const QString &entry) -{ - Q_UNUSED(future) - QList goodEntries; - QList betterEntries; - - const Qt::CaseSensitivity entryCaseSensitivity = caseSensitivity(entry); - - const QMap ¯os = MacroManager::macros(); - - for (auto it = macros.cbegin(), end = macros.cend(); it != end; ++it) { - const QString displayName = it.key(); - const QString description = it.value()->description(); - - int index = displayName.indexOf(entry, 0, entryCaseSensitivity); - LocatorFilterEntry::HighlightInfo::DataType hDataType - = LocatorFilterEntry::HighlightInfo::DisplayName; - if (index < 0) { - index = description.indexOf(entry, 0, entryCaseSensitivity); - hDataType = LocatorFilterEntry::HighlightInfo::ExtraInfo; - } - - if (index >= 0) { - LocatorFilterEntry filterEntry; - filterEntry.displayName = displayName; - filterEntry.acceptor = [displayName] { - IEditor *editor = EditorManager::currentEditor(); - if (editor) - editor->widget()->setFocus(Qt::OtherFocusReason); - - MacroManager::instance()->executeMacro(displayName); - return AcceptResult(); - }; - filterEntry.displayIcon = m_icon; - filterEntry.extraInfo = description; - filterEntry.highlightInfo = LocatorFilterEntry::HighlightInfo(index, entry.length(), hDataType); - - if (index == 0) - betterEntries.append(filterEntry); - else - goodEntries.append(filterEntry); - } - } - betterEntries.append(goodEntries); - return betterEntries; -} diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h index 189cfcc6973..b6acc6d2c7f 100644 --- a/src/plugins/macros/macrolocatorfilter.h +++ b/src/plugins/macros/macrolocatorfilter.h @@ -5,23 +5,17 @@ #include -namespace Macros { -namespace Internal { +namespace Macros::Internal { class MacroLocatorFilter : public Core::ILocatorFilter { - Q_OBJECT - public: MacroLocatorFilter(); - QList matchesFor(QFutureInterface &future, - const QString &entry) override; private: Core::LocatorMatcherTasks matchers() final; const QIcon m_icon; }; -} // namespace Internal -} // namespace Macros +} // namespace Macros::Internal