-rw-r--r-- | microkde/kresources/managerimpl.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp index 81bbbec..5bd9eb7 100644 --- a/microkde/kresources/managerimpl.cpp +++ b/microkde/kresources/managerimpl.cpp | |||
@@ -25,24 +25,25 @@ | |||
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | 32 | ||
33 | #include <kapplication.h> | 33 | #include <kapplication.h> |
34 | #include <kdebug.h> | 34 | #include <kdebug.h> |
35 | #include <kconfig.h> | 35 | #include <kconfig.h> |
36 | #include <kstandarddirs.h> | 36 | #include <kstandarddirs.h> |
37 | #include <qfile.h> | ||
37 | 38 | ||
38 | #include "resource.h" | 39 | #include "resource.h" |
39 | #include "factory.h" | 40 | #include "factory.h" |
40 | #include "managerimpl.h" | 41 | #include "managerimpl.h" |
41 | 42 | ||
42 | using namespace KRES; | 43 | using namespace KRES; |
43 | 44 | ||
44 | ManagerImpl::ManagerImpl( const QString &family ) | 45 | ManagerImpl::ManagerImpl( const QString &family ) |
45 | : mFamily( family ), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ), | 46 | : mFamily( family ), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ), |
46 | mFactory( 0 ) | 47 | mFactory( 0 ) |
47 | 48 | ||
48 | { | 49 | { |
@@ -58,25 +59,31 @@ ManagerImpl::~ManagerImpl() | |||
58 | Resource::List::ConstIterator it; | 59 | Resource::List::ConstIterator it; |
59 | for ( it = mResources.begin(); it != mResources.end(); ++it ) { | 60 | for ( it = mResources.begin(); it != mResources.end(); ++it ) { |
60 | delete *it; | 61 | delete *it; |
61 | } | 62 | } |
62 | 63 | ||
63 | delete mStdConfig; | 64 | delete mStdConfig; |
64 | } | 65 | } |
65 | 66 | ||
66 | void ManagerImpl::createStandardConfig() | 67 | void ManagerImpl::createStandardConfig() |
67 | { | 68 | { |
68 | if ( !mStdConfig ) { | 69 | if ( !mStdConfig ) { |
69 | QString file = locateLocal( "data", KGlobal::getAppName() | 70 | QString file = locateLocal( "data", KGlobal::getAppName() |
70 | + "/kresources/" + mFamily + "rc" ); | 71 | + "/kresources/" + mFamily + "rc" ); |
72 | if ( mFamily == "tmpcontact" ) { | ||
73 | if (QFile::exists ( file ) ){ | ||
74 | QFile::remove ( file ); | ||
75 | qDebug("removed tmp rc file: %s ", file.latin1()); | ||
76 | } | ||
77 | } | ||
71 | mStdConfig = new KConfig( file ); | 78 | mStdConfig = new KConfig( file ); |
72 | } | 79 | } |
73 | 80 | ||
74 | mConfig = mStdConfig; | 81 | mConfig = mStdConfig; |
75 | } | 82 | } |
76 | 83 | ||
77 | void ManagerImpl::readConfig( KConfig *cfg ) | 84 | void ManagerImpl::readConfig( KConfig *cfg ) |
78 | { | 85 | { |
79 | kdDebug(5650) << "ManagerImpl::readConfig()" << endl; | 86 | kdDebug(5650) << "ManagerImpl::readConfig()" << endl; |
80 | 87 | ||
81 | delete mFactory; | 88 | delete mFactory; |
82 | mFactory = Factory::self( mFamily ); | 89 | mFactory = Factory::self( mFamily ); |