- migrating from a button vector to a button map

3 files changed, 18 insertions, 17 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index c148820..12f91a9 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -119,9 +119,9 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
                         line[x] = i + 1;
             }
         }
 
-        buttons.push_back( button );
+        buttons.insert( i, button );
     }
 
     setBackgroundPixmap( pixBg );
 
@@ -207,9 +207,9 @@ void AudioWidget::resizeEvent( QResizeEvent * ) {
 
     QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p );
     QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p );
 
-    for ( uint i = 0; i < buttons.size(); i++ ) {
+    for ( uint i = 0; i < buttons.count(); i++ ) {
         if ( !buttons[i].mask.isNull() ) {
             buttons[i].pixUp = maskPixToMask( pixUp, buttons[i].mask );
             buttons[i].pixDown = maskPixToMask( pixDn, buttons[i].mask );
         }
@@ -350,9 +350,9 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
 }
 
 
 void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
-    for ( unsigned int i = 0; i < buttons.size(); i++ ) {
+    for ( unsigned int i = 0; i < buttons.count(); i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
             // The test to see if the mouse click is inside the button or not
             bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
 
@@ -413,15 +413,15 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) {
         QPixmap pix( pe->rect().size() );
         QPainter p( &pix );
         p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
         p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
-        for ( unsigned int i = 0; i < buttons.size(); i++ )
+        for ( unsigned int i = 0; i < buttons.count(); i++ )
             paintButton( p, i );
         QPainter p2( this );
         p2.drawPixmap( pe->rect().topLeft(), pix );
     } else {
         QPainter p( this );
-        for ( unsigned int i = 0; i < buttons.size(); i++ )
+        for ( unsigned int i = 0; i < buttons.count(); i++ )
             paintButton( p, i );
     }
 }
 
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 504b705..49bf024 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -50,8 +50,10 @@ public:
         QPixmap pixUp;
         QPixmap pixDown;
     };
     typedef std::vector<Button> ButtonVector;
+    // when the transition is done this should be Command -> Button
+    typedef QMap<int, Button> ButtonMap;
 
     struct SkinButtonInfo
     {
         Command command;
@@ -90,9 +92,9 @@ protected:
 
     MediaPlayerState &mediaPlayerState;
     PlayListWidget &playList;
 
-    ButtonVector buttons;
+    ButtonMap buttons;
 
     QImage buttonMask;
 
     QPoint upperLeftOfButtonMask;
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 380c703..7d85d63 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -73,16 +73,15 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
     Button defaultButton; 
     Button toggleButton = defaultButton;
     toggleButton.type = ToggleButton;
 
-    buttons.reserve( 7 );
-    buttons.push_back( toggleButton ); // play
-    buttons.push_back( defaultButton ); // stop
-    buttons.push_back( defaultButton ); // next
-    buttons.push_back( defaultButton ); // previous
-    buttons.push_back( defaultButton ); // volUp
-    buttons.push_back( defaultButton ); // volDown
-    buttons.push_back( toggleButton ); //fullscreen
+    buttons.insert( 0, toggleButton ); // play
+    buttons.insert( 1, toggleButton ); // stop
+    buttons.insert( 2, toggleButton ); // next
+    buttons.insert( 3, toggleButton ); // previous
+    buttons.insert( 4, toggleButton ); // volUp
+    buttons.insert( 5, toggleButton ); // volDown
+    buttons.insert( 6, toggleButton ); // fullscreen
 
     videoFrame = new XineVideoWidget ( this, "Video frame" );
 
     connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
@@ -270,9 +269,9 @@ void VideoWidget::paintButton( QPainter &p, int i ) {
     }
 }
 
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
-    for ( unsigned int i = 0; i < buttons.size(); i++ ) {
+    for ( unsigned int i = 0; i < buttons.count(); i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
             // The test to see if the mouse click is inside the button or not
             bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
 
@@ -412,16 +411,16 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
             QPixmap pix( pe->rect().size() );
             QPainter p( &pix );
             p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
             p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
-            for ( unsigned int i = 0; i < buttons.size(); i++ ) {
+            for ( unsigned int i = 0; i < buttons.count(); i++ ) {
                 paintButton( p, i );
             }
             QPainter p2( this );
             p2.drawPixmap( pe->rect().topLeft(), pix );
         } else {
             QPainter p( this );
-            for ( unsigned int i = 0; i < buttons.size(); i++ )
+            for ( unsigned int i = 0; i < buttons.count(); i++ )
                 paintButton( p, i );
         }
         //slider->repaint( TRUE );
         }