QtHelp: Merge QHelpSearchIndexReaderDefault with QHelpSearchIndexReader

Task-number: QTBUG-122025
Change-Id: Ib2447397479cd4d40170167bf2efbbe5f1e5ef39
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/assistant/help/qhelpsearchengine.cpp b/src/assistant/help/qhelpsearchengine.cpp
index 1e10fa4ae..549c5d692 100644
--- a/src/assistant/help/qhelpsearchengine.cpp
+++ b/src/assistant/help/qhelpsearchengine.cpp
@@ -7,7 +7,6 @@
 #include "qhelpsearchresultwidget.h"
 
 #include "qhelpsearchindexreader_p.h"
-#include "qhelpsearchindexreader_default_p.h"
 #include "qhelpsearchindexwriter_default_p.h"
 
 #include <QtCore/qdir.h>
@@ -18,6 +17,7 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace fulltextsearch;
 using namespace fulltextsearch::qt;
 
 class QHelpSearchResultData : public QSharedData
@@ -184,10 +184,10 @@ private:
             return;
 
         if (!indexReader) {
-            indexReader = new QHelpSearchIndexReaderDefault();
-            connect(indexReader, &fulltextsearch::QHelpSearchIndexReader::searchingStarted,
+            indexReader = new QHelpSearchIndexReader;
+            connect(indexReader, &QHelpSearchIndexReader::searchingStarted,
                     this, &QHelpSearchEnginePrivate::searchingStarted);
-            connect(indexReader, &fulltextsearch::QHelpSearchIndexReader::searchingFinished,
+            connect(indexReader, &QHelpSearchIndexReader::searchingFinished,
                     this, &QHelpSearchEnginePrivate::searchingFinished);
         }
 
@@ -223,7 +223,7 @@ private:
     QHelpSearchQueryWidget *queryWidget = nullptr;
     QHelpSearchResultWidget *resultWidget = nullptr;
 
-    fulltextsearch::QHelpSearchIndexReader *indexReader = nullptr;
+    QHelpSearchIndexReader *indexReader = nullptr;
     QHelpSearchIndexWriter *indexWriter = nullptr;
 
     QPointer<QHelpEngineCore> helpEngine;