-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 11 |
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 | |||
@@ -73,9 +73,8 @@ MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, | |||
73 | QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fileName ) | 73 | QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fileName ) |
74 | { | 74 | { |
75 | QBitmap mask( Resource::findPixmap( fileName ) ); | 75 | QImage imgMask( Resource::findPixmap( fileName ) ); |
76 | if ( mask.isNull() ) | 76 | if ( imgMask.isNull() ) |
77 | return mask; | 77 | return QBitmap(); |
78 | 78 | ||
79 | QImage imgMask = mask.convertToImage(); | ||
80 | uchar **dest = buttonMask.jumpTable(); | 79 | uchar **dest = buttonMask.jumpTable(); |
81 | for ( int y = 0; y < buttonMask.height(); y++ ) { | 80 | for ( int y = 0; y < buttonMask.height(); y++ ) { |
@@ -86,5 +85,7 @@ QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fil | |||
86 | } | 85 | } |
87 | 86 | ||
88 | return mask; | 87 | // ### grmbl qt2. use constructor when switching to qt3. |
88 | QBitmap bm; bm = imgMask; | ||
89 | return bm; | ||
89 | } | 90 | } |
90 | 91 | ||