summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/resource.cpp7
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
163static QImage load_image(const QString &name) 163static 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/*!