- get rid of the masks array and re-use the Button structure

2 files changed, 10 insertions, 14 deletions

diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 7d85d63..089ef6a 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -102,7 +102,9 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
     for ( int i = 0; i < 7; i++ ) {
+        Button &button = buttons[ i ];
+
         QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
-        masks[i] = new QBitmap( filename );
+        button.mask = QBitmap( filename );
 
-        if ( !masks[i]->isNull() ) {
-            QImage imgMask = masks[i]->convertToImage();
+        if ( !button.mask.isNull() ) {
+            QImage imgMask = button.mask.convertToImage();
             uchar **dest = buttonMask.jumpTable();
@@ -141,3 +143,2 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
 VideoWidget::~VideoWidget() {
-
     for ( int i = 0; i < 7; i++ ) {
@@ -146,7 +147,2 @@ VideoWidget::~VideoWidget() {
     }
-
-    for ( int i = 0; i < 7; i++ ) {
-        delete masks[i];
-    }
-
 }
@@ -190,7 +186,9 @@ void VideoWidget::resizeEvent( QResizeEvent * ) {
     for ( int i = 0; i < 7; i++ ) {
-        if ( !masks[i]->isNull() ) {
+        Button &button = buttons[ i ];
+
+        if ( !button.mask.isNull() ) {
             delete buttonPixUp[i];
             delete buttonPixDown[i];
-            buttonPixUp[i] = maskVPixToMask( *pixUp, *masks[i] );
-            buttonPixDown[i] = maskVPixToMask( *pixDn, *masks[i] );
+            buttonPixUp[i] = maskVPixToMask( *pixUp, button.mask );
+            buttonPixDown[i] = maskVPixToMask( *pixDn, button.mask );
         }
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index cb6171c..fd301f9 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -102,3 +102,2 @@ private:
     QImage  imgDn;
-    QBitmap *masks[7];
     QPixmap *buttonPixUp[7];
@@ -106,3 +105,2 @@ private:
     QString skin;
-//    QPixmap *pixmaps[4];