From 9ae7f1a1b5fbadf4ea40f8d7bf07a637299a091a Mon Sep 17 00:00:00 2001
From: simon <simon>
Date: Wed, 11 Dec 2002 11:52:24 +0000
Subject: - less qimage<>qpixmap conversions

---
(limited to 'noncore')

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
@@ -72,11 +72,10 @@ MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo,
 
 QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fileName )
 {
-    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();
     for ( int y = 0; y < buttonMask.height(); y++ ) {
         uchar *line = dest[y];
@@ -85,7 +84,9 @@ QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fil
                 line[x] = command + 1;
     }
 
-    return mask;
+    // ### grmbl qt2. use constructor when switching to qt3.
+    QBitmap bm; bm = imgMask;
+    return bm;
 }
 
 void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix )
--
cgit v0.9.0.2