author | zautrix <zautrix> | 2004-10-23 11:40:59 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-23 11:40:59 (UTC) |
commit | 25b0233d54a6d4bea457fd843073e57183d8bea0 (patch) (side-by-side diff) | |
tree | 4d85c3cec59e8b085738be7111c7e2bb0ee7219e /pwmanager | |
parent | ba2583db0431059cd7368be23c9653e81af16d29 (diff) | |
download | kdepimpi-25b0233d54a6d4bea457fd843073e57183d8bea0.zip kdepimpi-25b0233d54a6d4bea457fd843073e57183d8bea0.tar.gz kdepimpi-25b0233d54a6d4bea457fd843073e57183d8bea0.tar.bz2 |
global settings bugfixes
-rw-r--r-- | pwmanager/pwmanager/pwmprefs.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pwmanager/pwmanager/pwmprefs.cpp b/pwmanager/pwmanager/pwmprefs.cpp index fdc34e0..68d5b68 100644 --- a/pwmanager/pwmanager/pwmprefs.cpp +++ b/pwmanager/pwmanager/pwmprefs.cpp @@ -22,25 +22,25 @@ $Id$ */ #include <kconfig.h> #include <klocale.h> #include <kstaticdeleter.h> #include "pwmprefs.h" PWMPrefs *PWMPrefs::sInstance = 0; -static KStaticDeleter<PWMPrefs> staticDeleter; +static KStaticDeleter<PWMPrefs> staticDeleterPP; PWMPrefs::PWMPrefs() : KPimPrefs("pwmanagerrc") { KPrefs::setCurrentGroup( "Global" ); addItemString( "autoStart", &mAutoStart, "" ); addItemString( "browserCommand", &mBrowserCommand, "" ); addItemString( "xtermCommand", &mXTermCommand, CONF_DEFAULT_XTERMCOMMAND); addItemFont( "entryFont", &mEntryFont); addItemInt( "pwTimeout", &mPwTimeout, CONF_DEFAULT_PWTIMEOUT ); addItemInt( "lockTimeout", &mLockTimeout, CONF_DEFAULT_LOCKTIMEOUT ); @@ -59,35 +59,39 @@ PWMPrefs::PWMPrefs() KPrefs::setCurrentGroup( "Wnd" ); addItemSize( "MainWndSize", &mMainWndSize); addItemInt( "MainViewStyle", &mMainViewStyle, CONF_DEFAULT_MAINVIEWSTYLE ); addItemBool( "autoMinimizeOnStart", &mAutoMinimizeOnStart, CONF_DEFAULT_AUTOMINIMIZE ); addItemBool( "close", &mClose, CONF_DEFAULT_WNDCLOSE ); addItemIntList( "commentSplitter", &mCommentSplitter ); addItemIntList( "categorySplitter", &mCategorySplitter ); } PWMPrefs::~PWMPrefs() -{ +{ + if (sInstance == this) + sInstance = staticDeleterPP.setObject(0); + else + qDebug("Whats this? Error in PWMPrefs::~PWMPrefs()?"); } PWMPrefs *PWMPrefs::instance() { if ( !sInstance ) { #ifdef PWM_EMBEDDED - sInstance = staticDeleter.setObject( new PWMPrefs() ); + sInstance = staticDeleterPP.setObject( new PWMPrefs() ); #else //PWM_EMBEDDED //US the following line has changed ???. Why - staticDeleter.setObject( sInstance, new PWMPrefs() ); + staticDeleterPP.setObject( sInstance, new PWMPrefs() ); #endif //KAB_EMBEDDED sInstance->readConfig(); } return sInstance; } // US introduce a nonconst way to return the config object. KConfig* PWMPrefs::getConfig() { return config(); } |