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
@@ -85,13 +85,13 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
 
     MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this ),
     audioSliderBeingMoved( false )
 {
     for ( uint i = 0; i < buttonCount; ++i ) {
         Button button;
-        button.buttonType = skinInfo[ i ].buttonType;
+        button.type = skinInfo[ i ].type;
         buttons.push_back( button );
     }
 
     setCaption( tr("OpiePlayer") );
 
     Config cfg("OpiePlayer");
@@ -384,13 +384,13 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                 buttons[i].isHeld = FALSE;
                 toggleButton(i);
             }
         } 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);
                 handleCommand( static_cast<Command>( i ), buttons[ i ].isDown );
             }
         }
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
@@ -36,25 +36,25 @@ class MediaWidget : public QWidget
 public:
     enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back };
     enum ButtonType { NormalButton, ToggleButton };
 
     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;
     };
     typedef std::vector<Button> ButtonVector;
 
     struct SkinButtonInfo
     {
         Command command;
         const char *fileName;
-        ButtonType buttonType;
+        ButtonType type;
     };
 
     MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
     virtual ~MediaWidget();
 
 public slots:
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
@@ -69,13 +69,13 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
     : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) 
 {
     setCaption( tr("OpiePlayer - Video") );
 
     Button defaultButton; 
     Button toggleButton = defaultButton;
-    toggleButton.buttonType = ToggleButton;
+    toggleButton.type = ToggleButton;
 
     buttons.reserve( 7 );
     buttons.push_back( toggleButton ); // play
     buttons.push_back( defaultButton ); // stop
     buttons.push_back( defaultButton ); // next
     buttons.push_back( defaultButton ); // previous
@@ -293,13 +293,13 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                         toggleButton(i);
             }
         } else {
 
             if ( buttons[i].isHeld ) {
                 buttons[i].isHeld = FALSE;
-                if ( buttons[i].buttonType != ToggleButton ) {
+                if ( buttons[i].type != ToggleButton ) {
                     setToggleButton( i, FALSE );
                 }
 
                 switch(i) {
 
                 case VideoPlay: {