From 6787467a7b3b54971ce023c1ba1a36b5d1a7c499 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Thu, 26 Feb 2015 17:09:46 +0100 Subject: Revert "Use the Baloo Query Builder widget to add syntax-highlighting in Dolphin search" The natural query parser is too unstable for the release atm, we'll readd the query parser when the code is mature enough. This reverts commit e3578ee3b770a1b8f359ed1a3cc6e3ac7f6c700e. --- src/search/dolphinsearchbox.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'src/search/dolphinsearchbox.h') diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h index ef48d0830..a80617476 100644 --- a/src/search/dolphinsearchbox.h +++ b/src/search/dolphinsearchbox.h @@ -23,8 +23,6 @@ #include #include -#include - class DolphinFacetsWidget; class QLineEdit; class KSeparator; @@ -33,11 +31,6 @@ class QScrollArea; class QLabel; class QVBoxLayout; -namespace Baloo { - class QueryBuilder; - class NaturalQueryParser; -} - /** * @brief Input box for searching files with or without Baloo. * @@ -122,7 +115,7 @@ signals: */ void searchTextChanged(const QString& text); - void returnPressed(const QString& text); + void returnPressed(); /** * Emitted as soon as the search box should get closed. @@ -140,11 +133,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); @@ -164,6 +156,7 @@ private: void fromBalooSearchUrl(const QUrl& url); void updateFacetsToggleButton(); + private: bool m_startedSearching; bool m_active; @@ -171,12 +164,7 @@ private: QVBoxLayout* m_topLayout; QLabel* m_searchLabel; -#ifdef HAVE_BALOO - Baloo::QueryBuilder* m_searchInput; - QScopedPointer m_queryParser; -#else QLineEdit* m_searchInput; -#endif QScrollArea* m_optionsScrollArea; QToolButton* m_fileNameButton; QToolButton* m_contentButton; -- cgit v1.3.1