Diffstat (limited to 'noncore/multimedia/opieplayer2/mediawidget.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 563ccf5..880b295 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp @@ -50,3 +50,2 @@ void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount buttons.clear(); - buttons.reserve( buttonCount ); @@ -54,3 +53,3 @@ void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount Button button = setupButton( skinInfo[ i ], skin ); - buttons.push_back( button ); + buttons.append( button ); } @@ -89,3 +88,3 @@ void MediaWidget::closeEvent( QCloseEvent * ) -void MediaWidget::paintEvent( QPaintEvent *pe ) +void MediaWidget::paintEvent( QPaintEvent * ) { @@ -93,8 +92,2 @@ void MediaWidget::paintEvent( QPaintEvent *pe ) - if ( mediaPlayerState.isFullscreen() ) { - // Clear the background - p.setBrush( QBrush( Qt::black ) ); - return; - } - QPixmap buffer( size() ); @@ -111,3 +104,3 @@ void MediaWidget::resizeEvent( QResizeEvent *e ) - for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) { + for ( ButtonVector::Iterator it = buttons.begin(); it != buttons.end(); ++it ) { Button &button = *it; @@ -131,4 +124,4 @@ MediaWidget::Button *MediaWidget::buttonAt( const QPoint &position ) int pixelIdx = buttonMask.pixelIndex( position.x(), position.y() ); - for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) - if ( it->command + 1 == pixelIdx ) + for ( ButtonVector::Iterator it = buttons.begin(); it != buttons.end(); ++it ) + if ( (*it).command + 1 == pixelIdx ) return &( *it ); @@ -195,5 +188,5 @@ bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const { - return ( position.x() > 0 && position.y() > 0 && - position.x() < buttonMask.width() && - position.y() < buttonMask.height() && + return ( position.x() > 0 && position.y() > 0 && + position.x() < buttonMask.width() && + position.y() < buttonMask.height() && buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 ); @@ -203,3 +196,3 @@ void MediaWidget::paintAllButtons( QPainter &p ) { - for ( ButtonVector::const_iterator it = buttons.begin(); + for ( ButtonVector::ConstIterator it = buttons.begin(); it != buttons.end(); ++it ) @@ -224,4 +217,4 @@ void MediaWidget::setToggleButton( Command command, bool down ) { - for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) - if ( it->command == command ) { + for ( ButtonVector::Iterator it = buttons.begin(); it != buttons.end(); ++it ) + if ( (*it).command == command ) { setToggleButton( *it, down ); |