Respect Shift- and Control-key for the rubberband selection

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

diff --git a/src/settings/dolphinsettings.cpp b/src/settings/dolphinsettings.cpp
index 5b91001eff8af499b675cc901076298800b12b17..aae684201c49387f32281a16d3c643fed313136f 100644 (file)
--- a/src/settings/dolphinsettings.cpp
+++ b/src/settings/dolphinsettings.cpp
@@ -20,12 +20,11 @@
 
 #include "dolphinsettings.h"
 
-#include <kfileplacesmodel.h>
-#include <kcomponentdata.h>
-#include <klocale.h>
-#include <kstandarddirs.h>
+#include <KFilePlacesModel>
+#include <KComponentData>
+#include <KLocale>
+#include <KStandardDirs>
 
-#include "dolphin_columnmodesettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
@@ -45,34 +44,16 @@ 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_generalSettings = GeneralSettings::self();
     m_placesModel = new KFilePlacesModel();
 }
 
 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;
 }