- toggleButton and setToggleButton now operate on a Button object instead

  of an index

5 files changed, 17 insertions, 23 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 8c7e614..ef606ab 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -340,9 +340,9 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
             bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
 
             if ( isOnButton && !buttons[i].isHeld ) {
                 buttons[i].isHeld = TRUE;
-                toggleButton(i);
+                toggleButton( buttons[ i ] );
                 switch (i) {
                 case VolumeUp:
                     emit moreClicked();
                     return;
@@ -357,15 +357,15 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                     return;
                 }
             } else if ( !isOnButton && buttons[i].isHeld ) {
                 buttons[i].isHeld = FALSE;
-                toggleButton(i);
+                toggleButton( buttons[ i ] );
             }
         } else {
             if ( buttons[i].isHeld ) {
                 buttons[i].isHeld = FALSE;
                 if ( buttons[i].type != ToggleButton ) {
-                    setToggleButton( i, FALSE );
+                    setToggleButton( buttons[ i ], FALSE );
                 }
                 qDebug("mouseEvent %d", i);
                 handleCommand( static_cast<Command>( i ), buttons[ i ].isDown );
             }
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 9b276b5..092e5ce 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -58,15 +58,15 @@ public:
 public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );
-    void setLooping( bool b) { setToggleButton( Loop, b ); }
+    void setLooping( bool b) { setToggleButton( buttons[ Loop ], b ); }
     void setPosition( long );
     void setSeekable( bool );
 
 public:
     virtual void setLength( long );
-    virtual void setPlaying( bool b) { setToggleButton( Play, b ); }
+    virtual void setPlaying( bool b) { setToggleButton( buttons[ Play ], b ); }
     virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
 
 signals:
     void moreClicked();
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 9c5291b..66129c9 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -113,22 +113,16 @@ void MediaWidget::paintButton( QPainter &p, const Button &button )
     else
         p.drawPixmap( upperLeftOfButtonMask, button.pixUp );
 }
 
-void MediaWidget::setToggleButton( int buttonId, bool down )
+void MediaWidget::setToggleButton( Button &button, bool down )
 {
-    qDebug("setToggleButton %d", buttonId );
-
-    Button &button = buttons[ buttonId ];
-
     if ( down != button.isDown )
-        toggleButton( buttonId );
+        toggleButton( button );
 }
 
-void MediaWidget::toggleButton( int buttonId )
+void MediaWidget::toggleButton( Button &button )
 {
-    Button &button = buttons[ buttonId ];
-
     button.isDown = !button.isDown;
 
     paintButton( button );
 }
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index b7860dc..05b7b71 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -90,10 +90,10 @@ protected:
     void paintAllButtons( QPainter &p );
     void paintButton( const Button &button );
     void paintButton( QPainter &p, const Button &button );
 
-    void setToggleButton( int buttonId, bool down );
-    void toggleButton( int buttonId );
+    void setToggleButton( Button &button, bool down );
+    void toggleButton( Button &button );
 
     MediaPlayerState &mediaPlayerState;
     PlayListWidget &playList;
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index db4a396..673c9e8 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -249,9 +249,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
             bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
 
             if ( isOnButton && !buttons[i].isHeld ) {
                 buttons[i].isHeld = TRUE;
-                toggleButton(i);
+                toggleButton( buttons[ i ] );
 
                 switch (i) {
                 case VideoVolUp:
                     emit moreClicked();
@@ -261,27 +261,27 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                     return;
                 }
             } else if ( !isOnButton && buttons[i].isHeld ) {
                         buttons[i].isHeld = FALSE;
-                        toggleButton(i);
+                        toggleButton( buttons[ i ] );
             }
         } else {
 
             if ( buttons[i].isHeld ) {
                 buttons[i].isHeld = FALSE;
                 if ( buttons[i].type != ToggleButton ) {
-                    setToggleButton( i, FALSE );
+                    setToggleButton( buttons[ i ], FALSE );
                 }
 
                 switch(i) {
 
                 case VideoPlay: {
                     if( mediaPlayerState.isPaused() ) {
-                        setToggleButton( i, FALSE );
+                        setToggleButton( buttons[ i ], FALSE );
                         mediaPlayerState.setPaused( FALSE );
                         return;
                     } else if( !mediaPlayerState.isPaused() ) {
-                        setToggleButton( i, TRUE );
+                        setToggleButton( buttons[ i ], TRUE );
                         mediaPlayerState.setPaused( TRUE );
                         return;
                     } else {
                         return;
@@ -422,12 +422,12 @@ XineVideoWidget* VideoWidget::vidWidget() {
 }
 
 
 void VideoWidget::setFullscreen ( bool b ) {
-    setToggleButton( VideoFullscreen, b );
+    setToggleButton( buttons[ VideoFullscreen ], b );
 }
 
 
 void VideoWidget::setPlaying( bool b) {
-    setToggleButton( VideoPlay, b );
+    setToggleButton( buttons[ VideoPlay ], b );
 }