summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-08 22:26:34 (UTC)
committer simon <simon>2002-12-08 22:26:34 (UTC)
commit3b5f97272ded8a40da3853476371b4edc41d1a34 (patch) (side-by-side diff)
treecc965571aa2f8ca62bf859e49acc91b440b96f1a
parent5d3f3d429bb6247741a30c00a344302a2c9a20c0 (diff)
downloadopie-3b5f97272ded8a40da3853476371b4edc41d1a34.zip
opie-3b5f97272ded8a40da3853476371b4edc41d1a34.tar.gz
opie-3b5f97272ded8a40da3853476371b4edc41d1a34.tar.bz2
- share the imgButtonMask member variable in the base class
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h1
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
5 files changed, 14 insertions, 14 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index a9d5a88..022aa82 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -107,4 +107,4 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
- imgButtonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 );
- imgButtonMask.fill( 0 );
+ buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 );
+ buttonMask.fill( 0 );
@@ -116,3 +116,3 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
QImage imgMask = masks[i]->convertToImage();
- uchar **dest = imgButtonMask.jumpTable();
+ uchar **dest = buttonMask.jumpTable();
for ( int y = 0; y < imgUp.height(); y++ ) {
@@ -386,5 +386,5 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
- bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask.width()
- && y < imgButtonMask.height()
- && imgButtonMask.pixelIndex( x, y ) == i + 1 );
+ bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width()
+ && y < buttonMask.height()
+ && buttonMask.pixelIndex( x, y ) == i + 1 );
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 52a358c..da22946 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -101,3 +101,2 @@ private:
QImage imgDn;
- QImage imgButtonMask;
QBitmap *masks[10];
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index b88d7e2..044ab6c 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -71,2 +71,4 @@ protected:
ButtonVector buttons;
+
+ QImage buttonMask;
};
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 7838229..459f592 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -101,4 +101,4 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
- imgButtonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 );
- imgButtonMask.fill( 0 );
+ buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 );
+ buttonMask.fill( 0 );
@@ -110,3 +110,3 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
QImage imgMask = masks[i]->convertToImage();
- uchar **dest = imgButtonMask.jumpTable();
+ uchar **dest = buttonMask.jumpTable();
for ( int y = 0; y < imgUp.height(); y++ ) {
@@ -287,5 +287,5 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
- bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask.width()
- && y < imgButtonMask.height()
- && imgButtonMask.pixelIndex( x, y ) == i + 1 );
+ bool isOnButton = ( x > 0 && y > 0 && x < buttonMask.width()
+ && y < buttonMask.height()
+ && buttonMask.pixelIndex( x, y ) == i + 1 );
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index f996803..a5500d7 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -102,3 +102,2 @@ private:
QImage imgDn;
- QImage imgButtonMask;
QBitmap *masks[7];