summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/mediawidget.cpp
Side-by-side diff
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediawidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 865ff91..70ef8d9 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -74,7 +74,6 @@ QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fil
{
- QBitmap mask( Resource::findPixmap( fileName ) );
- if ( mask.isNull() )
- return mask;
+ QImage imgMask( Resource::findPixmap( fileName ) );
+ if ( imgMask.isNull() )
+ return QBitmap();
- QImage imgMask = mask.convertToImage();
uchar **dest = buttonMask.jumpTable();
@@ -87,3 +86,5 @@ QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fil
- return mask;
+ // ### grmbl qt2. use constructor when switching to qt3.
+ QBitmap bm; bm = imgMask;
+ return bm;
}