| -rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 13 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/skin.h | 2 |
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 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; @@ -97,3 +97,3 @@ 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; @@ -104,3 +104,3 @@ 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; @@ -144,3 +144,3 @@ QImage Skin::buttonMaskImage( const QString &fileName ) const QString path = prefix + fileName + ".png"; - it = d->buttonMasks.insert( fileName, SkinCache::self().loadImage( path ) ); + it = d->buttonMasks.insert( fileName, loadImage( path ) ); } @@ -156,2 +156,7 @@ 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 @@ -59,2 +59,4 @@ private: + static QImage loadImage( const QString &fileName ); + QString m_fileNameInfix; |