qtopia resource fixes

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
@@ -13,82 +13,89 @@
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kglobal.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
+#include <qfile.h>
 
 #include "resource.h"
 #include "factory.h"
 #include "managerimpl.h"
 
 using namespace KRES;
 
 ManagerImpl::ManagerImpl( const QString &family )
   : mFamily( family ), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ),
     mFactory( 0 )
 
 {
   kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl;
 
 
 }
 
 ManagerImpl::~ManagerImpl()
 {
   kdDebug(5650) << "ManagerImpl::~ManagerImpl()" << endl;
 
   Resource::List::ConstIterator it;
   for ( it = mResources.begin(); it != mResources.end(); ++it ) {
     delete *it;
   }
 
   delete mStdConfig;
 }
 
 void ManagerImpl::createStandardConfig()
 {
   if ( !mStdConfig ) {
     QString file = locateLocal( "data", KGlobal::getAppName()
-                                + "/kresources/" + mFamily + "rc" );
+                                + "/kresources/" + mFamily + "rc" ); 
+    if (   mFamily == "tmpcontact" ) {
+        if (QFile::exists ( file ) ){
+            QFile::remove ( file ); 
+            qDebug("removed tmp rc file: %s ", file.latin1());
+        }
+    }
     mStdConfig = new KConfig( file );
   }
 
   mConfig = mStdConfig;
 }
 
 void ManagerImpl::readConfig( KConfig *cfg )
 {
   kdDebug(5650) << "ManagerImpl::readConfig()" << endl;
 
   delete mFactory;
   mFactory = Factory::self( mFamily );
 
   if ( !cfg ) {
     createStandardConfig();
   } else {
     mConfig = cfg;
   }
 
   mStandard = 0;
 
   mConfig->setGroup( "General" );
 
   QStringList keys = mConfig->readListEntry( "ResourceKeys" );