4 files changed, 11 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index da0706e..6b304ec 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -46,5 +46,5 @@ MediaWidget::~MediaWidget()
 void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
-                                const Skin &skin, const QSize &buttonAreaSize )
+                                const Skin &skin )
 {
-    buttonMask = skin.buttonMask( skinInfo, buttonCount, buttonAreaSize );
+    buttonMask = skin.buttonMask( skinInfo, buttonCount );
 
@@ -87,3 +87,3 @@ void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, co
 
-    setupButtons( skinInfo, buttonCount, skin, buttonUpImage.size() );
+    setupButtons( skinInfo, buttonCount, skin );
 }
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 4bd8760..0fe4772 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -104,3 +104,3 @@ protected:
     void setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
-                       const Skin &skin, const QSize &buttonAreaSize );
+                       const Skin &skin );
     Button setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin );
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index ef70957..d3918d1 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -11,3 +11,3 @@ Skin::Skin( const QString &name, const QString &fileNameInfix )
 
-void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize )
+void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount )
 {
@@ -16,3 +16,3 @@ void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint butt
     buttonDownImage();
-    ( void )buttonMask( skinButtonInfo, buttonCount, buttonAreaSize );
+    ( void )buttonMask( skinButtonInfo, buttonCount );
 }
@@ -40,7 +40,4 @@ QImage Skin::buttonDownImage() const
 
-QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize ) const
+QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const
 {
-    if ( buttonAreaSize != m_buttonMask.size() )
-        m_buttonMask = QImage();
-
     if ( !m_buttonMask.isNull() )
@@ -48,2 +45,4 @@ QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint
 
+    QSize buttonAreaSize = buttonUpImage().size();
+
     m_buttonMask = QImage( buttonAreaSize, 8, 255 );
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index 14873e7..ee19f4b 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -14,3 +14,3 @@ public:
 
-    void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize );
+    void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount );
 
@@ -20,3 +20,3 @@ public:
 
-    QImage buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize ) const;
+    QImage buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount ) const;