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

2 files changed, 20 insertions, 0 deletions

diff --git a/library/resource.cpp b/library/resource.cpp
index 18139b9..da09892 100644
--- a/library/resource.cpp
+++ b/library/resource.cpp
@@ -27,2 +27,8 @@
 
+/*
+ * enable or disable the search for the icon without .png or .xpm
+ * suffix. We would use MimeType to lookup possible extensions...
+ */
+bool qpe_fast_findPixmap = false; // visible in libqpe
+
 // this namespace is just a workaround for a gcc bug
@@ -74,2 +80,4 @@ QPixmap Resource::loadPixmap( const QString &pix )
         }
+    }else {
+        qWarning("In Cache for %s pixmap %s", qApp->argv()[0], pix.local8Bit().data() );
     }
@@ -142,2 +150,4 @@ QString Resource::findPixmap( const QString &pix )
 
+    if ( !qpe_fast_findPixmap ) {
+        printf("Doing slow search for %s %s\n", qApp->argv()[0], pix.local8Bit().data() );
     // All formats...
@@ -153,2 +163,3 @@ QString Resource::findPixmap( const QString &pix )
         return picsPath + pix;
+    }
 
diff --git a/library/resource.h b/library/resource.h
index 1f1ba9a..4a3502a 100644
--- a/library/resource.h
+++ b/library/resource.h
@@ -44,2 +44,3 @@ public:
 
+extern bool qpe_fast_findPixmap;
 // Inline for compatibility with SHARP ROMs
@@ -47,2 +48,8 @@ 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" );
@@ -52,2 +59,4 @@ inline QIconSet Resource::loadIconSet( const QString &pix )
         is.setPixmap( dpm, pm.width() <= 22 ? QIconSet::Small : QIconSet::Large, QIconSet::Disabled );
+
+    qpe_fast_findPixmap = oldMode;
     return is;