Use Nepomuk::Query::Query for global search queries, as it does not only return files...

Thanks to Oliver Heidbüchel for the patch!

CCMAIL: post@oliver-heidbuechel.de

svn path=/trunk/KDE/kdebase/apps/; revision=1095051

diff --git a/src/search/dolphinsearchoptionsconfigurator.cpp b/src/search/dolphinsearchoptionsconfigurator.cpp
index 29df5f49d690c63865b8e5e1c85275576856474a..379ea8e86f5fe90d58d6b5696677357f43053e88 100644 (file)
--- a/src/search/dolphinsearchoptionsconfigurator.cpp
+++ b/src/search/dolphinsearchoptionsconfigurator.cpp
@@ -355,13 +355,16 @@ Nepomuk::Query::Query DolphinSearchOptionsConfigurator::nepomukQuery() const
         }
     }
 
         }
     }
 

-    Nepomuk::Query::FileQuery fileQuery;

     if ((m_locationBox->currentIndex() == 1) && m_directory.isValid()) {
         // "From Here" is selected as location filter
     if ((m_locationBox->currentIndex() == 1) && m_directory.isValid()) {
         // "From Here" is selected as location filter

+        Nepomuk::Query::FileQuery fileQuery;

         fileQuery.addIncludeFolder(m_directory);
         fileQuery.addIncludeFolder(m_directory);

+        return fileQuery;

     }
     }

-    fileQuery.setTerm(andTerm);
-    return fileQuery;
+
+    Nepomuk::Query::Query query;
+    query.setTerm(andTerm);
+    return query;

 }
 
 #include "dolphinsearchoptionsconfigurator.moc"
 }
 
 #include "dolphinsearchoptionsconfigurator.moc"