- merged duplicated setToggleButton method

- minor fixlet for paintAllButtons

6 files changed, 12 insertions, 17 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 277d162..8c7e614 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -305,14 +305,6 @@ void AudioWidget::updateSlider( long i, long max ) {
     }
 }
 
-
-void AudioWidget::setToggleButton( int i, bool down ) {
-    qDebug("setToggleButton %d", i);
-    if ( down != buttons[i].isDown ) {
-        toggleButton( i );
-    }
-}
-
 void AudioWidget::skipFor() {
     skipDirection = +1;
     startTimer( 50 );
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 8c433ac..9b276b5 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -90,7 +90,6 @@ private slots:
     void skipBack();
     void stopSkip();
 private:
-    void setToggleButton( int, bool );
     int skipDirection;
     QString skin;
     QImage  imgUp;
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 271f788..9c5291b 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -97,7 +97,7 @@ void MediaWidget::paintAllButtons( QPainter &p )
 {
     for ( ButtonMap::ConstIterator it = buttons.begin();
           it != buttons.end(); ++it )
-        paintButton( *it );
+        paintButton( p, *it );
 }
 
 void MediaWidget::paintButton( const Button &button )
@@ -114,6 +114,16 @@ void MediaWidget::paintButton( QPainter &p, const Button &button )
         p.drawPixmap( upperLeftOfButtonMask, button.pixUp );
 }
 
+void MediaWidget::setToggleButton( int buttonId, bool down )
+{
+    qDebug("setToggleButton %d", buttonId );
+
+    Button &button = buttons[ buttonId ];
+
+    if ( down != button.isDown )
+        toggleButton( buttonId );
+}
+
 void MediaWidget::toggleButton( int buttonId )
 {
     Button &button = buttons[ buttonId ];
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 34910fb..b7860dc 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -91,6 +91,7 @@ protected:
     void paintButton( const Button &button );
     void paintButton( QPainter &p, const Button &button );
 
+    void setToggleButton( int buttonId, bool down );
     void toggleButton( int buttonId );
 
     MediaPlayerState &mediaPlayerState;
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 8f6a8a9..db4a396 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -242,12 +242,6 @@ void VideoWidget::updateSlider( long i, long max ) {
     }
 }
 
-void VideoWidget::setToggleButton( int i, bool down ) {
-    if ( down != buttons[i].isDown ) {
-        toggleButton( i );
-    }
-}
-
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( unsigned int i = 0; i < buttons.count(); i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 45279d7..915e9cc 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -101,7 +101,6 @@ private:
     QString skin;
 
 
-    void setToggleButton( int, bool );
 
     QString backgroundPix;
     QSlider *slider;