- merged the duplicated (and identical) paintEvent methods into the

  base class

6 files changed, 30 insertions, 52 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 553c56b..277d162 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -388,43 +388,24 @@ void AudioWidget::mousePressEvent( QMouseEvent *event ) {
 
 
 void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 
 void AudioWidget::showEvent( QShowEvent* ) {
     QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
     mouseMoveEvent( &event );
 }
 
-
-void AudioWidget::paintEvent( QPaintEvent * pe ) {
-    if ( !pe->erased() ) {
-          // 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(), backgroundPixmap, pe->rect().topLeft() );
-        for ( unsigned int i = 0; i < buttons.count(); 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, buttons[ i ] );
-    }
-}
-
 void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
         ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
            hide();
            //           qDebug("Audio F9");
           break;
       case Key_F10: //contacts
           break;
       case Key_F11: //menu
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 69837cd..8c433ac 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -69,25 +69,24 @@ public:
     virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
 
 signals:
     void moreClicked();
     void lessClicked();
     void forwardClicked();
     void backClicked();
     void sliderMoved(long);
 
 protected:
     void doBlank();
     void doUnblank();
-    void paintEvent( QPaintEvent *pe );
     void showEvent( QShowEvent *se );
     void resizeEvent( QResizeEvent *re );
     void mouseMoveEvent( QMouseEvent *event );
     void mousePressEvent( QMouseEvent *event );
     void mouseReleaseEvent( QMouseEvent *event );
     void timerEvent( QTimerEvent *event );
     void keyReleaseEvent( QKeyEvent *e);
 private slots:
     void skipFor();
     void skipBack();
     void stopSkip();
 private:
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index f977b61..3a44185 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -35,24 +35,52 @@ MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPla
              this, SLOT( setPlaying( bool ) ) );
 }
 
 MediaWidget::~MediaWidget()
 {
 }
 
 void MediaWidget::closeEvent( QCloseEvent * )
 {
     mediaPlayerState.setList();
 }
 
+void MediaWidget::paintEvent( QPaintEvent *pe )
+{
+    QPainter p( this );
+
+    if ( mediaPlayerState.isFullscreen() ) {
+        // Clear the background
+        p.setBrush( QBrush( Qt::black ) );
+        return;
+    } 
+
+    if ( !pe->erased() ) {
+        // 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(), backgroundPixmap, pe->rect().topLeft() );
+        for ( unsigned int i = 0; i < buttons.count(); 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, buttons[ i ] );
+    }
+}
+
 void MediaWidget::handleCommand( Command command, bool buttonDown )
 {
     switch ( command ) {
         case Play:       mediaPlayerState.togglePaused();
         case Stop:       mediaPlayerState.setPlaying(FALSE); return;
         case Next:       if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return;
         case Previous:   if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return;
         case Loop:       mediaPlayerState.setLooping( buttonDown ); return;
         case VolumeUp:   emit moreReleased(); return;
         case VolumeDown: emit lessReleased(); return;
         case PlayList:   mediaPlayerState.setList();  return;
         case Forward:    emit forwardReleased(); return;
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 211e56c..8cdaad1 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -72,24 +72,26 @@ public slots:
     virtual void setLength( long length ) = 0;
     virtual void setPlaying( bool playing ) = 0;
 
 signals:
     void moreReleased();
     void lessReleased();
     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( QPainter &p, const Button &button );
 
     void toggleButton( int buttonId );
 
     MediaPlayerState &mediaPlayerState;
     PlayListWidget &playList;
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index a8bf252..8f6a8a9 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -366,55 +366,24 @@ void VideoWidget::makeVisible() {
             disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
             disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
         } else {
             slider->show();
             connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
             connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
             connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
             connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
         }
     }
 }
 
-
-
-
-void VideoWidget::paintEvent( QPaintEvent * pe) {
-    QPainter p( this );
-
-    if ( mediaPlayerState.isFullscreen() ) {
-        // Clear the background
-        p.setBrush( QBrush( Qt::black ) );
-    } else {
-        if ( !pe->erased() ) {
-            // 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(), backgroundPixmap, pe->rect().topLeft() );
-            for ( unsigned int i = 0; i < buttons.count(); 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, buttons[ i ] );
-        }
-        //slider->repaint( TRUE );
-        }
-}
-
-
 void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
           break;
       case Key_F10: //contacts
 //           hide();
           break;
       case Key_F11: //menu
           break;
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 9d5239b..45279d7 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -79,25 +79,24 @@ public:
 
 signals:
     void moreClicked();
     void lessClicked();
     void moreReleased();
     void lessReleased();
     void sliderMoved( long );
     void videoResized ( const QSize &s );
 
 protected:
 
     void resizeEvent( QResizeEvent * );
-    void paintEvent( QPaintEvent *pe );
     void showEvent( QShowEvent *se );
     void mouseMoveEvent( QMouseEvent *event );
     void mousePressEvent( QMouseEvent *event );
     void mouseReleaseEvent( QMouseEvent *event );
     void keyReleaseEvent( QKeyEvent *e);
 
 private:
 //    Ticker songInfo;
     QImage  imgUp;
     QImage  imgDn;
     QString skin;