author | simon <simon> | 2002-12-09 18:33:53 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 18:33:53 (UTC) |
commit | 711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd (patch) (unidiff) | |
tree | 20ad8855c3e9fcb0e0ec5a79b3d9e934236e1344 /noncore/multimedia | |
parent | 29b5784bba7b19497b5984418bacee261075ccf7 (diff) | |
download | opie-711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd.zip opie-711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd.tar.gz opie-711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd.tar.bz2 |
- another small cleanup in the mouse handling
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 1 |
6 files changed, 13 insertions, 18 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index dda039c..5986a72 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -334,14 +334,4 @@ void AudioWidget::timerEvent( QTimerEvent * ) { | |||
334 | } | 334 | } |
335 | 335 | ||
336 | void AudioWidget::mousePressEvent( QMouseEvent *event ) { | ||
337 | mouseMoveEvent( event ); | ||
338 | } | ||
339 | |||
340 | |||
341 | void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) { | ||
342 | mouseMoveEvent( event ); | ||
343 | } | ||
344 | |||
345 | |||
346 | void AudioWidget::showEvent( QShowEvent* ) { | 336 | void AudioWidget::showEvent( QShowEvent* ) { |
347 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); | 337 | QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 690d1b3..e2e2314 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -77,6 +77,4 @@ protected: | |||
77 | void showEvent( QShowEvent *se ); | 77 | void showEvent( QShowEvent *se ); |
78 | void resizeEvent( QResizeEvent *re ); | 78 | void resizeEvent( QResizeEvent *re ); |
79 | void mousePressEvent( QMouseEvent *event ); | ||
80 | void mouseReleaseEvent( QMouseEvent *event ); | ||
81 | void timerEvent( QTimerEvent *event ); | 79 | void timerEvent( QTimerEvent *event ); |
82 | void keyReleaseEvent( QKeyEvent *e); | 80 | void keyReleaseEvent( QKeyEvent *e); |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index 3533d74..439ba2e 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -114,4 +114,14 @@ void MediaWidget::mouseMoveEvent( QMouseEvent *event ) | |||
114 | } | 114 | } |
115 | 115 | ||
116 | void MediaWidget::mousePressEvent( QMouseEvent *event ) | ||
117 | { | ||
118 | mouseMoveEvent( event ); | ||
119 | } | ||
120 | |||
121 | void MediaWidget::mouseReleaseEvent( QMouseEvent *event ) | ||
122 | { | ||
123 | mouseMoveEvent( event ); | ||
124 | } | ||
125 | |||
116 | void MediaWidget::makeVisible() | 126 | void MediaWidget::makeVisible() |
117 | { | 127 | { |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index c261728..9042d5b 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -89,4 +89,6 @@ protected: | |||
89 | 89 | ||
90 | virtual void mouseMoveEvent( QMouseEvent *event ); | 90 | virtual void mouseMoveEvent( QMouseEvent *event ); |
91 | virtual void mousePressEvent( QMouseEvent *event ); | ||
92 | virtual void mouseReleaseEvent( QMouseEvent *event ); | ||
91 | 93 | ||
92 | virtual void makeVisible(); | 94 | virtual void makeVisible(); |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 26777e6..04b09f9 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -242,8 +242,4 @@ void VideoWidget::updateSlider( long i, long max ) { | |||
242 | } | 242 | } |
243 | 243 | ||
244 | void VideoWidget::mousePressEvent( QMouseEvent *event ) { | ||
245 | mouseMoveEvent( event ); | ||
246 | } | ||
247 | |||
248 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 244 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
249 | if ( mediaPlayerState.isFullscreen() ) { | 245 | if ( mediaPlayerState.isFullscreen() ) { |
@@ -251,5 +247,5 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | |||
251 | makeVisible(); | 247 | makeVisible(); |
252 | } | 248 | } |
253 | mouseMoveEvent( event ); | 249 | MediaWidget::mouseReleaseEvent( event ); |
254 | } | 250 | } |
255 | 251 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index bed2116..985c094 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -77,5 +77,4 @@ protected: | |||
77 | void resizeEvent( QResizeEvent * ); | 77 | void resizeEvent( QResizeEvent * ); |
78 | void showEvent( QShowEvent *se ); | 78 | void showEvent( QShowEvent *se ); |
79 | void mousePressEvent( QMouseEvent *event ); | ||
80 | void mouseReleaseEvent( QMouseEvent *event ); | 79 | void mouseReleaseEvent( QMouseEvent *event ); |
81 | void keyReleaseEvent( QKeyEvent *e); | 80 | void keyReleaseEvent( QKeyEvent *e); |