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

Since the master branch had never been merged into frameworks since the
creation of the frameworks branch, I had to fix a couple of merge
conflicts and make another change in order to make it build - I hope I
did not get anything wrong.

We should probably merge master into frameworks on a regular basis from
now on.

CCMAIL:[email protected]

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/search/dolphinfacetswidget.cpp
	dolphin/src/statusbar/dolphinstatusbar.cpp
	dolphin/src/views/dolphinview.cpp

1 files changed, 14 insertions, 11 deletions

diff --git a/src/search/dolphinfacetswidget.h b/src/search/dolphinfacetswidget.h
index 526fe1c79..757dcd482 100644
--- a/src/search/dolphinfacetswidget.h
+++ b/src/search/dolphinfacetswidget.h
@@ -29,6 +29,7 @@
 
 class QButtonGroup;
 class QCheckBox;
+class QDate;
 class QRadioButton;
 
 /**
@@ -57,19 +58,20 @@ public:
 
 #ifdef HAVE_BALOO
     Baloo::Term ratingTerm() const;
-    QStringList facetTypes() const;
+    QString facetType() const;
+
+    bool isRatingTerm(const Baloo::Term& term) const;
+    void setRatingTerm(const Baloo::Term& term);
 #endif
 
+    void setFacetType(const QString& type);
+
 signals:
     void facetChanged();
 
 private:
-    /**
-     * @return New checkbox which is connected to the
-     *         slotFacedChanged() slot whenever it has
-     *         been toggled.
-     */
-    QCheckBox* createCheckBox(const QString& text);
+    void setRating(const int stars);
+    void setTimespan(const QDate& date);
 
     /**
      * @return New radiobutton which is connected to the
@@ -80,10 +82,11 @@ private:
                                     QButtonGroup* group);
 
 private:
-    QCheckBox* m_documents;
-    QCheckBox* m_images;
-    QCheckBox* m_audio;
-    QCheckBox* m_videos;
+    QRadioButton* m_anyType;
+    QRadioButton* m_documents;
+    QRadioButton* m_images;
+    QRadioButton* m_audio;
+    QRadioButton* m_videos;
 
     QRadioButton* m_anytime;
     QRadioButton* m_today;