Revert "Configurable Show hidden files and folders last toggle"

This reverts commit 50149d6abb8a0a978db3c6afb5238bc42a4a89c8.

It breaks the string freeze and I don't think it can count as a bug
fix, so it breaks the feature freeze, too.

CCMAIL: [email protected]

2 files changed, 6 insertions, 29 deletions

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index ef80b4edb..e03ec7c0e 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -34,7 +34,6 @@ KFileItemModel::KFileItemModel(QObject* parent) :
     KItemModelBase("text", parent),
     m_dirLister(nullptr),
     m_sortDirsFirst(true),
-    m_sortHiddenLast(true),
     m_sortRole(NameRole),
     m_sortingProgressPercent(-1),
     m_roles(),
@@ -213,19 +212,6 @@ bool KFileItemModel::sortDirectoriesFirst() const
     return m_sortDirsFirst;
 }
 
-void KFileItemModel::setSortHiddenLast(bool hiddenLast)
-{
-    if (hiddenLast != m_sortHiddenLast) {
-        m_sortHiddenLast = hiddenLast;
-        resortAllItems();
-    }
-}
-
-bool KFileItemModel::sortHiddenLast() const
-{
-    return m_sortHiddenLast;
-}
-
 void KFileItemModel::setShowHiddenFiles(bool show)
 {
     m_dirLister->setShowingDotFiles(show);
@@ -1748,14 +1734,12 @@ bool KFileItemModel::lessThan(const ItemData* a, const ItemData* b, const QColla
     }
 
     // Show hidden files and folders last
-    if (m_sortHiddenLast) {
-        const bool isHiddenA = a->item.isHidden();
-        const bool isHiddenB = b->item.isHidden();
-        if (isHiddenA && !isHiddenB) {
-            return false;
-        } else if (!isHiddenA && isHiddenB) {
-            return true;
-        }
+    const bool isHiddenA = a->item.isHidden();
+    const bool isHiddenB = b->item.isHidden();
+    if (isHiddenA && !isHiddenB) {
+        return false;
+    } else if (!isHiddenA && isHiddenB) {
+        return true;
     }
 
     if (m_sortDirsFirst || (DetailsModeSettings::directorySizeCount() && m_sortRole == SizeRole)) {
diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h
index 33838853d..acf4b761c 100644
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -80,12 +80,6 @@ public:
     void setSortDirectoriesFirst(bool dirsFirst);
     bool sortDirectoriesFirst() const;
 
-    /**
-     * Sets a separate sorting with hidden files and folders last (true) or not (false).
-     */
-    void setSortHiddenLast(bool hiddenLast);
-    bool sortHiddenLast() const;
-
     void setShowHiddenFiles(bool show);
     bool showHiddenFiles() const;
 
@@ -469,7 +463,6 @@ private:
     QCollator m_collator;
     bool m_naturalSorting;
     bool m_sortDirsFirst;
-    bool m_sortHiddenLast;
 
     RoleType m_sortRole;
     int m_sortingProgressPercent; // Value of directorySortingProgress() signal