- oops, buttonType is a bad name for a variable, given its redundancy

1 files changed, 2 insertions, 2 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
@@ -67,49 +67,49 @@ const MediaWidget::SkinButtonInfo skinInfo[] =
     { MediaWidget::Loop, "loop", MediaWidget::ToggleButton },
     { MediaWidget::PlayList, "playlist", MediaWidget::NormalButton },
     { MediaWidget::Forward, "forward", MediaWidget::NormalButton },
     { MediaWidget::Back, "back", MediaWidget::NormalButton }
 };
 
 const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] );
 
 void changeTextColor( QWidget * w) {
    QPalette p = w->palette();
    p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) );
    p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) );
    w->setPalette( p );
 }
 
 }
 
 AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
 
     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");
     cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
     //skin = "scaleTest";
     // color of background, frame, degree of transparency
 
     QString skinPath = "opieplayer2/skins/" + skin;
     pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
     imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
     imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
 
     buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 );
     buttonMask.fill( 0 );
 
     masks.reserve( buttonCount );
 
     for ( uint i = 0; i < masks.capacity(); i++ ) {
         QString filename = QString( QPEApplication::qpeDir()  + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" );
         masks.push_back( QBitmap( filename ) );
@@ -366,49 +366,49 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
             if ( isOnButton && !buttons[i].isHeld ) {
                 buttons[i].isHeld = TRUE;
                 toggleButton(i);
                 switch (i) {
                 case VolumeUp:
                     emit moreClicked();
                     return;
                 case VolumeDown:
                     emit lessClicked();
                     return;
                 case Forward:
                     emit forwardClicked();
                     return;
                 case Back:
                     emit backClicked();
                     return;
                 }
             } else if ( !isOnButton && buttons[i].isHeld ) {
                 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 );
             }
         }
     }
 }
 
 
 void AudioWidget::mousePressEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 
 void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 
 void AudioWidget::showEvent( QShowEvent* ) {
     QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
     mouseMoveEvent( &event );
 }