- added a missing const

- QImage and QPixmap are value based classes, so use them like that for
  a couple of objects. simplifies the code and helps to avoid memory leaks

2 files changed, 28 insertions, 34 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 5cdfbf2..46d374d 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -73,9 +73,9 @@ MediaButton audioButtons[] = {
    { FALSE, FALSE, FALSE }, // forward
    { FALSE, FALSE, FALSE }  // back
 };
 
-const char *skin_mask_file_names[10] = {
+const char * const skin_mask_file_names[10] = {
    "play", "stop", "next", "prev", "up",
    "down", "loop", "playlist", "forward", "back"
 };
 
@@ -102,25 +102,25 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     //skin = "scaleTest";
     // color of background, frame, degree of transparency
 
     QString skinPath = "opieplayer2/skins/" + skin;
-    pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
-    imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
-    imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
+    pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
+    imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
+    imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
 
-    imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
-    imgButtonMask->fill( 0 );
+    imgButtonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 );
+    imgButtonMask.fill( 0 );
 
     for ( int i = 0; i < 10; i++ ) {
         QString filename = QString( QPEApplication::qpeDir()  + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png" );
         masks[i] = new QBitmap( filename );
 
         if ( !masks[i]->isNull() ) {
             QImage imgMask = masks[i]->convertToImage();
-            uchar **dest = imgButtonMask->jumpTable();
-            for ( int y = 0; y < imgUp->height(); y++ ) {
+            uchar **dest = imgButtonMask.jumpTable();
+            for ( int y = 0; y < imgUp.height(); y++ ) {
                 uchar *line = dest[y];
-                for ( int x = 0; x < imgUp->width(); x++ )
+                for ( int x = 0; x < imgUp.width(); x++ )
                     if ( !qRed( imgMask.pixel( x, y ) ) )
                         line[x] = i + 1;
             }
         }
@@ -131,9 +131,9 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
         buttonPixUp[i] = 0l;
         buttonPixDown[i] = 0l;
     }
 
-    setBackgroundPixmap( *pixBg );
+    setBackgroundPixmap( pixBg );
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
 //    changeTextColor( &songInfo );
 //    songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
@@ -144,9 +144,9 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     slider.setFixedHeight( 20 );
     slider.setMinValue( 0 );
     slider.setMaxValue( 1 );
     slider.setFocusPolicy( QWidget::NoFocus );
-    slider.setBackgroundPixmap( *pixBg );
+    slider.setBackgroundPixmap( pixBg );
 
 //     Config cofg("qpe");
 //     cofg.setGroup("Appearance");
 //     QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) );
@@ -184,26 +184,22 @@ AudioWidget::~AudioWidget() {
     for ( int i = 0; i < 10; i++ ) {
         delete buttonPixUp[i];
         delete buttonPixDown[i];
     }
-    delete pixBg;
-    delete imgUp;
-    delete imgDn;
-    delete imgButtonMask;
     for ( int i = 0; i < 10; i++ ) {
         delete masks[i];
     }
 //    mediaPlayerState->setPlaying(false);
 }
 
 namespace {
 
-QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
+QPixmap combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
     QPixmap pix( img.width(), img.height() );
     QPainter p( &pix );
     p.drawTiledPixmap( pix.rect(), bg, offset );
     p.drawImage( 0, 0, img );
-    return new QPixmap( pix );
+    return pix;
 }
 
 
 QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) {
@@ -223,26 +219,23 @@ void AudioWidget::resizeEvent( QResizeEvent * ) {
     slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) );
     slider.setBackgroundOrigin( QWidget::ParentOrigin );
     time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) );
 
-    xoff = ( w - imgUp->width() ) / 2;
-    yoff = (( h - imgUp->height() ) / 2) - 10;
+    xoff = ( w - imgUp.width() ) / 2;
+    yoff = (( h - imgUp.height() ) / 2) - 10;
     QPoint p( xoff, yoff );
 
-    QPixmap *pixUp = combineImageWithBackground( *imgUp, *pixBg, p );
-    QPixmap *pixDn = combineImageWithBackground( *imgDn, *pixBg, p );
+    QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p );
+    QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p );
 
     for ( int i = 0; i < 10; i++ ) {
         if ( !masks[i]->isNull() ) {
             delete buttonPixUp[i];
             delete buttonPixDown[i];
-            buttonPixUp[i] = maskPixToMask( *pixUp, *masks[i] );
-            buttonPixDown[i] = maskPixToMask( *pixDn, *masks[i] );
+            buttonPixUp[i] = maskPixToMask( pixUp, *masks[i] );
+            buttonPixDown[i] = maskPixToMask( pixDn, *masks[i] );
         }
     }
-
-    delete pixUp;
-    delete pixDn;
 }
 
 static bool audioSliderBeingMoved = FALSE;
 
@@ -396,11 +389,11 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
             // The test to see if the mouse click is inside the button or not
             int x = event->pos().x() - xoff;
             int y = event->pos().y() - yoff;
 
-            bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width()
-                                && y < imgButtonMask->height()
-                                && imgButtonMask->pixelIndex( x, y ) == i + 1 );
+            bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask.width()
+                                && y < imgButtonMask.height()
+                                && imgButtonMask.pixelIndex( x, y ) == i + 1 );
 
             if ( isOnButton && !audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = TRUE;
                 toggleButton(i);
@@ -480,9 +473,9 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) {
           // Combine with background and double buffer
         QPixmap pix( pe->rect().size() );
         QPainter p( &pix );
         p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
-        p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() );
+        p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
         for ( int i = 0; i < numButtons; i++ )
             paintButton( &p, i );
         QPainter p2( this );
         p2.drawPixmap( pe->rect().topLeft(), pix );
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 7cb1d79..54adb36 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -41,8 +41,9 @@
 #include <qstring.h>
 #include <qslider.h>
 #include <qframe.h>
 #include <qlineedit.h>
+#include <qimage.h>
 
 #include <opie/oticker.h>
 
 class QPixmap;
@@ -112,12 +113,12 @@ private:
     void setToggleButton( int, bool );
     void paintButton( QPainter *p, int i );
     int skipDirection;
     QString skin;
-    QPixmap *pixBg;
-    QImage  *imgUp;
-    QImage  *imgDn;
-    QImage  *imgButtonMask;
+    QPixmap pixBg;
+    QImage  imgUp;
+    QImage  imgDn;
+    QImage  imgButtonMask;
     QBitmap *masks[10];
     QPixmap *buttonPixUp[10];
     QPixmap *buttonPixDown[10];