author | mickeyl <mickeyl> | 2005-02-19 18:09:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-02-19 18:09:40 (UTC) |
commit | 5909f43e922a066637127e48c2e3d99685e4871a (patch) (side-by-side diff) | |
tree | 9d87440d0494a52cc8314148e0994039a3856314 | |
parent | 112337f13c70f1266430f154d486b6f23ec18488 (diff) | |
download | opie-5909f43e922a066637127e48c2e3d99685e4871a.zip opie-5909f43e922a066637127e48c2e3d99685e4871a.tar.gz opie-5909f43e922a066637127e48c2e3d99685e4871a.tar.bz2 |
back out an unintentionally commited change
-rw-r--r-- | library/resource.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/library/resource.cpp b/library/resource.cpp index 3b5e9ec..92d4b60 100644 --- a/library/resource.cpp +++ b/library/resource.cpp @@ -95,43 +95,32 @@ QBitmap Resource::loadBitmap( const QString &pix ) Normally you will use loadPixmap() rather than this function. */ QString Resource::findPixmap( const QString &pix ) { QString picsPath = QPEApplication::qpeDir() + "pics/"; QString f; // Common case optimizations... f = picsPath + pix + ".png"; if ( QFile( f ).exists() ) return f; f = picsPath + pix + ".xpm"; if ( QFile( f ).exists() ) return f; -#ifdef LIBQPE_NO_INLINE_IMAGES - QString picsPathInline = picsPath + "inline/"; - // Common case optimizations... - f = picsPathInline + pix + ".png"; - if ( QFile( f ).exists() ) - return f; - f = picsPathInline + pix + ".xpm"; - if ( QFile( f ).exists() ) - return f; -#endif - // All formats... QStrList fileFormats = QImageIO::inputFormats(); QString ff = fileFormats.first(); while ( fileFormats.current() ) { QStringList exts = MimeType("image/"+ff.lower()).extensions(); for ( QStringList::ConstIterator it = exts.begin(); it!=exts.end(); ++it ) { QString f = picsPath + pix + "." + *it; if ( QFile(f).exists() ) return f; } ff = fileFormats.next(); } // Finally, no (or existing) extension... if ( QFile( picsPath + pix ).exists() ) return picsPath + pix; |