| -rw-r--r-- | library/resource.cpp | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/library/resource.cpp b/library/resource.cpp index 92d4b60..f6b548d 100644 --- a/library/resource.cpp +++ b/library/resource.cpp @@ -32,14 +32,12 @@ #ifndef LIBQPE_NO_INLINE_IMAGES namespace { #include "inlinepics_p.h" } #endif -static bool g_notUseSet = ::getenv("OVERWRITE_ICON_SET"); - /*! \class Resource resource.h \brief The Resource class provides access to named resources. The resources may be provided from files or other sources. @@ -163,43 +161,30 @@ QStringList Resource::allSounds() } static QImage load_image(const QString &name) { QImage img; - if (g_notUseSet ) { - // try file - QString f = Resource::findPixmap(name); - if ( !f.isEmpty() ) - img.load(f); #ifndef LIBQPE_NO_INLINE_IMAGES - if (img.isNull() ) - img = qembed_findImage(name.latin1() ); -#endif + img = qembed_findImage(name.latin1()); +#else + QString f = Resource::findPixmap( "/inline/" + name ); + if ( !f.isEmpty() ) + { + img.load(f); return img; } - else{ -#ifndef LIBQPE_NO_INLINE_IMAGES - img = qembed_findImage(name.latin1()); -#else - QString f = Resource::findPixmap( "/inline/" + name ); +#endif + if ( img.isNull() ) + { + // No inlined image, try file + QString f = Resource::findPixmap(name); if ( !f.isEmpty() ) - { img.load(f); - return img; - } -#endif - if ( img.isNull() ) - { - // No inlined image, try file - QString f = Resource::findPixmap(name); - if ( !f.isEmpty() ) - img.load(f); - } - return img; } + return img; } /*! Returns the QImage called \a name. You should avoid including any filename type extension (e.g. .png, .xpm). */ |