From 6235ae0bc0f53c66a782fa04fb82dc27eb55a064 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 21 Sep 2018 15:05:57 +0200
Subject: [PATCH] Help: Remove usage of deprecated API

This follows the same outline as
qttools 256bbc4f139036a780a63b80af8bb461a77d333a

Change-Id: Iffe1f7a8d11ef9d20ec567fd222ee5279b56c765
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/help/searchwidget.cpp | 42 ++-----------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp
index a605e0958a0..2f3047064fa 100644
--- a/src/plugins/help/searchwidget.cpp
+++ b/src/plugins/help/searchwidget.cpp
@@ -164,28 +164,7 @@ void SearchWidget::showEvent(QShowEvent *event)
 
 void SearchWidget::search() const
 {
-    static const QStringList charsToEscapeList({
-        "\\", "+", "-", "!", "(", ")", ":", "^", "[", "]", "{", "}", "~"
-    });
-
-    static const QString escapeChar("\\");
-    static const QRegExp regExp("[\\+\\-\\!\\(\\)\\^\\[\\]\\{\\}~:]");
-
-    QList<QHelpSearchQuery> escapedQueries;
-    const QList<QHelpSearchQuery> queries = searchEngine->queryWidget()->query();
-    foreach (const QHelpSearchQuery &query, queries) {
-        QHelpSearchQuery escapedQuery;
-        escapedQuery.fieldName = query.fieldName;
-        foreach (QString word, query.wordList) {
-            if (word.contains(regExp)) {
-                foreach (const QString &charToEscape, charsToEscapeList)
-                    word.replace(charToEscape, escapeChar + charToEscape);
-            }
-            escapedQuery.wordList.append(word);
-        }
-        escapedQueries.append(escapedQuery);
-    }
-    searchEngine->search(escapedQueries);
+    searchEngine->search(searchEngine->queryWidget()->searchInput());
 }
 
 void SearchWidget::searchingStarted()
@@ -286,24 +265,7 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
 
 QStringList SearchWidget::currentSearchTerms() const
 {
-    QList<QHelpSearchQuery> queryList = searchEngine->query();
-
-    QStringList terms;
-    foreach (const QHelpSearchQuery &query, queryList) {
-        switch (query.fieldName) {
-        case QHelpSearchQuery::ALL:
-        case QHelpSearchQuery::PHRASE:
-        case QHelpSearchQuery::DEFAULT:
-        case QHelpSearchQuery::ATLEAST: {
-                foreach (QString term, query.wordList)
-                    terms.append(term.remove(QLatin1Char('"')));
-            }
-            break;
-        default:
-            break;
-        }
-    }
-    return terms;
+    return searchEngine->searchInput().split(QRegExp("\\W+"), QString::SkipEmptyParts);
 }
 
 // #pragma mark -- SearchSideBarItem