summaryrefslogtreecommitdiff
authorzecke <zecke>2005-05-09 20:12:20 (UTC)
committer zecke <zecke>2005-05-09 20:12:20 (UTC)
commitf7b59d9b31766517bd45cdc54454b68ddf85c448 (patch) (side-by-side diff)
tree82cc0f88c4bbd1899511e09879f03376ff9de42b
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 (more/less context) (ignore whitespace changes)
-rw-r--r--library/library.pro2
-rw-r--r--library/resource.h10
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
@@ -120,12 +120,14 @@ SOURCES = calendar.cpp \
# Qt 3 compatibility
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
LIBS += -ldl -lcrypt -lm
INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
TARGET = qpe
DESTDIR = $(OPIEDIR)/lib$(PROJMAK)
VERSION = 1.5.0.1
diff --git a/library/resource.h b/library/resource.h
index 4a3502a..9e4cb54 100644
--- a/library/resource.h
+++ b/library/resource.h
@@ -39,28 +39,38 @@ public:
static QIconSet loadIconSet( const QString &name );
static QString findSound( const QString &name );
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 );
QIconSet is( pm );
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;
}
#endif