X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/832e157ecd1a1640b82425358b20fff416a2f8b7..570d0e55b6bb77bd2da49704693dbcf0e2e7cb54:/src/search/dolphinsearchbox.cpp

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 524c4462f..a925a97c9 100644
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -42,7 +42,6 @@
 #include <config-baloo.h>
 #ifdef HAVE_BALOO
     #include <Baloo/Query>
-    #include <Baloo/Term>
     #include <Baloo/IndexerConfig>
 #endif
 #include <QFontDatabase>
@@ -439,27 +438,25 @@ QUrl DolphinSearchBox::balooUrlForSearching() const
     const QString text = m_searchInput->text();
 
     Baloo::Query query;
-    query.addType("File");
     query.addType(m_facetsWidget->facetType());
 
-    Baloo::Term term(Baloo::Term::And);
-
-    Baloo::Term ratingTerm = m_facetsWidget->ratingTerm();
-    if (ratingTerm.isValid()) {
-        term.addSubTerm(ratingTerm);
+    QStringList queryStrings;
+    QString ratingQuery = m_facetsWidget->ratingTerm();
+    if (!ratingQuery.isEmpty()) {
+        queryStrings << ratingQuery;
     }
 
     if (m_contentButton->isChecked()) {
-        query.setSearchString(text);
+        queryStrings << text;
     } else if (!text.isEmpty()) {
-        term.addSubTerm(Baloo::Term(QLatin1String("filename"), text));
+        queryStrings << QString::fromLatin1("filename:\"%1\"").arg(text);
     }
 
     if (m_fromHereButton->isChecked()) {
         query.setIncludeFolder(m_searchPath.toLocalFile());
     }
 
-    query.setTerm(term);
+    query.setSearchString(queryStrings.join(" "));
 
     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));
@@ -472,7 +469,6 @@ void DolphinSearchBox::fromBalooSearchUrl(const QUrl& 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.
@@ -482,22 +478,21 @@ void DolphinSearchBox::fromBalooSearchUrl(const QUrl& url)
     if (!customDir.isEmpty()) {
         setSearchPath(QUrl::fromLocalFile(customDir));
     } else {
-        setSearchPath(QDir::homePath());
+        setSearchPath(QUrl::fromLocalFile(QDir::homePath()));
     }
 
     setText(query.searchString());
 
     QStringList types = query.types();
-    types.removeOne("File"); // We are only interested in facet widget types
     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("filename:")) {
+            const QString value = subTerm.mid(9);
+            setText(value);
         } else if (m_facetsWidget->isRatingTerm(subTerm)) {
             m_facetsWidget->setRatingTerm(subTerm);
         }