backport: fixed issue that the item height does not match to the number of lines...

[dolphin.git] / src / dolphinsettings.cpp

diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index 04284c22a324367ecb003099eebda6a149ecd6fa..5b91001eff8af499b675cc901076298800b12b17 100644 (file)
--- 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()