| author | zecke <zecke> | 2005-05-09 20:12:20 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2005-05-09 20:12:20 (UTC) |
| commit | f7b59d9b31766517bd45cdc54454b68ddf85c448 (patch) (side-by-side diff) | |
| tree | 82cc0f88c4bbd1899511e09879f03376ff9de42b /library/resource.h | |
| parent | b98d495f723dc4bbbaaa4e60c3af97b4d7c852a6 (diff) | |
| download | opie-f7b59d9b31766517bd45cdc54454b68ddf85c448.zip opie-f7b59d9b31766517bd45cdc54454b68ddf85c448.tar.gz opie-f7b59d9b31766517bd45cdc54454b68ddf85c448.tar.bz2 | |
Inline Pictures and Resources:
I hate how the 'compability' inline methods produce nothing but problems...
Do not expose the bool in the header file, this should help alwin...
Most of the time the method is not inlined anyway so not having this bool
accessible outside libqpe is good enough...
| -rw-r--r-- | library/resource.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/library/resource.h b/library/resource.h index 4a3502a..9e4cb54 100644 --- a/library/resource.h +++ b/library/resource.h @@ -42,15 +42,22 @@ public: static QStringList allSounds(); }; +#ifdef OPIE_INTERNAL_LIBRARY_BUILD extern bool qpe_fast_findPixmap; +#endif + + // Inline for compatibility with SHARP ROMs inline QIconSet Resource::loadIconSet( const QString &pix ) { + +#ifdef OPIE_INTERNAL_LIBRARY_BUILD /* * disable the slow load */ bool oldMode = qpe_fast_findPixmap; qpe_fast_findPixmap = true; +#endif QPixmap dpm = loadPixmap( pix + "_disabled" ); QPixmap pm = loadPixmap( pix ); @@ -58,7 +65,10 @@ inline QIconSet Resource::loadIconSet( const QString &pix ) if ( !dpm.isNull() ) is.setPixmap( dpm, pm.width() <= 22 ? QIconSet::Small : QIconSet::Large, QIconSet::Disabled ); +#ifdef OPIE_INTERNAL_LIBRARY_BUILD qpe_fast_findPixmap = oldMode; +#endif + return is; } |