Merged very early alpha-version of Dolphin 2.0

[dolphin.git] / src / settings / dolphinsettings.cpp

diff --git a/src/settings/dolphinsettings.cpp b/src/settings/dolphinsettings.cpp
index 7f160b1410c6c41c77dc7ccf75a6775ecac941c0..9fc0cea3d3f7b0768a9b39163e13efafde5e8847 100644 (file)
--- a/src/settings/dolphinsettings.cpp
+++ b/src/settings/dolphinsettings.cpp
@@ -25,7 +25,6 @@
 #include <KLocale>
 #include <KStandardDirs>
 
-#include "dolphin_columnmodesettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
@@ -45,17 +44,11 @@ DolphinSettings& DolphinSettings::instance()
 void DolphinSettings::save()
 {
     m_generalSettings->writeConfig();
-    m_iconsModeSettings->writeConfig();
-    m_detailsModeSettings->writeConfig();
-    m_columnModeSettings->writeConfig();
 }
 
 DolphinSettings::DolphinSettings()
 {
     m_generalSettings = new GeneralSettings();
-    m_iconsModeSettings = new IconsModeSettings();
-    m_detailsModeSettings = new DetailsModeSettings();
-    m_columnModeSettings = new ColumnModeSettings();
     m_placesModel = new KFilePlacesModel();
 }
 
@@ -64,15 +57,6 @@ DolphinSettings::~DolphinSettings()
     delete m_generalSettings;
     m_generalSettings = 0;
 
-    delete m_iconsModeSettings;
-    m_iconsModeSettings = 0;
-
-    delete m_detailsModeSettings;
-    m_detailsModeSettings = 0;
-
-    delete m_columnModeSettings;
-    m_columnModeSettings = 0;
-
     delete m_placesModel;
     m_placesModel = 0;
 }