From 80902b6ade54252e05cf948040a11b2e975f6759 Mon Sep 17 00:00:00 2001
From: simon <simon>
Date: Mon, 09 Dec 2002 15:10:48 +0000
Subject: - paintButton is no more a duplicated method but centralized in the

  base class now :)
---
(limited to 'noncore/multimedia')

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 12f91a9..5cc2814 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -313,15 +313,6 @@ void AudioWidget::setToggleButton( int i, bool down ) {
     }
 }
 
-void AudioWidget::paintButton( QPainter &p, int i ) {
-    if ( buttons[i].isDown ) {
-        p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixDown );
-    } else {
-        p.drawPixmap( upperLeftOfButtonMask, buttons[i].pixUp );
-    }
-}
-
-
 void AudioWidget::skipFor() {
     skipDirection = +1;
     startTimer( 50 );
@@ -415,13 +406,13 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) {
         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.count(); i++ )
-            paintButton( p, i );
+            paintButton( p, buttons[ i ] );
         QPainter p2( this );
         p2.drawPixmap( pe->rect().topLeft(), pix );
     } else {
         QPainter p( this );
         for ( unsigned int i = 0; i < buttons.count(); i++ )
-            paintButton( p, i );
+            paintButton( p, buttons[ i ] );
     }
 }
 
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 332fb4b..7a775cd 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -92,7 +92,6 @@ private slots:
     void stopSkip();
 private:
     void setToggleButton( int, bool );
-    virtual void paintButton( QPainter &p, int i );
     int skipDirection;
     QString skin;
     QPixmap pixBg;
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 62266ad..f977b61 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -71,7 +71,15 @@ bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const
 void MediaWidget::paintButton( int buttonId )
 {
     QPainter p( this );
-    paintButton( p, buttonId );
+    paintButton( p, buttons[ buttonId ] );
+}
+
+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 )
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 49bf024..163f449 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -86,7 +86,7 @@ protected:
     bool isOverButton( const QPoint &position, int buttonId ) const;
 
     void paintButton( int buttonId );
-    virtual void paintButton( QPainter &p, int i ) = 0;
+    void paintButton( QPainter &p, const Button &button );
 
     void toggleButton( int buttonId );
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 3baa087..a483434 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -248,17 +248,6 @@ void VideoWidget::setToggleButton( int i, bool down ) {
     }
 }
 
-void VideoWidget::paintButton( QPainter &p, int i ) {
-
-    Button &button = buttons[ i ];
-
-    if ( button.isDown ) {
-        p.drawPixmap( upperLeftOfButtonMask, button.pixDown );
-    } else {
-        p.drawPixmap( upperLeftOfButtonMask, button.pixUp );
-    }
-}
-
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( unsigned int i = 0; i < buttons.count(); i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
@@ -403,14 +392,14 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
             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.count(); i++ ) {
-                paintButton( p, i );
+                paintButton( p, buttons[ i ] );
             }
             QPainter p2( this );
             p2.drawPixmap( pe->rect().topLeft(), pix );
         } else {
             QPainter p( this );
             for ( unsigned int i = 0; i < buttons.count(); i++ )
-                paintButton( p, i );
+                paintButton( p, buttons[ i ] );
         }
         //slider->repaint( TRUE );
         }
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 937feac..a271120 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -103,7 +103,6 @@ private:
     QString skin;
 
 
-    virtual void paintButton( QPainter &p, int i );
     void setToggleButton( int, bool );
 
     QString backgroundPix;
--
cgit v0.9.0.2