summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp10
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp10
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
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
@@ -335,12 +335,2 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
335 335
336void AudioWidget::mousePressEvent( QMouseEvent *event ) {
337 mouseMoveEvent( event );
338}
339
340
341void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) {
342 mouseMoveEvent( event );
343}
344
345
346void AudioWidget::showEvent( QShowEvent* ) { 336void AudioWidget::showEvent( QShowEvent* ) {
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
@@ -78,4 +78,2 @@ protected:
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 );
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
@@ -115,2 +115,12 @@ void MediaWidget::mouseMoveEvent( QMouseEvent *event )
115 115
116void MediaWidget::mousePressEvent( QMouseEvent *event )
117{
118 mouseMoveEvent( event );
119}
120
121void MediaWidget::mouseReleaseEvent( QMouseEvent *event )
122{
123 mouseMoveEvent( event );
124}
125
116void MediaWidget::makeVisible() 126void MediaWidget::makeVisible()
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
@@ -90,2 +90,4 @@ protected:
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
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
@@ -243,6 +243,2 @@ void VideoWidget::updateSlider( long i, long max ) {
243 243
244void VideoWidget::mousePressEvent( QMouseEvent *event ) {
245 mouseMoveEvent( event );
246}
247
248void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { 244void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
@@ -252,3 +248,3 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
252 } 248 }
253 mouseMoveEvent( event ); 249 MediaWidget::mouseReleaseEvent( event );
254} 250}
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
@@ -78,3 +78,2 @@ protected:
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 );