author | zautrix <zautrix> | 2004-07-08 11:20:17 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-07-08 11:20:17 (UTC) |
commit | 3f84322a2da502f95be386372da9f75ed17df574 (patch) (unidiff) | |
tree | 9a4ccd4568c38d60bb1efa7a6713f4d0914aae86 /microkde/kresources | |
parent | 40cf8102d2f38b5e952b889ffbd19cb1d428fc9b (diff) | |
download | kdepimpi-3f84322a2da502f95be386372da9f75ed17df574.zip kdepimpi-3f84322a2da502f95be386372da9f75ed17df574.tar.gz kdepimpi-3f84322a2da502f95be386372da9f75ed17df574.tar.bz2 |
Fixes for resource plugin handling on wintendo
-rw-r--r-- | microkde/kresources/managerimpl.cpp | 11 | ||||
-rw-r--r-- | microkde/kresources/resource.cpp | 7 |
2 files changed, 15 insertions, 3 deletions
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 | |||
@@ -252,15 +252,20 @@ Resource* ManagerImpl::readResourceConfig( const QString& identifier, | |||
252 | 252 | ||
253 | // qDebug("ManagerImpl::readResourceConfig() %s", identifier.latin1()); | 253 | // qDebug("ManagerImpl::readResourceConfig() %s", identifier.latin1()); |
254 | 254 | ||
255 | mConfig->setGroup( "Resource_" + identifier ); | 255 | mConfig->setGroup( "Resource_" + identifier ); |
256 | 256 | #ifdef _WIN32_ | |
257 | // we use plugins on win32. the group is stored in a static variable | ||
258 | // such that gourp info not avail on win32 plugins | ||
259 | // to fix that, it would be a looooot of work | ||
260 | mConfig->setTempGroup( "Resource_" + identifier ); | ||
261 | #endif | ||
257 | QString type = mConfig->readEntry( "ResourceType" ); | 262 | QString type = mConfig->readEntry( "ResourceType" ); |
258 | QString name = mConfig->readEntry( "ResourceName" ); | 263 | QString name = mConfig->readEntry( "ResourceName" ); |
259 | Resource *resource = mFactory->resource( type, mConfig ); | 264 | Resource *resource = mFactory->resource( type, mConfig ); |
260 | if ( !resource ) { | 265 | if ( !resource ) { |
261 | kdDebug(5650) << "Failed to create resource with id " << identifier << endl; | 266 | qDebug("Failed to create resource with id %s ",identifier.latin1() ); |
262 | return 0; | 267 | return 0; |
263 | } | 268 | } |
264 | 269 | ||
265 | if ( resource->identifier().isEmpty() ) | 270 | if ( resource->identifier().isEmpty() ) |
266 | resource->setIdentifier( identifier ); | 271 | resource->setIdentifier( identifier ); |
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 | |||
@@ -52,8 +52,15 @@ Resource::Resource( const KConfig* config ) | |||
52 | 52 | ||
53 | //US compiler claimed that const discards qualifier | 53 | //US compiler claimed that const discards qualifier |
54 | KConfig* cfg = (KConfig*)config; | 54 | KConfig* cfg = (KConfig*)config; |
55 | if ( cfg ) { | 55 | if ( cfg ) { |
56 | #ifdef _WIN32_ | ||
57 | // we use plugins on win32. the group is stored in a static variable | ||
58 | // such that group info not available on win32 plugins | ||
59 | // to fix that, it would be a looooot of work | ||
60 | if ( !cfg->tempGroup().isEmpty() ) | ||
61 | cfg->setGroup( cfg->tempGroup() ); | ||
62 | #endif | ||
56 | d->mType = cfg->readEntry( "ResourceType" ); | 63 | d->mType = cfg->readEntry( "ResourceType" ); |
57 | d->mName = cfg->readEntry( "ResourceName" ); | 64 | d->mName = cfg->readEntry( "ResourceName" ); |
58 | d->mReadOnly = cfg->readBoolEntry( "ResourceIsReadOnly", false ); | 65 | d->mReadOnly = cfg->readBoolEntry( "ResourceIsReadOnly", false ); |
59 | d->mActive = cfg->readBoolEntry( "ResourceIsActive", true ); | 66 | d->mActive = cfg->readBoolEntry( "ResourceIsActive", true ); |