* allow to filter the search result by images or text-documents

* minor cleanups

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

1 files changed, 14 insertions, 11 deletions

diff --git a/src/search/dolphinsearchoptionsconfigurator.h b/src/search/dolphinsearchoptionsconfigurator.h
index 338f4cd3f..90adea736 100644
--- a/src/search/dolphinsearchoptionsconfigurator.h
+++ b/src/search/dolphinsearchoptionsconfigurator.h
@@ -21,6 +21,8 @@
 #define DOLPHINSEARCHOPTIONSCONFIGURATOR_H
 
 #include <kurl.h>
+#define DISABLE_NEPOMUK_LEGACY
+#include <nepomuk/query.h>
 #include <QList>
 #include <QString>
 #include <QWidget>
@@ -43,10 +45,11 @@ public:
 
     /**
      * Returns the sum of the configured options and the
-     * custom search query as Nepomuk URL.
+     * custom search query as Nepomuk conform search URL. If the
+     * query is invalid, an empty URL is returned.
      * @see DolphinSearchOptionsConfigurator::setCustomSearchQuery()
      */
-    KUrl nepomukUrl() const;
+    KUrl nepomukSearchUrl() const;
 
 public slots:
     /**
@@ -65,19 +68,18 @@ protected:
 
 private slots:
     void slotAddSelectorButtonClicked();
-    void slotCriterionChanged();
     void removeCriterion();
 
     /**
-     * Updates the 'enabled' property of the selector button
-     * dependent from the number of existing selectors.
+     * Saves the current query by adding it as Places entry.
      */
-    void updateSelectorButton();
+    void saveQuery();
 
     /**
-     * Saves the current query by adding it as Places entry.
+     * Enables the enabled property of the search-, save-button and the
+     * add-selector button.
      */
-    void saveQuery();
+    void updateButtons();
 
 private:
     /**
@@ -87,10 +89,11 @@ private:
     void addCriterion(SearchCriterionSelector* selector);
 
     /**
-     * Returns true, DolphinSearchOptionsConfigurator::nepomukUrl()
-     * contains at least 1 search parameter.
+     * Returns the sum of the configured options and the
+     * custom search query as Nepomuk confrom query.
+     * @see DolphinSearchOptionsConfigurator::setCustomSearchQuery()
      */
-    bool hasSearchParameters() const;
+    Nepomuk::Query::Query nepomukQuery() const;
 
 private:
     bool m_initialized;