Speed up start times of applications:

	-Do not load MimeType when using Resource::loadIconSet
	 we introduce a global boolean (like TT)
	What is bad: The boolean is visible outside of libqpe and
	we've that extern in the header...
	On the former we can use visibility attributes soon

1 files changed, 10 insertions, 1 deletions

diff --git a/library/resource.h b/library/resource.h
index 1f1ba9a..4a3502a 100644
--- a/library/resource.h
+++ b/library/resource.h
@@ -1,57 +1,66 @@
 /**********************************************************************
 ** 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();
 };
 
+extern bool qpe_fast_findPixmap;
 // Inline for compatibility with SHARP ROMs
-inline QIconSet Resource::loadIconSet( const QString &pix ) 
+inline QIconSet Resource::loadIconSet( const QString &pix )
 {
+    /*
+     * disable the slow load
+     */
+    bool oldMode = qpe_fast_findPixmap;
+    qpe_fast_findPixmap = true;
+
     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 );
+
+    qpe_fast_findPixmap = oldMode;
     return is;
 }
 
 
 #endif