summaryrefslogtreecommitdiff
path: root/library/resource.h
authorzecke <zecke>2005-05-09 20:12:20 (UTC)
committer zecke <zecke>2005-05-09 20:12:20 (UTC)
commitf7b59d9b31766517bd45cdc54454b68ddf85c448 (patch) (unidiff)
tree82cc0f88c4bbd1899511e09879f03376ff9de42b /library/resource.h
parentb98d495f723dc4bbbaaa4e60c3af97b4d7c852a6 (diff)
downloadopie-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...
Diffstat (limited to 'library/resource.h') (more/less context) (ignore whitespace changes)
-rw-r--r--library/resource.h10
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:
42 static QStringList allSounds(); 42 static QStringList allSounds();
43}; 43};
44 44
45#ifdef OPIE_INTERNAL_LIBRARY_BUILD
45extern bool qpe_fast_findPixmap; 46extern bool qpe_fast_findPixmap;
47#endif
48
49
46// Inline for compatibility with SHARP ROMs 50// Inline for compatibility with SHARP ROMs
47inline QIconSet Resource::loadIconSet( const QString &pix ) 51inline QIconSet Resource::loadIconSet( const QString &pix )
48{ 52{
53
54#ifdef OPIE_INTERNAL_LIBRARY_BUILD
49 /* 55 /*
50 * disable the slow load 56 * disable the slow load
51 */ 57 */
52 bool oldMode = qpe_fast_findPixmap; 58 bool oldMode = qpe_fast_findPixmap;
53 qpe_fast_findPixmap = true; 59 qpe_fast_findPixmap = true;
60#endif
54 61
55 QPixmap dpm = loadPixmap( pix + "_disabled" ); 62 QPixmap dpm = loadPixmap( pix + "_disabled" );
56 QPixmap pm = loadPixmap( pix ); 63 QPixmap pm = loadPixmap( pix );
@@ -58,7 +65,10 @@ inline QIconSet Resource::loadIconSet( const QString &pix )
58 if ( !dpm.isNull() ) 65 if ( !dpm.isNull() )
59 is.setPixmap( dpm, pm.width() <= 22 ? QIconSet::Small : QIconSet::Large, QIconSet::Disabled ); 66 is.setPixmap( dpm, pm.width() <= 22 ? QIconSet::Small : QIconSet::Large, QIconSet::Disabled );
60 67
68#ifdef OPIE_INTERNAL_LIBRARY_BUILD
61 qpe_fast_findPixmap = oldMode; 69 qpe_fast_findPixmap = oldMode;
70#endif
71
62 return is; 72 return is;
63} 73}
64 74