From 3957884bf2e44619a4ed35ba0ffead519988885b Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Mon, 8 Aug 2011 23:41:18 +0200 Subject: Improvements for selections, smooth scrolling, tooltips and info-panel --- src/settings/dolphin_generalsettings.kcfgc | 4 ++-- src/settings/dolphinsettings.cpp | 5 +---- src/settings/general/behaviorsettingspage.cpp | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/settings') 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) { -- cgit v1.3