| author | ulf69 <ulf69> | 2004-07-02 15:33:56 (UTC) |
|---|---|---|
| committer | ulf69 <ulf69> | 2004-07-02 15:33:56 (UTC) |
| commit | bb7ad945c1541684a02e853fdaabd0e3ba74f8df (patch) (unidiff) | |
| tree | 4ccde1ffdcb3b14cc6ef4945be87a6e82ff174b4 | |
| parent | df5b4df6bc00ea8acfee0b11a335a9d2f39d04dc (diff) | |
| download | kdepimpi-bb7ad945c1541684a02e853fdaabd0e3ba74f8df.zip kdepimpi-bb7ad945c1541684a02e853fdaabd0e3ba74f8df.tar.gz kdepimpi-bb7ad945c1541684a02e853fdaabd0e3ba74f8df.tar.bz2 | |
removed reentrant solution, for something better
| -rw-r--r-- | microkde/kglobal.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/microkde/kglobal.cpp b/microkde/kglobal.cpp index 6fa0dd6..2b1bd34 100644 --- a/microkde/kglobal.cpp +++ b/microkde/kglobal.cpp | |||
| @@ -31,13 +31,3 @@ KConfig *KGlobal::config() | |||
| 31 | { | 31 | { |
| 32 | static bool reentrant = false; | 32 | //mConfig is set inside setAppName. Though it has to be the first function you call. |
| 33 | |||
| 34 | if (reentrant) | ||
| 35 | return 0; | ||
| 36 | |||
| 37 | if ( !mConfig ) { | ||
| 38 | reentrant = true; | ||
| 39 | mConfig = new KConfig( locateLocal("config", mAppName + "rc" ) ); | ||
| 40 | reentrant = false; | ||
| 41 | } | ||
| 42 | |||
| 43 | return mConfig; | 33 | return mConfig; |
| @@ -97,2 +87,4 @@ void KGlobal::setAppName( const QString &appName ) | |||
| 97 | mAppName = appName; | 87 | mAppName = appName; |
| 88 | |||
| 89 | mConfig = new KConfig( locateLocal("config", mAppName + "rc" ) ); | ||
| 98 | } | 90 | } |