2 files changed, 8 insertions, 5 deletions

diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 3a44185..b73a5c0 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -87,34 +87,37 @@ void MediaWidget::handleCommand( Command command, bool buttonDown )
         case Back:       emit backReleased(); return;
     }
 }
 
 bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const
 {
     return ( position.x() > 0 && position.y() > 0 && 
              position.x() < buttonMask.width() && 
              position.y() < buttonMask.height() && 
              buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 );
 }
 
-void MediaWidget::paintButton( int buttonId )
+void MediaWidget::paintButton( const Button &button )
 {
     QPainter p( this );
-    paintButton( p, buttons[ buttonId ] );
+    paintButton( p, button );
 }
 
 void MediaWidget::paintButton( QPainter &p, const Button &button )
 {
     if ( button.isDown )
         p.drawPixmap( upperLeftOfButtonMask, button.pixDown );
     else
         p.drawPixmap( upperLeftOfButtonMask, button.pixUp );
 }
 
 void MediaWidget::toggleButton( int buttonId )
 {
-    buttons[ buttonId ].isDown = !buttons[ buttonId ].isDown;
-    paintButton( buttonId );
+    Button &button = buttons[ buttonId ];
+
+    button.isDown = !button.isDown;
+
+    paintButton( button );
 }
 
 /* vim: et sw=4 ts=4
  */
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 8cdaad1..dcf7fb8 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -78,25 +78,25 @@ signals:
     void forwardReleased();
     void backReleased();
 
 protected:
     virtual void closeEvent( QCloseEvent * );
 
     virtual void paintEvent( QPaintEvent *pe );
 
     void handleCommand( Command command, bool buttonDown );
 
     bool isOverButton( const QPoint &position, int buttonId ) const;
 
-    void paintButton( int buttonId );
+    void paintButton( const Button &button );
     void paintButton( QPainter &p, const Button &button );
 
     void toggleButton( int buttonId );
 
     MediaPlayerState &mediaPlayerState;
     PlayListWidget &playList;
 
     ButtonMap buttons;
 
     QImage buttonMask;
 
     QPoint upperLeftOfButtonMask;