Merge branch 'master' into frameworks

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index efb17faf6b9e990cf2eae80f9ae3b1ed6dca7c38..fe298312f7ac7d6a9a84e66dbdbb527e18bdd6b4 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -23,15 +23,13 @@
 #include "dolphinfacetswidget.h"
 
 #include <QIcon>
 #include "dolphinfacetswidget.h"
 
 #include <QIcon>

-#include <KLineEdit>
-#include <KLocale>
+#include <QLineEdit>
+#include <KLocalizedString>

 #include <KSeparator>
 #include <KSeparator>

-#include <KGlobalSettings>

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

-#include <QFormLayout>

 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>


@@ -46,8 +44,8 @@
     #include <Baloo/Query>
     #include <Baloo/Term>
     #include <Baloo/IndexerConfig>
     #include <Baloo/Query>
     #include <Baloo/Term>
     #include <Baloo/IndexerConfig>

-#include <QFontDatabase>

 #endif
 #endif

+#include <QFontDatabase>

 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     QWidget(parent),
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     QWidget(parent),


@@ -84,7 +82,7 @@ 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;
 
 {
     m_searchPath = url;
 


@@ -96,7 +94,7 @@ void DolphinSearchBox::setSearchPath(const KUrl& url)
         if (url.isLocalFile()) {
             location = QLatin1String("/");
         } else {
         if (url.isLocalFile()) {
             location = QLatin1String("/");
         } else {

-            location = url.protocol() + QLatin1String(" - ") + url.host();
+            location = url.scheme() + QLatin1String(" - ") + url.host();

         }
     }
 
         }
     }
 


@@ -116,14 +114,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;


@@ -132,7 +130,7 @@ KUrl DolphinSearchBox::urlForSearching() const
     if (useBalooSearch) {
         url = balooUrlForSearching();
     } else {
     if (useBalooSearch) {
         url = balooUrlForSearching();
     } else {

-        url.setProtocol("filenamesearch");
+        url.setScheme("filenamesearch");

         url.addQueryItem("search", m_searchInput->text());
         if (m_contentButton->isChecked()) {
             url.addQueryItem("checkContent", "yes");
         url.addQueryItem("search", m_searchInput->text());
         if (m_contentButton->isChecked()) {
             url.addQueryItem("checkContent", "yes");


@@ -153,15 +151,14 @@ KUrl DolphinSearchBox::urlForSearching() const
     return url;
 }
 
     return url;
 }
 

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

 {
 {

-    if (url.protocol() == "baloosearch") {
+    if (url.scheme() == "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() == "filenamesearch") {
+        setText(url.queryItemValue("search"));
+        setSearchPath(url.queryItemValue("url"));
+        m_contentButton->setChecked(url.queryItemValue("checkContent") == "yes");

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


@@ -349,13 +346,13 @@ void DolphinSearchBox::init()
     connect(m_searchInput, &Baloo::QueryBuilder::textChanged,
             this, &DolphinSearchBox::slotSearchTextChanged);
 #else
     connect(m_searchInput, &Baloo::QueryBuilder::textChanged,
             this, &DolphinSearchBox::slotSearchTextChanged);
 #else

-    m_searchInput = new KLineEdit(this);
+    m_searchInput = new QLineEdit(this);

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

-    m_searchInput->setClearButtonShown(true);
+    m_searchInput->setClearButtonEnabled(true);

     m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
     m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));

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

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

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

             this, &DolphinSearchBox::slotSearchTextChanged);
 #endif
     setFocusProxy(m_searchInput);
             this, &DolphinSearchBox::slotSearchTextChanged);
 #endif
     setFocusProxy(m_searchInput);


@@ -451,7 +448,7 @@ void DolphinSearchBox::init()
     updateFacetsToggleButton();
 }
 
     updateFacetsToggleButton();
 }
 

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

 {
 #ifdef HAVE_BALOO
     const QString text = m_searchInput->text();
 {
 #ifdef HAVE_BALOO
     const QString text = m_searchInput->text();


@@ -479,17 +476,17 @@ KUrl DolphinSearchBox::balooUrlForSearching() const
     }
 
     if (m_fromHereButton->isChecked()) {
     }
 
     if (m_fromHereButton->isChecked()) {

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

     }
 
     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);


@@ -499,9 +496,9 @@ void DolphinSearchBox::fromBalooSearchUrl(const KUrl& url)
     // while we adjust the search text and the facet widget.
     blockSignals(true);
 
     // 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(customDir);

     } else {
         setSearchPath(QDir::homePath());
     }
     } else {
         setSearchPath(QDir::homePath());
     }