Merge remote-tracking branch 'origin/KDE/4.9'

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

diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
index 678cb6b14189c41709064f60046d0987c00cb6c3..de715d78fdd3f4547ac2c6c9482ff38735561c24 100644 (file)
--- a/src/search/dolphinfacetswidget.cpp
+++ b/src/search/dolphinfacetswidget.cpp
@@ -28,14 +28,14 @@
 #include <QVBoxLayout>
 
 #ifdef HAVE_NEPOMUK
-    #include <Nepomuk/Query/AndTerm>
-    #include <Nepomuk/Query/ComparisonTerm>
-    #include <Nepomuk/Query/LiteralTerm>
-    #include <Nepomuk/Query/OrTerm>
-    #include <Nepomuk/Query/Query>
-    #include <Nepomuk/Query/ResourceTypeTerm>
-    #include <Nepomuk/Vocabulary/NFO>
-    #include <Nepomuk/Vocabulary/NIE>
+    #include <Nepomuk2/Query/AndTerm>
+    #include <Nepomuk2/Query/ComparisonTerm>
+    #include <Nepomuk2/Query/LiteralTerm>
+    #include <Nepomuk2/Query/OrTerm>
+    #include <Nepomuk2/Query/Query>
+    #include <Nepomuk2/Query/ResourceTypeTerm>
+    #include <Nepomuk2/Vocabulary/NFO>
+    #include <Nepomuk2/Vocabulary/NIE>
     #include <Soprano/Vocabulary/NAO>
 #endif
 
@@ -60,7 +60,7 @@ DolphinFacetsWidget::DolphinFacetsWidget(QWidget* parent) :
 {
     m_documents = createCheckBox(i18nc("@option:check", "Documents"));
     m_images    = createCheckBox(i18nc("@option:check", "Images"));
-    m_audio     = createCheckBox(i18nc("@option:check", "Audio"));
+    m_audio     = createCheckBox(i18nc("@option:check", "Audio Files"));
     m_videos    = createCheckBox(i18nc("@option:check", "Videos"));
 
     QVBoxLayout* typeLayout = new QVBoxLayout();
@@ -95,7 +95,7 @@ DolphinFacetsWidget::DolphinFacetsWidget(QWidget* parent) :
     m_twoOrMore   = createRadioButton(i18nc("@option:option", "2 or more"), ratingGroup);
     m_threeOrMore = createRadioButton(i18nc("@option:option", "3 or more"), ratingGroup);
     m_fourOrMore  = createRadioButton(i18nc("@option:option", "4 or more"), ratingGroup);
-    m_maxRating   = createRadioButton(i18nc("@option:option", "Maximum Rating"), ratingGroup);
+    m_maxRating   = createRadioButton(i18nc("@option:option", "Highest Rating"), ratingGroup);
 
     QVBoxLayout* ratingLayout = new QVBoxLayout();
     ratingLayout->setSpacing(0);
@@ -121,33 +121,33 @@ DolphinFacetsWidget::~DolphinFacetsWidget()
 }
 
 #ifdef HAVE_NEPOMUK
-Nepomuk::Query::Term DolphinFacetsWidget::facetsTerm() const
+Nepomuk2::Query::Term DolphinFacetsWidget::facetsTerm() const
 {
-    Nepomuk::Query::AndTerm andTerm;
+    Nepomuk2::Query::AndTerm andTerm;
 
     const bool hasTypeFilter = m_documents->isChecked() ||
                                m_images->isChecked() ||
                                m_audio->isChecked() ||
                                m_videos->isChecked();
     if (hasTypeFilter) {
-        Nepomuk::Query::OrTerm orTerm;
+        Nepomuk2::Query::OrTerm orTerm;
 
         if (m_documents->isChecked()) {
-            orTerm.addSubTerm(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Document()));
+            orTerm.addSubTerm(Nepomuk2::Query::ResourceTypeTerm(Nepomuk2::Vocabulary::NFO::Document()));
         }
 
         if (m_images->isChecked()) {
-            orTerm.addSubTerm(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Image()));
+            orTerm.addSubTerm(Nepomuk2::Query::ResourceTypeTerm(Nepomuk2::Vocabulary::NFO::Image()));
         }
 
         if (m_audio->isChecked()) {
-            orTerm.addSubTerm(Nepomuk::Query::ComparisonTerm(Nepomuk::Vocabulary::NIE::mimeType(),
-                                                             Nepomuk::Query::LiteralTerm("audio")));
+            orTerm.addSubTerm(Nepomuk2::Query::ComparisonTerm(Nepomuk2::Vocabulary::NIE::mimeType(),
+                                                             Nepomuk2::Query::LiteralTerm("audio")));
         }
 
         if (m_videos->isChecked()) {
-            orTerm.addSubTerm(Nepomuk::Query::ComparisonTerm(Nepomuk::Vocabulary::NIE::mimeType(),
-                                                             Nepomuk::Query::LiteralTerm("video")));
+            orTerm.addSubTerm(Nepomuk2::Query::ComparisonTerm(Nepomuk2::Vocabulary::NIE::mimeType(),
+                                                             Nepomuk2::Query::LiteralTerm("video")));
         }
 
         andTerm.addSubTerm(orTerm);
@@ -166,9 +166,9 @@ Nepomuk::Query::Term DolphinFacetsWidget::facetsTerm() const
         }
 
         const int rating = stars * 2;
-        Nepomuk::Query::ComparisonTerm term(Soprano::Vocabulary::NAO::numericRating(),
-                                            Nepomuk::Query::LiteralTerm(rating),
-                                            Nepomuk::Query::ComparisonTerm::GreaterOrEqual);
+        Nepomuk2::Query::ComparisonTerm term(Soprano::Vocabulary::NAO::numericRating(),
+                                            Nepomuk2::Query::LiteralTerm(rating),
+                                            Nepomuk2::Query::ComparisonTerm::GreaterOrEqual);
         andTerm.addSubTerm(term);
     }
 
@@ -184,9 +184,9 @@ Nepomuk::Query::Term DolphinFacetsWidget::facetsTerm() const
             date.addDays(1 - date.dayOfYear());
         }
 
-        Nepomuk::Query::ComparisonTerm term(Nepomuk::Vocabulary::NIE::lastModified(),
-                                            Nepomuk::Query::LiteralTerm(QDateTime(date)),
-                                            Nepomuk::Query::ComparisonTerm::GreaterOrEqual);
+        Nepomuk2::Query::ComparisonTerm term(Nepomuk2::Vocabulary::NIE::lastModified(),
+                                            Nepomuk2::Query::LiteralTerm(QDateTime(date)),
+                                            Nepomuk2::Query::ComparisonTerm::GreaterOrEqual);
         andTerm.addSubTerm(term);
     }