GIT_SILENT: minor qstring optimization

[dolphin.git] / src / search / dolphinsearchbox.cpp

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 0ab4d86cdd55fe97b7b6b94add2836bc66684496..f3dd204626a77cd54f99ca34a2e41b3a19f7e0aa 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -21,50 +21,46 @@
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"

+#include "panels/places/placesitemmodel.h"

 
 

-#include <KIcon>
-#include <KLineEdit>
-#include <KLocale>
+#include <KLocalizedString>
+#include <KNS3/KMoreToolsMenuFactory>

 #include <KSeparator>
 #include <KSeparator>

-#include <KGlobalSettings>
+#include <config-baloo.h>
+#ifdef HAVE_BALOO
+#include <Baloo/Query>
+#include <Baloo/IndexerConfig>
+#endif

 
 #include <QButtonGroup>
 #include <QDir>
 
 #include <QButtonGroup>
 #include <QDir>

-#include <QEvent>
-#include <QFormLayout>
+#include <QFontDatabase>

 #include <QHBoxLayout>
 #include <QHBoxLayout>

-#include <QKeyEvent>
+#include <QIcon>

 #include <QLabel>
 #include <QLabel>

+#include <QLineEdit>

 #include <QScrollArea>
 #include <QTimer>
 #include <QToolButton>
 #include <QScrollArea>
 #include <QTimer>
 #include <QToolButton>

-#include <QVBoxLayout>
-
-#ifdef HAVE_BALOO
-    #include <Baloo/NaturalFileQueryParser>
-    #include <Baloo/QueryBuilder>
-    #include <Baloo/Query>
-    #include <Baloo/Term>
-    #include <Baloo/IndexerConfig>
-#endif
+#include <QUrlQuery>

 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     QWidget(parent),
     m_startedSearching(false),
     m_active(true),
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     QWidget(parent),
     m_startedSearching(false),
     m_active(true),

-    m_topLayout(0),
-    m_searchLabel(0),
-    m_searchInput(0),
-    m_optionsScrollArea(0),
-    m_fileNameButton(0),
-    m_contentButton(0),
-    m_separator(0),
-    m_fromHereButton(0),
-    m_everywhereButton(0),
-    m_facetsToggleButton(0),
-    m_facetsWidget(0),
+    m_topLayout(nullptr),
+    m_searchInput(nullptr),
+    m_saveSearchAction(nullptr),
+    m_optionsScrollArea(nullptr),
+    m_fileNameButton(nullptr),
+    m_contentButton(nullptr),
+    m_separator(nullptr),
+    m_fromHereButton(nullptr),
+    m_everywhereButton(nullptr),
+    m_facetsToggleButton(nullptr),
+    m_facetsWidget(nullptr),

     m_searchPath(),
     m_searchPath(),

-    m_startSearchTimer(0)
+    m_startSearchTimer(nullptr)

 {
 }
 
 {
 }
 


@@ -83,29 +79,29 @@ QString DolphinSearchBox::text() const
     return m_searchInput->text();
 }
 
     return m_searchInput->text();
 }
 

-void DolphinSearchBox::setSearchPath(const KUrl& url)
+void DolphinSearchBox::setSearchPath(const QUrl& url)

 {
     m_searchPath = url;
 
     QFontMetrics metrics(m_fromHereButton->font());
     const int maxWidth = metrics.height() * 8;
 
 {
     m_searchPath = url;
 
     QFontMetrics metrics(m_fromHereButton->font());
     const int maxWidth = metrics.height() * 8;
 

-    QString location = url.fileName();
+    const QUrl cleanedUrl = url.adjusted(QUrl::RemoveUserInfo | QUrl::StripTrailingSlash);
+    QString location = cleanedUrl.fileName();

     if (location.isEmpty()) {
     if (location.isEmpty()) {

-        if (url.isLocalFile()) {
-            location = QLatin1String("/");
-        } else {
-            location = url.protocol() + QLatin1String(" - ") + url.host();
-        }
+        location = cleanedUrl.toString(QUrl::PreferLocalFile);
+    }
+    if (m_fromHereButton->isChecked() && cleanedUrl.path() == QDir::homePath()) {
+        m_fromHereButton->setChecked(false);
+        m_everywhereButton->setChecked(true);
+    } else {
+        m_fromHereButton->setChecked(true);
+        m_everywhereButton->setChecked(false);

     }
 
     const QString elidedLocation = metrics.elidedText(location, Qt::ElideMiddle, maxWidth);
     m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", elidedLocation));
     }
 
     const QString elidedLocation = metrics.elidedText(location, Qt::ElideMiddle, maxWidth);
     m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", elidedLocation));

-
-    const bool showSearchFromButtons = url.isLocalFile();
-    m_separator->setVisible(showSearchFromButtons);
-    m_fromHereButton->setVisible(showSearchFromButtons);
-    m_everywhereButton->setVisible(showSearchFromButtons);
+    m_fromHereButton->setToolTip(i18nc("action:button", "Limit search to '%1' and its subfolders", cleanedUrl.toString(QUrl::PreferLocalFile)));

 
     bool hasFacetsSupport = false;
 #ifdef HAVE_BALOO
 
     bool hasFacetsSupport = false;
 #ifdef HAVE_BALOO


@@ -115,14 +111,14 @@ void DolphinSearchBox::setSearchPath(const KUrl& url)
     m_facetsWidget->setEnabled(hasFacetsSupport);
 }
 
     m_facetsWidget->setEnabled(hasFacetsSupport);
 }
 

-KUrl DolphinSearchBox::searchPath() const
+QUrl DolphinSearchBox::searchPath() const

 {
     return m_searchPath;
 }
 
 {
     return m_searchPath;
 }
 

-KUrl DolphinSearchBox::urlForSearching() const
+QUrl DolphinSearchBox::urlForSearching() const

 {
 {

-    KUrl url;
+    QUrl url;

     bool useBalooSearch = false;
 #ifdef HAVE_BALOO
     const Baloo::IndexerConfig searchInfo;
     bool useBalooSearch = false;
 #ifdef HAVE_BALOO
     const Baloo::IndexerConfig searchInfo;


@@ -131,36 +127,37 @@ KUrl DolphinSearchBox::urlForSearching() const
     if (useBalooSearch) {
         url = balooUrlForSearching();
     } else {
     if (useBalooSearch) {
         url = balooUrlForSearching();
     } else {

-        url.setProtocol("filenamesearch");
-        url.addQueryItem("search", m_searchInput->text());
+        url.setScheme(QStringLiteral("filenamesearch"));
+
+        QUrlQuery query;
+        query.addQueryItem(QStringLiteral("search"), m_searchInput->text());

         if (m_contentButton->isChecked()) {
         if (m_contentButton->isChecked()) {

-            url.addQueryItem("checkContent", "yes");
+            query.addQueryItem(QStringLiteral("checkContent"), QStringLiteral("yes"));

         }
 
         QString encodedUrl;
         if (m_everywhereButton->isChecked()) {
         }
 
         QString encodedUrl;
         if (m_everywhereButton->isChecked()) {

-            // It is very unlikely, that the majority of Dolphins target users
-            // mean "the whole harddisk" instead of "my home folder" when
-            // selecting the "Everywhere" button.

             encodedUrl = QDir::homePath();
         } else {
             encodedUrl = m_searchPath.url();
         }
             encodedUrl = QDir::homePath();
         } else {
             encodedUrl = m_searchPath.url();
         }

-        url.addQueryItem("url", encodedUrl);
+        query.addQueryItem(QStringLiteral("url"), encodedUrl);
+
+        url.setQuery(query);

     }
 
     return url;
 }
 
     }
 
     return url;
 }
 

-void DolphinSearchBox::fromSearchUrl(const KUrl& url)
+void DolphinSearchBox::fromSearchUrl(const QUrl& url)

 {
 {

-    if (url.protocol() == "baloosearch") {
+    if (url.scheme() == QLatin1String("baloosearch")) {

         fromBalooSearchUrl(url);
         fromBalooSearchUrl(url);

-    } else if (url.protocol() == "filenamesearch") {
-        const QMap<QString, QString>& queryItems = url.queryItems();
-        setText(queryItems.value("search"));
-        setSearchPath(queryItems.value("url"));
-        m_contentButton->setChecked(queryItems.value("checkContent") == "yes");
+    } else if (url.scheme() == QLatin1String("filenamesearch")) {
+        const QUrlQuery query(url);
+        setText(query.queryItemValue(QStringLiteral("search")));
+        setSearchPath(QUrl::fromUserInput(query.queryItemValue(QStringLiteral("url")), QString(), QUrl::AssumeLocalFile));
+        m_contentButton->setChecked(query.queryItemValue(QStringLiteral("checkContent")) == QLatin1String("yes"));

     } else {
         setText(QString());
         setSearchPath(url);
     } else {
         setText(QString());
         setSearchPath(url);


@@ -204,6 +201,13 @@ void DolphinSearchBox::showEvent(QShowEvent* event)
     }
 }
 
     }
 }
 

+void DolphinSearchBox::hideEvent(QHideEvent* event)
+{
+    Q_UNUSED(event);
+    m_startedSearching = false;
+    m_startSearchTimer->stop();
+}
+

 void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);
 void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);


@@ -220,8 +224,17 @@ bool DolphinSearchBox::eventFilter(QObject* obj, QEvent* event)
 {
     switch (event->type()) {
     case QEvent::FocusIn:
 {
     switch (event->type()) {
     case QEvent::FocusIn:

-        setActive(true);
-        setFocus();
+        // #379135: we get the FocusIn event when we close a tab but we don't want to emit
+        // the activated() signal before the removeTab() call in DolphinTabWidget::closeTab() returns.
+        // To avoid this issue, we delay the activation of the search box.
+        // We also don't want to schedule the activation process if we are already active,
+        // otherwise we can enter in a loop of FocusIn/FocusOut events with the searchbox of another tab.
+        if (!isActive()) {
+            QTimer::singleShot(0, this, [this] {
+                setActive(true);
+                setFocus();
+            });
+        }

         break;
 
     default:
         break;
 
     default:


@@ -235,6 +248,7 @@ void DolphinSearchBox::emitSearchRequest()
 {
     m_startSearchTimer->stop();
     m_startedSearching = true;
 {
     m_startSearchTimer->stop();
     m_startedSearching = true;

+    m_saveSearchAction->setEnabled(true);

     emit searchRequest();
 }
 
     emit searchRequest();
 }
 


@@ -242,6 +256,7 @@ void DolphinSearchBox::emitCloseRequest()
 {
     m_startSearchTimer->stop();
     m_startedSearching = false;
 {
     m_startSearchTimer->stop();
     m_startedSearching = false;

+    m_saveSearchAction->setEnabled(false);

     emit closeRequest();
 }
 
     emit closeRequest();
 }
 


@@ -253,9 +268,8 @@ void DolphinSearchBox::slotConfigurationChanged()
     }
 }
 
     }
 }
 

-void DolphinSearchBox::slotSearchTextChanged()
+void DolphinSearchBox::slotSearchTextChanged(const QString& text)

 {
 {

-    const QString text = m_searchInput->text();

 
     if (text.isEmpty()) {
         m_startSearchTimer->stop();
 
     if (text.isEmpty()) {
         m_startSearchTimer->stop();


@@ -268,14 +282,7 @@ void DolphinSearchBox::slotSearchTextChanged()
 void DolphinSearchBox::slotReturnPressed()
 {
     emitSearchRequest();
 void DolphinSearchBox::slotReturnPressed()
 {
     emitSearchRequest();

-    emit returnPressed(m_searchInput->text());
-}
-
-void DolphinSearchBox::updateSearchInputParsing()
-{
-#ifdef HAVE_BALOO
-    m_searchInput->setParsingEnabled(m_contentButton->isChecked());
-#endif
+    emit returnPressed();

 }
 
 void DolphinSearchBox::slotFacetsButtonToggled()
 }
 
 void DolphinSearchBox::slotFacetsButtonToggled()


@@ -292,6 +299,18 @@ void DolphinSearchBox::slotFacetChanged()
     emit searchRequest();
 }
 
     emit searchRequest();
 }
 

+void DolphinSearchBox::slotSearchSaved()
+{
+    const QUrl searchURL = urlForSearching();
+    if (searchURL.isValid()) {
+        PlacesItemModel model;
+        const QString label = i18n("Search for %1 in %2", text(), searchPath().fileName());
+        model.createPlacesItem(label,
+                               searchURL,
+                               QStringLiteral("folder-saved-search-symbolic"));
+    }
+}
+

 void DolphinSearchBox::initButton(QToolButton* button)
 {
     button->installEventFilter(this);
 void DolphinSearchBox::initButton(QToolButton* button)
 {
     button->installEventFilter(this);


@@ -316,15 +335,14 @@ void DolphinSearchBox::loadSettings()
     }
 
     m_facetsWidget->setVisible(SearchSettings::showFacetsWidget());
     }
 
     m_facetsWidget->setVisible(SearchSettings::showFacetsWidget());

-    updateSearchInputParsing();

 }
 
 void DolphinSearchBox::saveSettings()
 {
 }
 
 void DolphinSearchBox::saveSettings()
 {

-    SearchSettings::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere");
-    SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content");
+    SearchSettings::setLocation(m_fromHereButton->isChecked() ? QStringLiteral("FromHere") : QStringLiteral("Everywhere"));
+    SearchSettings::setWhat(m_fileNameButton->isChecked() ? QStringLiteral("FileName") : QStringLiteral("Content"));

     SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked());
     SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked());

-    SearchSettings::self()->writeConfig();
+    SearchSettings::self()->save();

 }
 
 void DolphinSearchBox::init()
 }
 
 void DolphinSearchBox::init()


@@ -332,38 +350,34 @@ void DolphinSearchBox::init()
     // Create close button
     QToolButton* closeButton = new QToolButton(this);
     closeButton->setAutoRaise(true);
     // Create close button
     QToolButton* closeButton = new QToolButton(this);
     closeButton->setAutoRaise(true);

-    closeButton->setIcon(KIcon("dialog-close"));
+    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));

     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
     connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
 
     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
     connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
 

-    // Create search label
-    m_searchLabel = new QLabel(this);
-

     // Create search box
     // Create search box

-#ifdef HAVE_BALOO
-    m_queryParser.reset(new Baloo::NaturalFileQueryParser);
-    m_searchInput = new Baloo::QueryBuilder(m_queryParser.data(), this);
-    connect(m_searchInput, &Baloo::QueryBuilder::editingFinished,
-            this, &DolphinSearchBox::slotReturnPressed);
-    connect(m_searchInput, &Baloo::QueryBuilder::textChanged,
-            this, &DolphinSearchBox::slotSearchTextChanged);
-#else
-    m_searchInput = new KLineEdit(this);
+    m_searchInput = new QLineEdit(this);
+    m_searchInput->setPlaceholderText(i18n("Search..."));

     m_searchInput->installEventFilter(this);
     m_searchInput->installEventFilter(this);

-    m_searchInput->setClearButtonShown(true);
-    m_searchInput->setFont(KGlobalSettings::generalFont());
-    connect(m_searchInput, &KLineEdit::returnPressed,
+    m_searchInput->setClearButtonEnabled(true);
+    m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
+    connect(m_searchInput, &QLineEdit::returnPressed,

             this, &DolphinSearchBox::slotReturnPressed);
             this, &DolphinSearchBox::slotReturnPressed);

-    connect(m_searchInput, &KLineEdit::textChanged,
+    connect(m_searchInput, &QLineEdit::textChanged,

             this, &DolphinSearchBox::slotSearchTextChanged);
             this, &DolphinSearchBox::slotSearchTextChanged);

-#endif

     setFocusProxy(m_searchInput);
 
     setFocusProxy(m_searchInput);
 

+    // Add "Save search" button inside search box
+    m_saveSearchAction = new QAction(this);
+    m_saveSearchAction->setIcon (QIcon::fromTheme(QStringLiteral("document-save-symbolic")));
+    m_saveSearchAction->setText(i18nc("action:button", "Save this search to quickly access it again in the future"));
+    m_saveSearchAction->setEnabled(false);
+    m_searchInput->addAction(m_saveSearchAction, QLineEdit::TrailingPosition);
+    connect(m_saveSearchAction, &QAction::triggered, this, &DolphinSearchBox::slotSearchSaved);
+

     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();
     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();

-    searchInputLayout->setMargin(0);
+    searchInputLayout->setContentsMargins(0, 0, 0, 0);

     searchInputLayout->addWidget(closeButton);
     searchInputLayout->addWidget(closeButton);

-    searchInputLayout->addWidget(m_searchLabel);

     searchInputLayout->addWidget(m_searchInput);
 
     // Create "Filename" and "Content" button
     searchInputLayout->addWidget(m_searchInput);
 
     // Create "Filename" and "Content" button


@@ -378,24 +392,39 @@ void DolphinSearchBox::init()
     QButtonGroup* searchWhatGroup = new QButtonGroup(this);
     searchWhatGroup->addButton(m_fileNameButton);
     searchWhatGroup->addButton(m_contentButton);
     QButtonGroup* searchWhatGroup = new QButtonGroup(this);
     searchWhatGroup->addButton(m_fileNameButton);
     searchWhatGroup->addButton(m_contentButton);

-    connect(searchWhatGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
-            this, &DolphinSearchBox::updateSearchInputParsing);

 
     m_separator = new KSeparator(Qt::Vertical, this);
 
 
     m_separator = new KSeparator(Qt::Vertical, this);
 

-    // Create "From Here" and "Everywhere"button
+    // Create "From Here" and "Your files" buttons

     m_fromHereButton = new QToolButton(this);
     m_fromHereButton->setText(i18nc("action:button", "From Here"));
     initButton(m_fromHereButton);
 
     m_everywhereButton = new QToolButton(this);
     m_fromHereButton = new QToolButton(this);
     m_fromHereButton->setText(i18nc("action:button", "From Here"));
     initButton(m_fromHereButton);
 
     m_everywhereButton = new QToolButton(this);

-    m_everywhereButton->setText(i18nc("action:button", "Everywhere"));
+    m_everywhereButton->setText(i18nc("action:button", "Your files"));
+    m_everywhereButton->setToolTip(i18nc("action:button", "Search in your home directory"));
+    m_everywhereButton->setIcon(QIcon::fromTheme(QStringLiteral("user-home")));
+    m_everywhereButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);

     initButton(m_everywhereButton);
 
     QButtonGroup* searchLocationGroup = new QButtonGroup(this);
     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);
 
     initButton(m_everywhereButton);
 
     QButtonGroup* searchLocationGroup = new QButtonGroup(this);
     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);
 

+    auto moreSearchToolsButton = new QToolButton(this);
+    moreSearchToolsButton->setAutoRaise(true);
+    moreSearchToolsButton->setPopupMode(QToolButton::InstantPopup);
+    moreSearchToolsButton->setIcon(QIcon::fromTheme("arrow-down-double"));
+    moreSearchToolsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+    moreSearchToolsButton->setText(i18n("More Search Tools"));
+    moreSearchToolsButton->setMenu(new QMenu(this));
+    connect(moreSearchToolsButton->menu(), &QMenu::aboutToShow, moreSearchToolsButton->menu(), [this, moreSearchToolsButton]()
+    {
+        m_menuFactory.reset(new KMoreToolsMenuFactory("dolphin/search-tools"));
+        moreSearchToolsButton->menu()->clear();
+        m_menuFactory->fillMenuFromGroupingNames(moreSearchToolsButton->menu(), { "files-find" }, this->m_searchPath);
+    } );
+

     // Create "Facets" widgets
     m_facetsToggleButton = new QToolButton(this);
     m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     // Create "Facets" widgets
     m_facetsToggleButton = new QToolButton(this);
     m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);


@@ -409,14 +438,16 @@ void DolphinSearchBox::init()
 
     // Apply layout for the options
     QHBoxLayout* optionsLayout = new QHBoxLayout();
 
     // Apply layout for the options
     QHBoxLayout* optionsLayout = new QHBoxLayout();

-    optionsLayout->setMargin(0);
+    optionsLayout->setContentsMargins(0, 0, 0, 0);

     optionsLayout->addWidget(m_fileNameButton);
     optionsLayout->addWidget(m_contentButton);
     optionsLayout->addWidget(m_separator);
     optionsLayout->addWidget(m_fromHereButton);
     optionsLayout->addWidget(m_everywhereButton);
     optionsLayout->addWidget(m_fileNameButton);
     optionsLayout->addWidget(m_contentButton);
     optionsLayout->addWidget(m_separator);
     optionsLayout->addWidget(m_fromHereButton);
     optionsLayout->addWidget(m_everywhereButton);

-    optionsLayout->addStretch(1);
+    optionsLayout->addWidget(new KSeparator(Qt::Vertical, this));

     optionsLayout->addWidget(m_facetsToggleButton);
     optionsLayout->addWidget(m_facetsToggleButton);

+    optionsLayout->addWidget(moreSearchToolsButton);
+    optionsLayout->addStretch(1);

 
     // Put the options into a QScrollArea. This prevents increasing the view width
     // in case that not enough width for the options is available.
 
     // Put the options into a QScrollArea. This prevents increasing the view width
     // in case that not enough width for the options is available.


@@ -433,7 +464,7 @@ void DolphinSearchBox::init()
     m_optionsScrollArea->setWidgetResizable(true);
 
     m_topLayout = new QVBoxLayout(this);
     m_optionsScrollArea->setWidgetResizable(true);
 
     m_topLayout = new QVBoxLayout(this);

-    m_topLayout->setMargin(0);
+    m_topLayout->setContentsMargins(0, 0, 0, 0);

     m_topLayout->addLayout(searchInputLayout);
     m_topLayout->addWidget(m_optionsScrollArea);
     m_topLayout->addWidget(m_facetsWidget);
     m_topLayout->addLayout(searchInputLayout);
     m_topLayout->addWidget(m_optionsScrollArea);
     m_topLayout->addWidget(m_facetsWidget);


@@ -450,76 +481,67 @@ void DolphinSearchBox::init()
     updateFacetsToggleButton();
 }
 
     updateFacetsToggleButton();
 }
 

-KUrl DolphinSearchBox::balooUrlForSearching() const
+QUrl DolphinSearchBox::balooUrlForSearching() const

 {
 #ifdef HAVE_BALOO
     const QString text = m_searchInput->text();
 
     Baloo::Query query;
 {
 #ifdef HAVE_BALOO
     const QString text = m_searchInput->text();
 
     Baloo::Query query;

-
-    if (m_contentButton->isChecked()) {
-        query = m_queryParser->parse(text, Baloo::NaturalQueryParser::DetectFilenamePattern);
-    } else {
-        query.setTerm(Baloo::Term(QLatin1String("filename"), text));
-    }
-
-    // Configure the query so that it returns files and takes the rating into account
-    query.addType("File");

     query.addType(m_facetsWidget->facetType());
 
     query.addType(m_facetsWidget->facetType());
 

-    Baloo::Term term(Baloo::Term::And);
-    Baloo::Term ratingTerm = m_facetsWidget->ratingTerm();
-
-    if (ratingTerm.isValid()) {
-        term.addSubTerm(query.term());
-        term.addSubTerm(ratingTerm);
+    QStringList queryStrings;
+    QString ratingQuery = m_facetsWidget->ratingTerm();
+    if (!ratingQuery.isEmpty()) {
+        queryStrings << ratingQuery;
+    }

 
 

-        query.setTerm(term);
+    if (m_contentButton->isChecked()) {
+        queryStrings << text;
+    } else if (!text.isEmpty()) {
+        queryStrings << QStringLiteral("filename:\"%1\"").arg(text);

     }
 
     if (m_fromHereButton->isChecked()) {
     }
 
     if (m_fromHereButton->isChecked()) {

-        query.addCustomOption("includeFolder", m_searchPath.toLocalFile());
+        query.setIncludeFolder(m_searchPath.toLocalFile());

     }
 
     }
 

+    query.setSearchString(queryStrings.join(QLatin1Char(' ')));
+

     return query.toSearchUrl(i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.",
                                    "Query Results from '%1'", text));
 #else
     return query.toSearchUrl(i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.",
                                    "Query Results from '%1'", text));
 #else

-    return KUrl();
+    return QUrl();

 #endif
 }
 
 #endif
 }
 

-void DolphinSearchBox::fromBalooSearchUrl(const KUrl& url)
+void DolphinSearchBox::fromBalooSearchUrl(const QUrl& url)

 {
 #ifdef HAVE_BALOO
     const Baloo::Query query = Baloo::Query::fromSearchUrl(url);
 {
 #ifdef HAVE_BALOO
     const Baloo::Query query = Baloo::Query::fromSearchUrl(url);

-    const Baloo::Term term = query.term();

 
     // Block all signals to avoid unnecessary "searchRequest" signals
     // while we adjust the search text and the facet widget.
     blockSignals(true);
 
 
     // Block all signals to avoid unnecessary "searchRequest" signals
     // while we adjust the search text and the facet widget.
     blockSignals(true);
 

-    const QVariantMap customOptions = query.customOptions();
-    if (customOptions.contains("includeFolder")) {
-        setSearchPath(customOptions.value("includeFolder").toString());
+    const QString customDir = query.includeFolder();
+    if (!customDir.isEmpty()) {
+        setSearchPath(QUrl::fromLocalFile(customDir));

     } else {
     } else {

-        setSearchPath(QDir::homePath());
+        setSearchPath(QUrl::fromLocalFile(QDir::homePath()));

     }
 
     }
 

-    if (!query.searchString().isEmpty()) {
-        setText(query.searchString());
-    }
+    setText(query.searchString());

 
     QStringList types = query.types();
 
     QStringList types = query.types();

-    types.removeOne("File"); // We are only interested in facet widget types

     if (!types.isEmpty()) {
         m_facetsWidget->setFacetType(types.first());
     }
 
     if (!types.isEmpty()) {
         m_facetsWidget->setFacetType(types.first());
     }
 

-    foreach (const Baloo::Term& subTerm, term.subTerms()) {
-        const QString property = subTerm.property();
-
-        if (property == QLatin1String("filename")) {
-            setText(subTerm.value().toString());
+    const QStringList subTerms = query.searchString().split(' ', QString::SkipEmptyParts);
+    foreach (const QString& subTerm, subTerms) {
+        if (subTerm.startsWith(QLatin1String("filename:"))) {
+            const QString value = subTerm.mid(9);
+            setText(value);

         } else if (m_facetsWidget->isRatingTerm(subTerm)) {
             m_facetsWidget->setRatingTerm(subTerm);
         }
         } else if (m_facetsWidget->isRatingTerm(subTerm)) {
             m_facetsWidget->setRatingTerm(subTerm);
         }


@@ -527,6 +549,8 @@ void DolphinSearchBox::fromBalooSearchUrl(const KUrl& url)
 
     m_startSearchTimer->stop();
     blockSignals(false);
 
     m_startSearchTimer->stop();
     blockSignals(false);

+#else
+    Q_UNUSED(url);

 #endif
 }
 
 #endif
 }
 


@@ -534,7 +558,7 @@ void DolphinSearchBox::updateFacetsToggleButton()
 {
     const bool facetsIsVisible = SearchSettings::showFacetsWidget();
     m_facetsToggleButton->setChecked(facetsIsVisible ? true : false);
 {
     const bool facetsIsVisible = SearchSettings::showFacetsWidget();
     m_facetsToggleButton->setChecked(facetsIsVisible ? true : false);

-    m_facetsToggleButton->setIcon(KIcon(facetsIsVisible ? "arrow-up-double" : "arrow-down-double"));
+    m_facetsToggleButton->setIcon(QIcon::fromTheme(facetsIsVisible ? QStringLiteral("arrow-up-double") : QStringLiteral("arrow-down-double")));

     m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options"));
 }
 
     m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options"));
 }