Fixes for resource plugin handling on wintendo

4 files changed, 34 insertions, 6 deletions

diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp
index 737b3f2..4cbec94 100644
--- a/microkde/kconfig.cpp
+++ b/microkde/kconfig.cpp
@@ -15,6 +15,6 @@ KConfig::KConfig( const QString &fileName )
   : mFileName( fileName ), mDirty( false )
 {
-  kdDebug() << "KConfig::KConfig(): '" << fileName << "'" << endl;
 
+  mTempGroup = "";
   load();
 
@@ -26,8 +26,20 @@ KConfig::~KConfig()
   sync();
 }
+// we need the temp group for plugins on windows
+void KConfig::setTempGroup( const QString &group )
+{
+  mTempGroup = group;
+
+  if ( mTempGroup.right( 1 ) != "/" ) mTempGroup += "/";
+}
+
+
+QString KConfig::tempGroup() const {
+  return mTempGroup;
+}
 
 void KConfig::setGroup( const QString &group )
 {
-  kdDebug() << "KConfig::setGroup(): '" << group << "'" << endl;
+  
 
   mGroup = group;
@@ -70,5 +82,5 @@ QValueList<int> KConfig::readIntListEntry( const QString & key)
   if (ok2 == false)
   {
-    kdDebug() << "KConfig::readIntListEntry: error while reading one of the intvalues." << endl;
+   
     qDebug("KConfig::readIntListEntry: error while reading one of the intvalues.");
   }
@@ -228,5 +240,5 @@ void KConfig::writeEntry( const QString &key, const QDateTime &dt )
 void KConfig::load()
 {
-  kdDebug() << "KConfig::load(): " << mFileName << endl;
+  
 
   QFile f( mFileName );
diff --git a/microkde/kconfig.h b/microkde/kconfig.h
index bfedf53..a01b1a5 100644
--- a/microkde/kconfig.h
+++ b/microkde/kconfig.h
@@ -16,4 +16,7 @@ class KConfig
     ~KConfig();
   
+    void setTempGroup( const QString &group );
+    QString tempGroup() const;
+
     void setGroup( const QString & );
 
@@ -88,4 +91,5 @@ class KConfig
   private:  
     static QString mGroup;
+    QString mTempGroup;
     
     QString mFileName;
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp
index 1baa6be..785b6b4 100644
--- a/microkde/kresources/managerimpl.cpp
+++ b/microkde/kresources/managerimpl.cpp
@@ -254,10 +254,15 @@ Resource* ManagerImpl::readResourceConfig( const QString& identifier,
 
   mConfig->setGroup( "Resource_" + identifier );
-
+#ifdef _WIN32_
+  // we use plugins on win32. the group is stored in a static variable
+  // such that gourp info not avail on win32 plugins
+  // to fix that, it would be a looooot of work
+  mConfig->setTempGroup( "Resource_" + identifier );
+#endif
   QString type = mConfig->readEntry( "ResourceType" );
   QString name = mConfig->readEntry( "ResourceName" );
   Resource *resource = mFactory->resource( type, mConfig );
   if ( !resource ) {
-    kdDebug(5650) << "Failed to create resource with id " << identifier << endl;
+      qDebug("Failed to create resource with id %s ",identifier.latin1() );
     return 0;
   }
diff --git a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp
index 7827a67..991d53d 100644
--- a/microkde/kresources/resource.cpp
+++ b/microkde/kresources/resource.cpp
@@ -54,4 +54,11 @@ Resource::Resource( const KConfig* config )
   KConfig* cfg = (KConfig*)config;  
   if ( cfg ) {
+#ifdef _WIN32_
+      // we use plugins on win32. the group is stored in a static variable
+      // such that group info not available on win32 plugins
+      // to fix that, it would be a looooot of work
+      if ( !cfg->tempGroup().isEmpty() )
+          cfg->setGroup( cfg->tempGroup() );
+#endif
     d->mType = cfg->readEntry( "ResourceType" );
     d->mName = cfg->readEntry( "ResourceName" );