1 files changed, 6 insertions, 69 deletions

diff --git a/src/assistant/assistant/helpenginewrapper.cpp b/src/assistant/assistant/helpenginewrapper.cpp
index 3aef5bb99..17e4bde8c 100644
--- a/src/assistant/assistant/helpenginewrapper.cpp
+++ b/src/assistant/assistant/helpenginewrapper.cpp
@@ -39,13 +39,13 @@
 #include <QtCore/QTimer>
 #include <QtHelp/QHelpContentModel>
 #include <QtHelp/QHelpEngine>
+#include <QtHelp/QHelpFilterEngine>
 #include <QtHelp/QHelpIndexModel>
 #include <QtHelp/QHelpSearchEngine>
 
 QT_BEGIN_NAMESPACE
 
 namespace {
-    const QString Unfiltered;
     const QString AppFontKey(QLatin1String("appFont"));
     const QString AppWritingSystemKey(QLatin1String("appWritingSystem"));
     const QString BookmarksKey(QLatin1String("Bookmarks"));
@@ -104,14 +104,6 @@ private:
     QMap<QString, RecentSignal> m_recentQchUpdates;
 };
 
-const QString HelpEngineWrapper::TrUnfiltered()
-{
-    static QString s;
-    if (s.isEmpty())
-        s = HelpEngineWrapper::tr("Unfiltered");
-    return s;
-}
-
 HelpEngineWrapper *HelpEngineWrapper::helpEngineWrapper = nullptr;
 
 HelpEngineWrapper &HelpEngineWrapper::instance(const QString &collectionFile)
@@ -154,8 +146,6 @@ HelpEngineWrapper::HelpEngineWrapper(const QString &collectionFile)
             this, &HelpEngineWrapper::documentationRemoved);
     connect(d, &HelpEngineWrapperPrivate::documentationUpdated,
             this, &HelpEngineWrapper::documentationUpdated);
-    connect(d->m_helpEngine, &QHelpEngineCore::currentFilterChanged,
-            this, &HelpEngineWrapper::handleCurrentFilterChanged);
     connect(d->m_helpEngine, &QHelpEngineCore::setupFinished,
             this, &HelpEngineWrapper::setupFinished);
 }
@@ -259,43 +249,6 @@ bool HelpEngineWrapper::setupData()
     return d->m_helpEngine->setupData();
 }
 
-bool HelpEngineWrapper::addCustomFilter(const QString &filterName,
-                                        const QStringList &attributes)
-{
-    TRACE_OBJ
-    return d->m_helpEngine->addCustomFilter(filterName, attributes);
-}
-
-bool HelpEngineWrapper::removeCustomFilter(const QString &filterName)
-{
-    TRACE_OBJ
-    return d->m_helpEngine->removeCustomFilter(filterName);
-}
-
-void HelpEngineWrapper::setCurrentFilter(const QString &currentFilter)
-{
-    TRACE_OBJ
-    const QString &filter
-            = currentFilter == TrUnfiltered() ? Unfiltered : currentFilter;
-    d->m_helpEngine->setCurrentFilter(filter);
-}
-
-const QString HelpEngineWrapper::currentFilter() const
-{
-    TRACE_OBJ
-    const QString &filter = d->m_helpEngine->currentFilter();
-    return filter == Unfiltered ? TrUnfiltered() : filter;
-}
-
-const QStringList HelpEngineWrapper::customFilters() const
-{
-    TRACE_OBJ
-    QStringList filters = d->m_helpEngine->customFilters();
-    filters.removeOne(Unfiltered);
-    filters.prepend(TrUnfiltered());
-    return filters;
-}
-
 QUrl HelpEngineWrapper::findFile(const QUrl &url) const
 {
     TRACE_OBJ
@@ -314,22 +267,15 @@ QMap<QString, QUrl> HelpEngineWrapper::linksForIdentifier(const QString &id) con
     return d->m_helpEngine->linksForIdentifier(id);
 }
 
-const QStringList HelpEngineWrapper::filterAttributes() const
-{
-    TRACE_OBJ
-    return d->m_helpEngine->filterAttributes();
-}
-
-const QStringList HelpEngineWrapper::filterAttributes(const QString &filterName) const
+QString HelpEngineWrapper::error() const
 {
     TRACE_OBJ
-    return d->m_helpEngine->filterAttributes(filterName);
+    return d->m_helpEngine->error();
 }
 
-QString HelpEngineWrapper::error() const
+QHelpFilterEngine *HelpEngineWrapper::filterEngine() const
 {
-    TRACE_OBJ
-    return d->m_helpEngine->error();
+    return d->m_helpEngine->filterEngine();
 }
 
 const QStringList HelpEngineWrapper::qtDocInfo(const QString &component) const
@@ -694,14 +640,6 @@ void HelpEngineWrapper::setBrowserWritingSystem(QFontDatabase::WritingSystem sys
     d->m_helpEngine->setCustomValue(BrowserWritingSystemKey, system);
 }
 
-void HelpEngineWrapper::handleCurrentFilterChanged(const QString &filter)
-{
-    TRACE_OBJ
-    const QString &filterToReport
-            = filter == Unfiltered ? TrUnfiltered() : filter;
-    emit currentFilterChanged(filterToReport);
-}
-
 bool HelpEngineWrapper::showTabs() const
 {
     TRACE_OBJ
@@ -753,9 +691,8 @@ HelpEngineWrapperPrivate::HelpEngineWrapperPrivate(const QString &collectionFile
       m_qchWatcher(new QFileSystemWatcher(this))
 {
     TRACE_OBJ
-    if (!m_helpEngine->customFilters().contains(Unfiltered))
-        m_helpEngine->addCustomFilter(Unfiltered, QStringList());
     initFileSystemWatchers();
+    m_helpEngine->setUsesFilterEngine(true);
 }
 
 void HelpEngineWrapperPrivate::initFileSystemWatchers()