- disable cache temporarily

2 files changed, 11 insertions, 4 deletions

diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index 06453f9..d2e3b00 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -89,5 +89,5 @@ QImage Skin::backgroundImage() const
 {
     if ( d->backgroundImage.isNull() )
-        d->backgroundImage = SkinCache::self().loadImage( QString( "%1/background" ).arg( m_skinPath ) );
+        d->backgroundImage = loadImage( QString( "%1/background" ).arg( m_skinPath ) );
     return d->backgroundImage;
 }
@@ -96,5 +96,5 @@ QImage Skin::buttonUpImage() const
 {
     if ( d->buttonUpImage.isNull() )
-        d->buttonUpImage = SkinCache::self().loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
+        d->buttonUpImage = loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
     return d->buttonUpImage;
 }
@@ -103,5 +103,5 @@ QImage Skin::buttonDownImage() const
 {
     if ( d->buttonDownImage.isNull() )
-        d->buttonDownImage = SkinCache::self().loadImage( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
+        d->buttonDownImage = loadImage( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
     return d->buttonDownImage;
 }
@@ -143,5 +143,5 @@ QImage Skin::buttonMaskImage( const QString &fileName ) const
         QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix );
         QString path = prefix + fileName + ".png";
-        it = d->buttonMasks.insert( fileName, SkinCache::self().loadImage( path ) );
+        it = d->buttonMasks.insert( fileName, loadImage( path ) );
     }
     return *it;
@@ -155,4 +155,9 @@ QString Skin::defaultSkinName()
 }
 
+QImage Skin::loadImage( const QString &fileName )
+{
+    return QImage( Resource::findPixmap( fileName ) );
+}
+
 SkinCache::SkinCache()
 {
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index 060ff73..e55832c 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -58,4 +58,6 @@ private:
     void addButtonToMask( int tag, const QImage &maskImage ) const;
 
+    static QImage loadImage( const QString &fileName );
+
     QString m_fileNameInfix;
     QString m_skinPath;