- merged the two button setup loops

1 files changed, 8 insertions, 10 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 87e06ee..c148820 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -88,8 +88,2 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
 {
-    for ( uint i = 0; i < buttonCount; ++i ) {
-        Button button;
-        button.type = skinInfo[ i ].type;
-        buttons.push_back( button );
-    }
-
     setCaption( tr("OpiePlayer") );
@@ -110,8 +104,11 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
 
-    for ( uint i = 0; i < buttons.size(); i++ ) {
+    for ( uint i = 0; i < buttonCount; i++ ) {
+        Button button;
+        button.type = skinInfo[ i ].type;
+
         QString filename = QString( QPEApplication::qpeDir()  + "/pics/" + skinPath + "/skin_mask_" + skinInfo[i].fileName + ".png" );
-        buttons[ i ].mask =QBitmap( filename );
+        button.mask =QBitmap( filename );
 
-        if ( !buttons[i].mask.isNull() ) {
-            QImage imgMask = buttons[i].mask.convertToImage();
+        if ( !button.mask.isNull() ) {
+            QImage imgMask = button.mask.convertToImage();
             uchar **dest = buttonMask.jumpTable();
@@ -125,2 +122,3 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
 
+        buttons.push_back( button );
     }