summaryrefslogtreecommitdiff
authorzecke <zecke>2005-02-22 22:18:11 (UTC)
committer zecke <zecke>2005-02-22 22:18:11 (UTC)
commita2eea1c6273acd16fed2406493923c52fba19ebc (patch) (unidiff)
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) (show whitespace changes)
-rw-r--r--library/resource.cpp15
1 files changed, 0 insertions, 15 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 {
35} 35}
36#endif 36#endif
37 37
38static bool g_notUseSet = ::getenv("OVERWRITE_ICON_SET");
39
40/*! 38/*!
41 \class Resource resource.h 39 \class Resource resource.h
42 \brief The Resource class provides access to named resources. 40 \brief The Resource class provides access to named resources.
@@ -166,18 +164,6 @@ static QImage load_image(const QString &name)
166{ 164{
167 QImage img; 165 QImage img;
168 166
169 if (g_notUseSet ) {
170 // try file
171 QString f = Resource::findPixmap(name);
172 if ( !f.isEmpty() )
173 img.load(f);
174#ifndef LIBQPE_NO_INLINE_IMAGES
175 if (img.isNull() )
176 img = qembed_findImage(name.latin1() );
177#endif
178 return img;
179 }
180 else{
181#ifndef LIBQPE_NO_INLINE_IMAGES 167#ifndef LIBQPE_NO_INLINE_IMAGES
182 img = qembed_findImage(name.latin1()); 168 img = qembed_findImage(name.latin1());
183#else 169#else
@@ -197,7 +183,6 @@ static QImage load_image(const QString &name)
197 } 183 }
198 return img; 184 return img;
199 } 185 }
200}
201 186
202/*! 187/*!
203 Returns the QImage called \a name. You should avoid including 188 Returns the QImage called \a name. You should avoid including