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
@@ -89,5 +89,5 @@ 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 );
     }
@@ -388,5 +388,5 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
             if ( buttons[i].isHeld ) {
                 buttons[i].isHeld = FALSE;
-                if ( buttons[i].buttonType != ToggleButton ) {
+                if ( buttons[i].type != ToggleButton ) {
                     setToggleButton( i, FALSE );
                 }
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
@@ -40,7 +40,7 @@ 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;
@@ -52,5 +52,5 @@ public:
         Command command;
         const char *fileName;
-        ButtonType buttonType;
+        ButtonType type;
     };
 
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
@@ -73,5 +73,5 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
     Button defaultButton; 
     Button toggleButton = defaultButton;
-    toggleButton.buttonType = ToggleButton;
+    toggleButton.type = ToggleButton;
 
     buttons.reserve( 7 );
@@ -297,5 +297,5 @@ 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 );
                 }