summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-11 19:24:52 (UTC)
committer simon <simon>2002-12-11 19:24:52 (UTC)
commite59fabf981834292c2ed9b7192dd4f789cc4b7cb (patch) (unidiff)
treea2d9bb2b50a1a8ff9bd81d656f59e8df7da6f064
parent073b2388a8c9bd2cc3b4f98025f5fcda424df1c6 (diff)
downloadopie-e59fabf981834292c2ed9b7192dd4f789cc4b7cb.zip
opie-e59fabf981834292c2ed9b7192dd4f789cc4b7cb.tar.gz
opie-e59fabf981834292c2ed9b7192dd4f789cc4b7cb.tar.bz2
- disable cache temporarily
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/skin.cpp13
-rw-r--r--noncore/multimedia/opieplayer2/skin.h2
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
@@ -90,3 +90,3 @@ QImage Skin::backgroundImage() const
90 if ( d->backgroundImage.isNull() ) 90 if ( d->backgroundImage.isNull() )
91 d->backgroundImage = SkinCache::self().loadImage( QString( "%1/background" ).arg( m_skinPath ) ); 91 d->backgroundImage = loadImage( QString( "%1/background" ).arg( m_skinPath ) );
92 return d->backgroundImage; 92 return d->backgroundImage;
@@ -97,3 +97,3 @@ QImage Skin::buttonUpImage() const
97 if ( d->buttonUpImage.isNull() ) 97 if ( d->buttonUpImage.isNull() )
98 d->buttonUpImage = SkinCache::self().loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); 98 d->buttonUpImage = loadImage( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
99 return d->buttonUpImage; 99 return d->buttonUpImage;
@@ -104,3 +104,3 @@ QImage Skin::buttonDownImage() const
104 if ( d->buttonDownImage.isNull() ) 104 if ( d->buttonDownImage.isNull() )
105 d->buttonDownImage = SkinCache::self().loadImage( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ); 105 d->buttonDownImage = loadImage( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) );
106 return d->buttonDownImage; 106 return d->buttonDownImage;
@@ -144,3 +144,3 @@ QImage Skin::buttonMaskImage( const QString &fileName ) const
144 QString path = prefix + fileName + ".png"; 144 QString path = prefix + fileName + ".png";
145 it = d->buttonMasks.insert( fileName, SkinCache::self().loadImage( path ) ); 145 it = d->buttonMasks.insert( fileName, loadImage( path ) );
146 } 146 }
@@ -156,2 +156,7 @@ QString Skin::defaultSkinName()
156 156
157QImage Skin::loadImage( const QString &fileName )
158{
159 return QImage( Resource::findPixmap( fileName ) );
160}
161
157SkinCache::SkinCache() 162SkinCache::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
@@ -59,2 +59,4 @@ private:
59 59
60 static QImage loadImage( const QString &fileName );
61
60 QString m_fileNameInfix; 62 QString m_fileNameInfix;