- pixBg is now backgroundPixmap and shared in the base class

5 files changed, 15 insertions, 15 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 5cc2814..553c56b 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -97,3 +97,3 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
     QString skinPath = "opieplayer2/skins/" + skin;
-    pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
+    backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
     imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
@@ -125,3 +125,3 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
 
-    setBackgroundPixmap( pixBg );
+    setBackgroundPixmap( backgroundPixmap );
 
@@ -138,3 +138,3 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
     slider.setFocusPolicy( QWidget::NoFocus );
-    slider.setBackgroundPixmap( pixBg );
+    slider.setBackgroundPixmap( backgroundPixmap );
 
@@ -207,4 +207,4 @@ void AudioWidget::resizeEvent( QResizeEvent * ) {
 
-    QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p );
-    QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p );
+    QPixmap pixUp = combineImageWithBackground( imgUp, backgroundPixmap, p );
+    QPixmap pixDn = combineImageWithBackground( imgDn, backgroundPixmap, p );
 
@@ -406,3 +406,3 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) {
         p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
-        p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
+        p.drawTiledPixmap( pe->rect(), backgroundPixmap, pe->rect().topLeft() );
         for ( unsigned int i = 0; i < buttons.count(); i++ )
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 7a775cd..69837cd 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -96,3 +96,2 @@ private:
     QString skin;
-    QPixmap pixBg;
     QImage  imgUp;
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 163f449..211e56c 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -100,2 +100,4 @@ protected:
     QPoint upperLeftOfButtonMask;
+
+    QPixmap backgroundPixmap;
 };
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index a483434..a8bf252 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -94,3 +94,3 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
     QString skinPath = "opieplayer2/skins/" + skin;
-    pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
+    backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
     imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
@@ -120,3 +120,3 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
 
-    setBackgroundPixmap( pixBg );
+    setBackgroundPixmap( backgroundPixmap );
 
@@ -165,3 +165,3 @@ void VideoWidget::resizeEvent( QResizeEvent * ) {
     slider->setFocusPolicy( QWidget::NoFocus );
-    slider->setBackgroundPixmap( pixBg );
+    slider->setBackgroundPixmap( backgroundPixmap );
 
@@ -174,4 +174,4 @@ void VideoWidget::resizeEvent( QResizeEvent * ) {
 
-    QPixmap *pixUp = combineVImageWithBackground( imgUp, pixBg, p );
-    QPixmap *pixDn = combineVImageWithBackground( imgDn, pixBg, p );
+    QPixmap *pixUp = combineVImageWithBackground( imgUp, backgroundPixmap, p );
+    QPixmap *pixDn = combineVImageWithBackground( imgDn, backgroundPixmap, p );
 
@@ -347,3 +347,3 @@ void VideoWidget::makeVisible() {
         showMaximized();
-        setBackgroundPixmap( pixBg );
+        setBackgroundPixmap( backgroundPixmap );
         QWidget *d = QApplication::desktop();
@@ -392,3 +392,3 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
             p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
-            p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
+            p.drawTiledPixmap( pe->rect(), backgroundPixmap, pe->rect().topLeft() );
             for ( unsigned int i = 0; i < buttons.count(); i++ ) {
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index a271120..9d5239b 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -99,3 +99,2 @@ private:
 //    Ticker songInfo;
-    QPixmap pixBg;
     QImage  imgUp;