5 files changed, 17 insertions, 14 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index d083273..10b1e58 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -333,21 +333,21 @@ void AudioWidget::setToggleButton( int i, bool down ) {
 }
 
 
 void AudioWidget::toggleButton( int i ) {
     buttons[i].isDown = !buttons[i].isDown;
     QPainter p(this);
-    paintButton ( &p, i );
+    paintButton ( p, i );
 }
 
 
-void AudioWidget::paintButton( QPainter *p, int i ) {
+void AudioWidget::paintButton( QPainter &p, int i ) {
     if ( buttons[i].isDown ) {
-        p->drawPixmap( upperLeftOfButtonMask, *buttonPixDown[i] );
+        p.drawPixmap( upperLeftOfButtonMask, *buttonPixDown[i] );
     } else {
-        p->drawPixmap( upperLeftOfButtonMask, *buttonPixUp[i] );
+        p.drawPixmap( upperLeftOfButtonMask, *buttonPixUp[i] );
     }
 }
 
 
 void AudioWidget::skipFor() {
     skipDirection = +1;
@@ -439,19 +439,19 @@ 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() );
         for ( unsigned int i = 0; i < buttons.size(); i++ )
-            paintButton( &p, i );
+            paintButton( p, i );
         QPainter p2( this );
         p2.drawPixmap( pe->rect().topLeft(), pix );
     } else {
         QPainter p( this );
         for ( unsigned int i = 0; i < buttons.size(); i++ )
-            paintButton( &p, i );
+            paintButton( p, i );
     }
 }
 
 void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
         ////////////////////////////// Zaurus keys
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index acf2dda..a1a839c 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -90,13 +90,13 @@ private slots:
     void skipFor();
     void skipBack();
     void stopSkip();
 private:
     void toggleButton( int );
     void setToggleButton( int, bool );
-    void paintButton( QPainter *p, int i );
+    virtual void paintButton( QPainter &p, int i );
     int skipDirection;
     QString skin;
     QPixmap pixBg;
     QImage  imgUp;
     QImage  imgDn;
     QBitmap *masks[10];
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 6e12a3b..066d2ac 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -64,12 +64,15 @@ protected:
     virtual void closeEvent( QCloseEvent * );
 
     void handleCommand( Command command, bool buttonDown );
 
     bool isOverButton( const QPoint &position, int buttonId ) const;
 
+    void paintButton( int buttonId );
+    virtual void paintButton( QPainter &p, int i ) = 0;
+
     MediaPlayerState &mediaPlayerState;
     PlayListWidget &playList;
 
     ButtonVector buttons;
 
     QImage buttonMask;
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 6451ac4..3e677c6 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -263,21 +263,21 @@ void VideoWidget::setToggleButton( int i, bool down ) {
     }
 }
 
 void VideoWidget::toggleButton( int i ) {
     buttons[i].isDown = !buttons[i].isDown;
     QPainter p(this);
-    paintButton ( &p, i );
+    paintButton ( p, i );
 }
 
-void VideoWidget::paintButton( QPainter *p, int i ) {
+void VideoWidget::paintButton( QPainter &p, int i ) {
 
     if ( buttons[i].isDown ) {
-        p->drawPixmap( upperLeftOfButtonMask, *buttonPixDown[i] );
+        p.drawPixmap( upperLeftOfButtonMask, *buttonPixDown[i] );
     } else {
-        p->drawPixmap( upperLeftOfButtonMask, *buttonPixUp[i] );
+        p.drawPixmap( upperLeftOfButtonMask, *buttonPixUp[i] );
     }
 }
 
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( unsigned int i = 0; i < buttons.size(); i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
@@ -419,20 +419,20 @@ void VideoWidget::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() );
             for ( unsigned int i = 0; i < buttons.size(); i++ ) {
-                paintButton( &p, i );
+                paintButton( p, i );
             }
             QPainter p2( this );
             p2.drawPixmap( pe->rect().topLeft(), pix );
         } else {
             QPainter p( this );
             for ( unsigned int i = 0; i < buttons.size(); i++ )
-                paintButton( &p, i );
+                paintButton( p, i );
         }
         //slider->repaint( TRUE );
         }
 }
 
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 2a9f1e0..28f720b 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -104,13 +104,13 @@ private:
     QPixmap *buttonPixUp[7];
     QPixmap *buttonPixDown[7];
     QString skin;
 //    QPixmap *pixmaps[4];
 
 
-    void paintButton( QPainter *p, int i );
+    virtual void paintButton( QPainter &p, int i );
     void toggleButton( int );
     void setToggleButton( int, bool );
 
     QString backgroundPix;
     QSlider *slider;
     QPixmap *pixmaps[3];