Removed enums SortByRating and SortByTags. They never have been activated yet because...

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

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 770391610fcf92c277d76481c7a022e2488ce7c8..f9cf39d7f18c312a681bf675b2feb44a9f5e5431 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -113,9 +113,7 @@ public:
         SortByOwner,
         SortByGroup,
         SortByType,
-        SortByRating,
-        SortByTags,
-        MaxSortEnum = SortByTags
+        MaxSortEnum = SortByType
     };
 
     /**

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index c22b0adc193efcbf8a9b4faad89475c67d6edce0..60da2905db7c568fc2bf93ab0571524a201820b4 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -33,8 +33,6 @@
 #include <QFile>
 #include <QFileInfo>
 
-bool ViewProperties::m_nepomukSupport = false;
-
 #define FILE_NAME "/.directory"
 
 ViewProperties::ViewProperties(const KUrl& url) :
@@ -162,15 +160,7 @@ void ViewProperties::setSorting(DolphinView::Sorting sorting)
 
 DolphinView::Sorting ViewProperties::sorting() const
 {
-    // If Nepomuk is not available, return SortByName as fallback if SortByRating
-    // or SortByTags is stored.
-    DolphinView::Sorting sorting = static_cast<DolphinView::Sorting>(m_node->sorting());
-    const bool sortByName = !m_nepomukSupport &&
-                            ((sorting == DolphinView::SortByRating) || (sorting == DolphinView::SortByTags));
-    if (sortByName) {
-        sorting = DolphinView::SortByName;
-    }
-    return sorting;
+    return static_cast<DolphinView::Sorting>(m_node->sorting());
 }
 
 void ViewProperties::setSortOrder(Qt::SortOrder sortOrder)

diff --git a/src/viewproperties.h b/src/viewproperties.h
index a0279004e5887112d98c05382aa7a4172a17006b..a8a2cc9342141b2745f512da4ba7b4a166f6799f 100644 (file)
--- a/src/viewproperties.h
+++ b/src/viewproperties.h
@@ -169,8 +169,6 @@ private:
     bool m_autoSave;
     QString m_filepath;
     ViewPropertySettings* m_node;
-
-    static bool m_nepomukSupport;
 };
 
 #endif