summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 16:01:03 (UTC)
committer simon <simon>2002-12-09 16:01:03 (UTC)
commitd8aead05894e6a28b5aab45807ff2e6f27620f97 (patch) (side-by-side diff)
tree25b03bab434e42d3f8a134441b468ae5108e712a
parentf676d71c1fe40539ceb0c0708fdaefcc9b5e1800 (diff)
downloadopie-d8aead05894e6a28b5aab45807ff2e6f27620f97.zip
opie-d8aead05894e6a28b5aab45807ff2e6f27620f97.tar.gz
opie-d8aead05894e6a28b5aab45807ff2e6f27620f97.tar.bz2
- less hardcoding of numbers
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index f59772e..8409e5c 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -98,10 +98,11 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
buttonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 );
buttonMask.fill( 0 );
- for ( int i = 0; i < 7; i++ ) {
- Button &button = buttons[ i ];
+ uint i = 0;
+ for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it, ++i ) {
+ Button &button = *it;
QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
button.mask = QBitmap( filename );
@@ -174,10 +175,10 @@ void VideoWidget::resizeEvent( QResizeEvent * ) {
QPixmap *pixUp = combineVImageWithBackground( imgUp, backgroundPixmap, p );
QPixmap *pixDn = combineVImageWithBackground( imgDn, backgroundPixmap, p );
- for ( int i = 0; i < 7; i++ ) {
- Button &button = buttons[ i ];
+ for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) {
+ Button &button = *it;
if ( !button.mask.isNull() ) {
button.pixUp = maskVPixToMask( *pixUp, button.mask );
button.pixDown = maskVPixToMask( *pixDn, button.mask );