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...

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
@@ -30,110 +30,112 @@ HEADERS	=   calendar.h \
 	    datebookdb.h \
 	    alarmserver.h \
 	    process.h \
 	    password.h \
 	    timestring.h \
 	    fontfactoryinterface.h \
 	    fontdatabase.h \
 	    power.h \
 	    storage.h \
 	    qpemessagebox.h \
 	    timeconversion.h \
 	    qpedebug.h \
 	    qpemenubar.h \
 	    qpetoolbar.h \
 	    backend/categories.h \
 	    stringutil.h \
 	    backend/palmtoprecord.h \
             backend/task.h \
 	    backend/event.h \
 	    backend/contact.h\
 	    categorymenu.h \
 	    categoryedit_p.h \
 	    categoryselect.h \
 	    categorywidget.h \
 	ir.h \
 	backend/vobject_p.h \
 	findwidget_p.h \
 	finddialog.h \
 	lnkproperties.h \
 	windowdecorationinterface.h \
 	textcodecinterface.h \
 	imagecodecinterface.h \
 	qpeglobal.h
 	
 SOURCES	=   calendar.cpp \
 	    global.cpp \
 	    xmlreader.cpp \
 	    mimetype.cpp \
 	    menubutton.cpp \
 	    network.cpp \
 	    networkinterface.cpp \
 	    filemanager.cpp \
 	    fontmanager.cpp \
 	    qdawg.cpp \
 	    datebookmonth.cpp \
 	    fileselector.cpp \
 	    imageedit.cpp \
 	    resource.cpp \
 	    qpedecoration_qws.cpp \
 	    qcopenvelope_qws.cpp \
 	    qpeapplication.cpp \
 	    qpestyle.cpp \
 	    qpedialog.cpp \
 	    lightstyle.cpp \
 	    config.cpp \
 	    applnk.cpp \
 	    sound.cpp \
 	    tzselect.cpp \
 	    qmath.c \
 	    datebookdb.cpp \
 	    alarmserver.cpp \
 	    password.cpp \
 	    process.cpp \
 	    process_unix.cpp \
 	    timestring.cpp \
 	    fontdatabase.cpp \
 	    power.cpp \
 	    storage.cpp \
 	    qpemessagebox.cpp \
             backend/timeconversion.cpp \
 	    qpedebug.cpp \
 	    qpemenubar.cpp \
 	    qpetoolbar.cpp \
 	    backend/categories.cpp \
 	    backend/stringutil.cpp \
 	    backend/palmtoprecord.cpp \
             backend/task.cpp \
 	    backend/event.cpp \
 	    backend/contact.cpp \
 	    categorymenu.cpp \
 	categoryedit_p.cpp \
 	categoryselect.cpp \
 	categorywidget.cpp \
 	ir.cpp \
 	backend/vcc_yacc.cpp \
 	backend/vobject.cpp \
 	findwidget_p.cpp \
 	finddialog.cpp \
 	lnkproperties.cpp \
 	widget_showing.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
 
 include( $(OPIEDIR)/include.pro )
 
 contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){
     DEFINES += OPIE_WITHROHFEEDBACK
     SOURCES += backend/rohfeedback.cpp
     HEADERS += backend/rohfeedback.h
 }
diff --git a/library/resource.h b/library/resource.h
index 4a3502a..9e4cb54 100644
--- a/library/resource.h
+++ b/library/resource.h
@@ -1,66 +1,76 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef PIXMAPLOADER_H
 #define PIXMAPLOADER_H
 
 #include <qimage.h>
 #include <qbitmap.h>
 #include <qiconset.h>
 #include <qstringlist.h>
 
 class Resource
 {
 public:
     Resource() {}
 
     static QImage loadImage( const QString &name);
 
     static QPixmap loadPixmap( const QString &name );
     static QBitmap loadBitmap( const QString &name );
     static QString findPixmap( const QString &name );
 
     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