Merge remote-tracking branch 'origin/master' into frameworks

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index f9942f98e6bf1bfc3a1879cba6741bae21fcd3f7..ae93030acf7c8a322ee8447e725e7da4bd32c5e6 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -42,9 +42,9 @@
 
 #include <config-baloo.h>
 #ifdef HAVE_BALOO
-    #include <baloo/query.h>
-    #include <baloo/term.h>
-    #include <baloo/indexerconfig.h>
+    #include <Baloo/Query>
+    #include <Baloo/Term>
+    #include <Baloo/IndexerConfig>
 #endif
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
@@ -473,7 +473,7 @@ void DolphinSearchBox::fromBalooSearchUrl(const KUrl& url)
     // while we adjust the search text and the facet widget.
     blockSignals(true);
 
-    const QVariantHash customOptions = query.customOptions();
+    const QVariantMap customOptions = query.customOptions();
     if (customOptions.contains("includeFolder")) {
         setSearchPath(customOptions.value("includeFolder").toString());
     } else {
@@ -513,4 +513,3 @@ void DolphinSearchBox::updateFacetsToggleButton()
     m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options"));
 }
 
-#include "dolphinsearchbox.moc"