| author | simon <simon> | 2002-12-11 11:52:24 (UTC) |
|---|---|---|
| committer | simon <simon> | 2002-12-11 11:52:24 (UTC) |
| commit | 9ae7f1a1b5fbadf4ea40f8d7bf07a637299a091a (patch) (side-by-side diff) | |
| tree | 08bfee61215df1af5c0a9a7e2068ea3f4fb8045c | |
| parent | 03ac4af4d6014bbd46b12d5fe89ee2cc73941080 (diff) | |
| download | opie-9ae7f1a1b5fbadf4ea40f8d7bf07a637299a091a.zip opie-9ae7f1a1b5fbadf4ea40f8d7bf07a637299a091a.tar.gz opie-9ae7f1a1b5fbadf4ea40f8d7bf07a637299a091a.tar.bz2 | |
- less qimage<>qpixmap conversions
| -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 @@ -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; } |