summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (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
{
for ( uint i = 0; i < buttonCount; ++i ) {
Button button;
- button.buttonType = skinInfo[ i ].buttonType;
+ button.type = skinInfo[ i ].type;
buttons.push_back( button );
}
@@ -387,7 +387,7 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
} else {
if ( buttons[i].isHeld ) {
buttons[i].isHeld = FALSE;
- if ( buttons[i].buttonType != ToggleButton ) {
+ if ( buttons[i].type != ToggleButton ) {
setToggleButton( i, FALSE );
}
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:
struct Button
{
- Button() : buttonType( NormalButton ), isHeld( false ), isDown( false ) {}
+ Button() : type( NormalButton ), isHeld( false ), isDown( false ) {}
- ButtonType buttonType : 1;
+ ButtonType type : 1;
bool isHeld : 1;
bool isDown : 1;
};
@@ -51,7 +51,7 @@ public:
{
Command command;
const char *fileName;
- ButtonType buttonType;
+ ButtonType type;
};
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
Button defaultButton;
Button toggleButton = defaultButton;
- toggleButton.buttonType = ToggleButton;
+ toggleButton.type = ToggleButton;
buttons.reserve( 7 );
buttons.push_back( toggleButton ); // play
@@ -296,7 +296,7 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
if ( buttons[i].isHeld ) {
buttons[i].isHeld = FALSE;
- if ( buttons[i].buttonType != ToggleButton ) {
+ if ( buttons[i].type != ToggleButton ) {
setToggleButton( i, FALSE );
}