Get back names, and use "using" keyword to keep GCC silent on "method foo on base...

[dolphin.git] / src / viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index c22b0adc193efcbf8a9b4faad89475c67d6edce0..3a2bb1fc15607b0bf1942f665058ac3730a65358 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -33,8 +33,6 @@
 #include <QFile>
 #include <QFileInfo>
 
 #include <QFile>
 #include <QFileInfo>
 

-bool ViewProperties::m_nepomukSupport = false;
-

 #define FILE_NAME "/.directory"
 
 ViewProperties::ViewProperties(const KUrl& url) :
 #define FILE_NAME "/.directory"
 
 ViewProperties::ViewProperties(const KUrl& url) :


@@ -162,15 +160,7 @@ void ViewProperties::setSorting(DolphinView::Sorting sorting)
 
 DolphinView::Sorting ViewProperties::sorting() const
 {
 
 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)
 }
 
 void ViewProperties::setSortOrder(Qt::SortOrder sortOrder)


@@ -270,6 +260,7 @@ void ViewProperties::setDirProperties(const ViewProperties& props)
     setCategorizedSorting(props.categorizedSorting());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());
     setCategorizedSorting(props.categorizedSorting());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());

+    setSortFoldersFirst(props.sortFoldersFirst());

     setAdditionalInfo(props.additionalInfo());
 }
 
     setAdditionalInfo(props.additionalInfo());
 }