summaryrefslogtreecommitdiff
path: root/noncore
authorsimon <simon>2002-12-09 14:10:58 (UTC)
committer simon <simon>2002-12-09 14:10:58 (UTC)
commitfffd954b4ea3c124a37cab9af99b248986029436 (patch) (unidiff)
treef5ae7f123b7e50957c7682cbb8b3c7144aadf71b /noncore
parent17f319bb44feb947a26be333a4c7e6fef7020c87 (diff)
downloadopie-fffd954b4ea3c124a37cab9af99b248986029436.zip
opie-fffd954b4ea3c124a37cab9af99b248986029436.tar.gz
opie-fffd954b4ea3c124a37cab9af99b248986029436.tar.bz2
- oops, buttonType is a bad name for a variable, given its redundancy
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h6
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 3b33209..6e9c14a 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -88,7 +88,7 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
88{ 88{
89 for ( uint i = 0; i < buttonCount; ++i ) { 89 for ( uint i = 0; i < buttonCount; ++i ) {
90 Button button; 90 Button button;
91 button.buttonType = skinInfo[ i ].buttonType; 91 button.type = skinInfo[ i ].type;
92 buttons.push_back( button ); 92 buttons.push_back( button );
93 } 93 }
94 94
@@ -387,7 +387,7 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
387 } else { 387 } else {
388 if ( buttons[i].isHeld ) { 388 if ( buttons[i].isHeld ) {
389 buttons[i].isHeld = FALSE; 389 buttons[i].isHeld = FALSE;
390 if ( buttons[i].buttonType != ToggleButton ) { 390 if ( buttons[i].type != ToggleButton ) {
391 setToggleButton( i, FALSE ); 391 setToggleButton( i, FALSE );
392 } 392 }
393 qDebug("mouseEvent %d", i); 393 qDebug("mouseEvent %d", i);
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index e0f2cf1..9fb3499 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -39,9 +39,9 @@ public:
39 39
40 struct Button 40 struct Button
41 { 41 {
42 Button() : buttonType( NormalButton ), isHeld( false ), isDown( false ) {} 42 Button() : type( NormalButton ), isHeld( false ), isDown( false ) {}
43 43
44 ButtonType buttonType : 1; 44 ButtonType type : 1;
45 bool isHeld : 1; 45 bool isHeld : 1;
46 bool isDown : 1; 46 bool isDown : 1;
47 }; 47 };
@@ -51,7 +51,7 @@ public:
51 { 51 {
52 Command command; 52 Command command;
53 const char *fileName; 53 const char *fileName;
54 ButtonType buttonType; 54 ButtonType type;
55 }; 55 };
56 56
57 MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); 57 MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 23acfa3..380c703 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -72,7 +72,7 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
72 72
73 Button defaultButton; 73 Button defaultButton;
74 Button toggleButton = defaultButton; 74 Button toggleButton = defaultButton;
75 toggleButton.buttonType = ToggleButton; 75 toggleButton.type = ToggleButton;
76 76
77 buttons.reserve( 7 ); 77 buttons.reserve( 7 );
78 buttons.push_back( toggleButton ); // play 78 buttons.push_back( toggleButton ); // play
@@ -296,7 +296,7 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
296 296
297 if ( buttons[i].isHeld ) { 297 if ( buttons[i].isHeld ) {
298 buttons[i].isHeld = FALSE; 298 buttons[i].isHeld = FALSE;
299 if ( buttons[i].buttonType != ToggleButton ) { 299 if ( buttons[i].type != ToggleButton ) {
300 setToggleButton( i, FALSE ); 300 setToggleButton( i, FALSE );
301 } 301 }
302 302