┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/dolphinsettings.cpp
diff options
context:
space:
mode:
authorDavid Faure <[email protected]>2008-01-23 15:38:29 +0000
committerDavid Faure <[email protected]>2008-01-23 15:38:29 +0000
commiteca778ce68dcff65962edba88cd9f61d36824ee0 (patch)
treec019aea06a0ec29615d8b25985f439c10e3cf552 /src/dolphinsettings.cpp
parent3b30141f6926ae064c52d5571d58484d2f9ef4c0 (diff)
Fix memory leak using K_GLOBAL_STATIC
svn path=/branches/KDE/4.0/kdebase/apps/; revision=765228
Diffstat (limited to 'src/dolphinsettings.cpp')
-rw-r--r--src/dolphinsettings.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index 04284c22a..5b91001ef 100644
--- a/src/dolphinsettings.cpp
+++ b/src/dolphinsettings.cpp
@@ -30,13 +30,16 @@
#include "dolphin_generalsettings.h"
#include "dolphin_iconsmodesettings.h"
+class DolphinSettingsSingleton
+{
+public:
+ DolphinSettings instance;
+};
+K_GLOBAL_STATIC(DolphinSettingsSingleton, s_settings)
+
DolphinSettings& DolphinSettings::instance()
{
- static DolphinSettings* instance = 0;
- if (instance == 0) {
- instance = new DolphinSettings();
- }
- return *instance;
+ return s_settings->instance;
}
void DolphinSettings::save()