┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/dolphin_generalsettings.kcfgc4
-rw-r--r--src/settings/dolphinsettings.cpp5
-rw-r--r--src/settings/general/behaviorsettingspage.cpp2
3 files changed, 4 insertions, 7 deletions
diff --git a/src/settings/dolphin_generalsettings.kcfgc b/src/settings/dolphin_generalsettings.kcfgc
index 91b1fee46..7090dbce4 100644
--- a/src/settings/dolphin_generalsettings.kcfgc
+++ b/src/settings/dolphin_generalsettings.kcfgc
@@ -1,4 +1,4 @@
File=dolphin_generalsettings.kcfg
-ClassName=GeneralSettings
-Singleton=false
+ClassName=GeneralSettings
+Singleton=yes
Mutators=true
diff --git a/src/settings/dolphinsettings.cpp b/src/settings/dolphinsettings.cpp
index 9fc0cea3d..aae684201 100644
--- a/src/settings/dolphinsettings.cpp
+++ b/src/settings/dolphinsettings.cpp
@@ -48,15 +48,12 @@ void DolphinSettings::save()
DolphinSettings::DolphinSettings()
{
- m_generalSettings = new GeneralSettings();
+ m_generalSettings = GeneralSettings::self();
m_placesModel = new KFilePlacesModel();
}
DolphinSettings::~DolphinSettings()
{
- delete m_generalSettings;
- m_generalSettings = 0;
-
delete m_placesModel;
m_placesModel = 0;
}
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 814304801..8a5b070ce 100644
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -122,7 +122,7 @@ void BehaviorSettingsPage::applySettings()
const bool useGlobalProps = m_globalProps->isChecked();
- GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+ GeneralSettings* settings = GeneralSettings::self();
settings->setGlobalViewProps(useGlobalProps);
if (useGlobalProps) {