summaryrefslogtreecommitdiff
authorzecke <zecke>2005-02-22 22:18:11 (UTC)
committer zecke <zecke>2005-02-22 22:18:11 (UTC)
commita2eea1c6273acd16fed2406493923c52fba19ebc (patch) (side-by-side diff)
treec0ab063876da2129b74956fa50092384a39449cb
parente5d8117ff25ff91b4ba8029a63b6ffed4ea56d38 (diff)
downloadopie-a2eea1c6273acd16fed2406493923c52fba19ebc.zip
opie-a2eea1c6273acd16fed2406493923c52fba19ebc.tar.gz
opie-a2eea1c6273acd16fed2406493923c52fba19ebc.tar.bz2
Remove overriding of inline pictures. We now can easily disable compilation
of compiled in icons
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/resource.cpp39
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
@@ -35,8 +35,6 @@ namespace {
}
#endif
-static bool g_notUseSet = ::getenv("OVERWRITE_ICON_SET");
-
/*!
\class Resource resource.h
\brief The Resource class provides access to named resources.
@@ -166,37 +164,24 @@ 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;
}
/*!