1 files changed, 15 insertions, 7 deletions

diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 9542a457c4..209703c607 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -51,7 +51,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
-#include <coreplugin/id.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
@@ -108,7 +107,7 @@ class HelpPluginPrivate : public QObject
 public:
     HelpPluginPrivate();
 
-    void modeChanged(Core::Id mode, Core::Id old);
+    void modeChanged(Utils::Id mode, Utils::Id old);
 
     void requestContextHelp();
     void showContextHelp(const HelpItem &contextHelp);
@@ -116,7 +115,7 @@ public:
     void activateContents();
 
     void saveExternalWindowSettings();
-    void showLinksInCurrentViewer(const QMap<QString, QUrl> &links, const QString &key);
+    void showLinksInCurrentViewer(const QMultiMap<QString, QUrl> &links, const QString &key);
 
     void setupHelpEngineIfNeeded();
 
@@ -124,7 +123,10 @@ public:
 
     void slotSystemInformation();
 
+#ifndef HELP_NEW_FILTER_ENGINE
     void resetFilter();
+#endif
+
     static void activateHelpMode() { ModeManager::activateMode(Constants::ID_MODE_HELP); }
     static bool canShowHelpSideBySide();
 
@@ -314,6 +316,8 @@ ExtensionSystem::IPlugin::ShutdownFlag HelpPlugin::aboutToShutdown()
     return SynchronousShutdown;
 }
 
+#ifndef HELP_NEW_FILTER_ENGINE
+
 void HelpPluginPrivate::resetFilter()
 {
     const QString &filterInternal = QString::fromLatin1("Qt Creator %1.%2.%3")
@@ -348,6 +352,8 @@ void HelpPluginPrivate::resetFilter()
             LocalHelpManager::instance(), &LocalHelpManager::updateFilterModel);
 }
 
+#endif
+
 void HelpPluginPrivate::saveExternalWindowSettings()
 {
     if (!m_externalWindow)
@@ -366,7 +372,7 @@ HelpWidget *HelpPluginPrivate::createHelpWidget(const Context &context, HelpWidg
             &LocalHelpManager::returnOnCloseChanged,
             widget,
             &HelpWidget::updateCloseButton);
-    connect(widget, &HelpWidget::closeButtonClicked, this, [this, widget] {
+    connect(widget, &HelpWidget::closeButtonClicked, this, [widget] {
         if (widget->widgetStyle() == HelpWidget::SideBarWidget)
             RightPaneWidget::instance()->setShown(false);
         else if (widget->viewerCount() == 1 && LocalHelpManager::returnOnClose())
@@ -436,7 +442,7 @@ HelpWidget *HelpPlugin::modeHelpWidget()
     return dd->m_centralWidget;
 }
 
-void HelpPluginPrivate::showLinksInCurrentViewer(const QMap<QString, QUrl> &links, const QString &key)
+void HelpPluginPrivate::showLinksInCurrentViewer(const QMultiMap<QString, QUrl> &links, const QString &key)
 {
     if (links.size() < 1)
         return;
@@ -444,7 +450,7 @@ void HelpPluginPrivate::showLinksInCurrentViewer(const QMap<QString, QUrl> &link
     widget->showLinks(links, key);
 }
 
-void HelpPluginPrivate::modeChanged(Core::Id mode, Core::Id old)
+void HelpPluginPrivate::modeChanged(Utils::Id mode, Utils::Id old)
 {
     Q_UNUSED(old)
     if (mode == m_mode.id()) {
@@ -577,7 +583,7 @@ void HelpPluginPrivate::showContextHelp(const HelpItem &contextHelp)
     } else if (links.size() == 1 && !contextHelp.isFuzzyMatch()) {
         showHelpUrl(links.front().second, LocalHelpManager::contextHelpOption());
     } else {
-        QMap<QString, QUrl> map;
+        QMultiMap<QString, QUrl> map;
         for (const HelpItem::Link &link : links)
             map.insert(link.first, link.second);
         auto tc = new TopicChooser(ICore::dialogParent(), contextHelp.keyword(), map);
@@ -683,7 +689,9 @@ void HelpPluginPrivate::doSetupIfNeeded()
 {
     LocalHelpManager::setupGuiHelpEngine();
     if (m_setupNeeded) {
+#ifndef HELP_NEW_FILTER_ENGINE
         resetFilter();
+#endif
         m_setupNeeded = false;
         m_centralWidget->openPagesManager()->setupInitialPages();
         LocalHelpManager::bookmarkManager().setupBookmarkModels();