author | simon <simon> | 2002-12-09 16:33:52 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 16:33:52 (UTC) |
commit | 1ae041fba55e218a2523de441bec6ec3a1eecf02 (patch) (side-by-side diff) | |
tree | e12caa0db284f3237f52c91bbcd9578c5dcce8a7 /noncore | |
parent | 8eb71085cec5e24e20b441ceae9e5e66448405b3 (diff) | |
download | opie-1ae041fba55e218a2523de441bec6ec3a1eecf02.zip opie-1ae041fba55e218a2523de441bec6ec3a1eecf02.tar.gz opie-1ae041fba55e218a2523de441bec6ec3a1eecf02.tar.bz2 |
- more cleanups in the mouse event handler
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 3838e2c..37c565b 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -332,15 +332,14 @@ void AudioWidget::timerEvent( QTimerEvent * ) { mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); } } void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { - for ( unsigned int i = 0; i < buttons.size(); i++ ) { - - Button &button = buttons[ i ]; + for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) { + Button &button = *it; Command command = button.command; 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, command ); @@ -369,13 +368,12 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { } else { if ( button.isHeld ) { button.isHeld = FALSE; if ( button.type != ToggleButton ) { setToggleButton( button, FALSE ); } - qDebug("mouseEvent %d", i); handleCommand( command, button.isDown ); } } } } diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 06f6cd2..12316f8 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp @@ -241,15 +241,14 @@ void VideoWidget::updateSlider( long i, long max ) { slider->setMaxValue( width ); } } } void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { - for ( unsigned int i = 0; i < buttons.size(); i++ ) { - - Button &button = buttons[ i ]; + for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) { + Button &button = *it; Command command = button.command; 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, command ); |