| 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 | |
| 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/library.pro | 2 | ||||
| -rw-r--r-- | library/resource.h | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/library/library.pro b/library/library.pro index 95c18a2..7143454 100644 --- a/library/library.pro +++ b/library/library.pro @@ -125,2 +125,4 @@ HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp + +DEFINES += OPIE_INTERNAL_LIBRARY_BUILD INCLUDEPATH += $(OPIEDIR)/include backend diff --git a/library/resource.h b/library/resource.h index 4a3502a..9e4cb54 100644 --- a/library/resource.h +++ b/library/resource.h @@ -44,3 +44,7 @@ public: +#ifdef OPIE_INTERNAL_LIBRARY_BUILD extern bool qpe_fast_findPixmap; +#endif + + // Inline for compatibility with SHARP ROMs @@ -48,2 +52,4 @@ inline QIconSet Resource::loadIconSet( const QString &pix ) { + +#ifdef OPIE_INTERNAL_LIBRARY_BUILD /* @@ -53,2 +59,3 @@ inline QIconSet Resource::loadIconSet( const QString &pix ) qpe_fast_findPixmap = true; +#endif @@ -60,3 +67,6 @@ inline QIconSet Resource::loadIconSet( const QString &pix ) +#ifdef OPIE_INTERNAL_LIBRARY_BUILD qpe_fast_findPixmap = oldMode; +#endif + return is; |