Merge branch 'Applications/16.12'

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

diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h
index eba81346d5ceb8a8909bca4ff220f68c6793f593..b747679ec272af8a88dc788612ebb3e00b0b26b9 100644 (file)
--- a/src/search/dolphinsearchbox.h
+++ b/src/search/dolphinsearchbox.h
@@ -20,25 +20,17 @@
 #ifndef DOLPHINSEARCHBOX_H
 #define DOLPHINSEARCHBOX_H
 
-#include <KUrl>
-#include <QList>
+#include <QUrl>
 #include <QWidget>
 
-#include <config-baloo.h>
-
 class DolphinFacetsWidget;
-class KLineEdit;
+class QLineEdit;
 class KSeparator;
 class QToolButton;
 class QScrollArea;
 class QLabel;
 class QVBoxLayout;
 
-namespace Baloo {
-    class QueryBuilder;
-    class NaturalQueryParser;
-}
-
 /**
  * @brief Input box for searching files with or without Baloo.
  *
@@ -72,17 +64,17 @@ public:
      * Sets the current path that is used as root for
      * searching files, if "From Here" has been selected.
      */
-    void setSearchPath(const KUrl& url);
-    KUrl searchPath() const;
+    void setSearchPath(const QUrl& url);
+    QUrl searchPath() const;
 
     /** @return URL that will start the searching of files. */
-    KUrl urlForSearching() const;
+    QUrl urlForSearching() const;
 
     /**
      * Extracts information from the given search \a url to
      * initialize the search box properly.
      */
-    void fromSearchUrl(const KUrl& url);
+    void fromSearchUrl(const QUrl& url);
 
     /**
      * Selects the whole text of the search box.
@@ -106,10 +98,11 @@ public:
     bool isActive() const;
 
 protected:
-    virtual bool event(QEvent* event);
-    virtual void showEvent(QShowEvent* event);
-    virtual void keyReleaseEvent(QKeyEvent* event);
-    virtual bool eventFilter(QObject* obj, QEvent* event);
+    virtual bool event(QEvent* event) Q_DECL_OVERRIDE;
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
+    virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
+    virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE;
 
 signals:
     /**
@@ -123,7 +116,7 @@ signals:
      */
     void searchTextChanged(const QString& text);
 
-    void returnPressed(const QString& text);
+    void returnPressed();
 
     /**
      * Emitted as soon as the search box should get closed.
@@ -141,11 +134,10 @@ private slots:
     void emitSearchRequest();
     void emitCloseRequest();
     void slotConfigurationChanged();
-    void slotSearchTextChanged();
+    void slotSearchTextChanged(const QString& text);
     void slotReturnPressed();
     void slotFacetsButtonToggled();
     void slotFacetChanged();
-    void updateSearchInputParsing();
 
 private:
     void initButton(QToolButton* button);
@@ -156,15 +148,16 @@ private:
     /**
      * @return URL that represents the Baloo query for starting the search.
      */
-    KUrl balooUrlForSearching() const;
+    QUrl balooUrlForSearching() const;
 
     /**
      * Extracts information from the given Baloo search \a url to
      * initialize the search box properly.
      */
-    void fromBalooSearchUrl(const KUrl& url);
+    void fromBalooSearchUrl(const QUrl& url);
 
     void updateFacetsToggleButton();
+
 private:
     bool m_startedSearching;
     bool m_active;
@@ -172,12 +165,7 @@ private:
     QVBoxLayout* m_topLayout;
 
     QLabel* m_searchLabel;
-#ifdef HAVE_BALOO
-    Baloo::QueryBuilder* m_searchInput;
-    QScopedPointer<Baloo::NaturalQueryParser> m_queryParser;
-#else
-    KLineEdit* m_searchInput;
-#endif
+    QLineEdit* m_searchInput;
     QScrollArea* m_optionsScrollArea;
     QToolButton* m_fileNameButton;
     QToolButton* m_contentButton;
@@ -187,7 +175,7 @@ private:
     QToolButton* m_facetsToggleButton;
     DolphinFacetsWidget* m_facetsWidget;
 
-    KUrl m_searchPath;
+    QUrl m_searchPath;
 
     QTimer* m_startSearchTimer;
 };