Merge branch 'master' into frameworks

[dolphin.git] / src / views / dolphinitemlistview.cpp

diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index 9f600e43fc12d1cc5b73f183eafea648076668cb..60c8bb97c0777509b4ec41f0f4f561e7f5858b79 100644 (file)
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -30,8 +30,6 @@
 #include <kitemviews/kitemlistcontroller.h>
 #include <kitemviews/kitemliststyleoption.h>
 
-#include <KGlobalSettings>
-#include <KGlobal>
 
 #include <views/viewmodecontroller.h>
 
@@ -95,7 +93,7 @@ void DolphinItemListView::readSettings()
     updateFont();
     updateGridSize();
 
-    const KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
+    const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
     const QStringList plugins = globalConfig.readEntry("Plugins", QStringList()
                                                        << "directorythumbnail"
                                                        << "imagethumbnail"
@@ -107,9 +105,9 @@ void DolphinItemListView::readSettings()
 
 void DolphinItemListView::writeSettings()
 {
-    IconsModeSettings::self()->writeConfig();
-    CompactModeSettings::self()->writeConfig();
-    DetailsModeSettings::self()->writeConfig();
+    IconsModeSettings::self()->save();
+    CompactModeSettings::self()->save();
+    DetailsModeSettings::self()->save();
 }
 
 KItemListWidgetCreatorBase* DolphinItemListView::defaultWidgetCreator() const
@@ -263,4 +261,3 @@ ViewModeSettings::ViewMode DolphinItemListView::viewMode() const
     return mode;
 }
 
-#include "dolphinitemlistview.moc"