1 files changed, 2 insertions, 22 deletions

diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 4de7ea9..da0706e 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -37,65 +37,45 @@ MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPla
              this, SLOT( setLength( long ) ) );
     connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
              this, SLOT( setPlaying( bool ) ) );
 }
 
 MediaWidget::~MediaWidget()
 {
 }
 
 void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
                                 const Skin &skin, const QSize &buttonAreaSize )
 {
-    buttonMask = QImage( buttonAreaSize, 8, 255 );
-    buttonMask.fill( 0 );
+    buttonMask = skin.buttonMask( skinInfo, buttonCount, buttonAreaSize );
 
     buttons.clear();
     buttons.reserve( buttonCount );
 
     for ( uint i = 0; i < buttonCount; ++i ) {
         Button button = setupButton( skinInfo[ i ], skin );
         buttons.push_back( button );
     }
 }
 
 MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin )
 {
     Button button;
     button.command = buttonInfo.command;
     button.type = buttonInfo.type;
-
-    button.mask = setupButtonMask( button.command, skin.buttonMaskImage( buttonInfo.fileName ) );
+    button.mask = skin.buttonMaskImage( buttonInfo.fileName );
 
     return button;
 }
 
-QBitmap MediaWidget::setupButtonMask( const Command &command, const QImage &maskImage )
-{
-    if ( maskImage.isNull() )
-        return QBitmap();
-
-    uchar **dest = buttonMask.jumpTable();
-    for ( int y = 0; y < buttonMask.height(); y++ ) {
-        uchar *line = dest[y];
-        for ( int x = 0; x < buttonMask.width(); x++ )
-            if ( !qRed( maskImage.pixel( x, y ) ) )
-                line[x] = command + 1;
-    }
-
-    // ### grmbl qt2. use constructor when switching to qt3.
-    QBitmap bm; bm = maskImage;
-    return bm;
-}
-
 void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix )
 {
     Config cfg( "OpiePlayer" );
     cfg.setGroup( "Options" );
     QString skin = cfg.readEntry( "Skin","default" );
 
     loadSkin( skinInfo, buttonCount, skin, fileNameInfix );
 }
 
 void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &name, const QString &fileNameInfix )
 {
     Skin skin( name, fileNameInfix );