Port Dolphin away from KApplication, KCmdLineArgs and K4AboutData

[dolphin.git] / src / kitemviews / kfileitemmodel.cpp

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 98249dbd982d39ee796bd3bb4e6554a58a8725b6..019891211e47e4a9b13b0d77083f758159e48378 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -21,7 +21,8 @@
 
 #include "kfileitemmodel.h"
 
 
 #include "kfileitemmodel.h"
 

-#include <KGlobalSettings>
+#include "dolphin_generalsettings.h"
+

 #include <KLocalizedString>
 #include <KStringHandler>
 #include <KDebug>
 #include <KLocalizedString>
 #include <KStringHandler>
 #include <KDebug>


@@ -41,7 +42,7 @@
 KFileItemModel::KFileItemModel(QObject* parent) :
     KItemModelBase("text", parent),
     m_dirLister(0),
 KFileItemModel::KFileItemModel(QObject* parent) :
     KItemModelBase("text", parent),
     m_dirLister(0),

-    m_naturalSorting(KGlobalSettings::naturalSorting()),
+    m_naturalSorting(GeneralSettings::naturalSorting()),

     m_sortDirsFirst(true),
     m_sortRole(NameRole),
     m_sortingProgressPercent(-1),
     m_sortDirsFirst(true),
     m_sortRole(NameRole),
     m_sortingProgressPercent(-1),


@@ -106,7 +107,7 @@ KFileItemModel::KFileItemModel(QObject* parent) :
     m_resortAllItemsTimer->setSingleShot(true);
     connect(m_resortAllItemsTimer, &QTimer::timeout, this, &KFileItemModel::resortAllItems);
 
     m_resortAllItemsTimer->setSingleShot(true);
     connect(m_resortAllItemsTimer, &QTimer::timeout, this, &KFileItemModel::resortAllItems);
 

-    connect(KGlobalSettings::self(), &KGlobalSettings::naturalSortingChanged,
+    connect(GeneralSettings::self(), &GeneralSettings::naturalSortingChanged,

             this, &KFileItemModel::slotNaturalSortingChanged);
 }
 
             this, &KFileItemModel::slotNaturalSortingChanged);
 }
 


@@ -1105,7 +1106,7 @@ void KFileItemModel::slotClear()
 
 void KFileItemModel::slotNaturalSortingChanged()
 {
 
 void KFileItemModel::slotNaturalSortingChanged()
 {

-    m_naturalSorting = KGlobalSettings::naturalSorting();
+    m_naturalSorting = GeneralSettings::naturalSorting();

     resortAllItems();
 }
 
     resortAllItems();
 }