author | zecke <zecke> | 2005-02-22 22:33:23 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-02-22 22:33:23 (UTC) |
commit | e33e10f5643a2fb5c640667939e4139bf7b580e2 (patch) (unidiff) | |
tree | 335b67bdf59a85235aeb3195062a894a9298913d | |
parent | 214b14b03ca3806142eacb2248af98a06f765e2a (diff) | |
download | opie-e33e10f5643a2fb5c640667939e4139bf7b580e2.zip opie-e33e10f5643a2fb5c640667939e4139bf7b580e2.tar.gz opie-e33e10f5643a2fb5c640667939e4139bf7b580e2.tar.bz2 |
No special (2nd) lookup for the inline pictures. This saves additional seeks.
people not having defined LIBQPE_... will not notice a different as we still
default to inline pictures
-rw-r--r-- | library/resource.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/library/resource.cpp b/library/resource.cpp index f6b548d..a093e2f 100644 --- a/library/resource.cpp +++ b/library/resource.cpp | |||
@@ -157,31 +157,24 @@ QStringList Resource::allSounds() | |||
157 | QStringList result; | 157 | QStringList result; |
158 | for (QStringList::Iterator i=entries.begin(); i != entries.end(); ++i) | 158 | for (QStringList::Iterator i=entries.begin(); i != entries.end(); ++i) |
159 | result.append((*i).replace(QRegExp("\\.wav"),"")); | 159 | result.append((*i).replace(QRegExp("\\.wav"),"")); |
160 | return result; | 160 | return result; |
161 | } | 161 | } |
162 | 162 | ||
163 | static QImage load_image(const QString &name) | 163 | static QImage load_image(const QString &name) |
164 | { | 164 | { |
165 | QImage img; | 165 | QImage img; |
166 | 166 | ||
167 | #ifndef LIBQPE_NO_INLINE_IMAGES | 167 | #ifndef LIBQPE_NO_INLINE_IMAGES |
168 | img = qembed_findImage(name.latin1()); | 168 | img = qembed_findImage(name.latin1()); |
169 | #else | ||
170 | QString f = Resource::findPixmap( "/inline/" + name ); | ||
171 | if ( !f.isEmpty() ) | ||
172 | { | ||
173 | img.load(f); | ||
174 | return img; | ||
175 | } | ||
176 | #endif | 169 | #endif |
177 | if ( img.isNull() ) | 170 | if ( img.isNull() ) |
178 | { | 171 | { |
179 | // No inlined image, try file | 172 | // No inlined image, try file |
180 | QString f = Resource::findPixmap(name); | 173 | QString f = Resource::findPixmap(name); |
181 | if ( !f.isEmpty() ) | 174 | if ( !f.isEmpty() ) |
182 | img.load(f); | 175 | img.load(f); |
183 | } | 176 | } |
184 | return img; | 177 | return img; |
185 | } | 178 | } |
186 | 179 | ||
187 | /*! | 180 | /*! |