summaryrefslogtreecommitdiff
authordrw <drw>2005-06-03 23:48:20 (UTC)
committer drw <drw>2005-06-03 23:48:20 (UTC)
commit0fcaa971ee658effa1dc36205df6dfbc43a6b0ad (patch) (side-by-side diff)
tree1c491aa1cad74935d52312520b32892b303a99e3
parent89422e1c42f39e576002e15e1a5a1d51f6053c74 (diff)
downloadopie-0fcaa971ee658effa1dc36205df6dfbc43a6b0ad.zip
opie-0fcaa971ee658effa1dc36205df6dfbc43a6b0ad.tar.gz
opie-0fcaa971ee658effa1dc36205df6dfbc43a6b0ad.tar.bz2
Fix compile error...sorry Mickey...finally remembered to do this...
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/skin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index b95c544..bd176e3 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -145,49 +145,49 @@ void Skin::addButtonToMask( int tag, const QImage &maskImage ) const
line[x] = tag;
}
}
QImage Skin::buttonMaskImage( const QString &fileName ) const
{
SkinData::ButtonMaskImageMap::Iterator it = d->buttonMasks.find( fileName );
if ( it == d->buttonMasks.end() ) {
QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix );
QString path = prefix + fileName;
it = d->buttonMasks.insert( fileName, loadImage( path ) );
}
return *it;
}
QString Skin::defaultSkinName()
{
Config cfg( "OpiePlayer" );
cfg.setGroup( "Options" );
return cfg.readEntry( "Skin", "default" );
}
QImage Skin::loadImage( const QString &fileName )
{
- return QImage( OResource::findPixmap( fileName ) );
+ return QImage( Opie::Core::OResource::findPixmap( fileName ) );
}
SkinCache::SkinCache()
{
// let's say we cache two skins (audio+video) at maximum
m_cache.setMaxCost( 2 );
// ... and one background pixmap
m_backgroundPixmapCache.setMaxCost( 1 );
}
SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &fileNameInfix )
{
QString key = skinPath + fileNameInfix;
SkinData *data = m_cache.take( key );
if ( !data )
data = new SkinData;
else
odebug << "SkinCache: hit" << oendl;
QPixmap *bgPixmap = m_backgroundPixmapCache.find( skinPath );
if ( bgPixmap ) {
odebug << "SkinCache: hit on bgpixmap" << oendl;
data->backgroundPixmap = *bgPixmap;