summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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
@@ -333,16 +333,6 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
}
}
-void AudioWidget::mousePressEvent( QMouseEvent *event ) {
- mouseMoveEvent( event );
-}
-
-
-void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) {
- mouseMoveEvent( event );
-}
-
-
void AudioWidget::showEvent( QShowEvent* ) {
QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
mouseMoveEvent( &event );
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
@@ -76,8 +76,6 @@ protected:
void doUnblank();
void showEvent( QShowEvent *se );
void resizeEvent( QResizeEvent *re );
- void mousePressEvent( QMouseEvent *event );
- void mouseReleaseEvent( QMouseEvent *event );
void timerEvent( QTimerEvent *event );
void keyReleaseEvent( QKeyEvent *e);
private slots:
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
@@ -113,6 +113,16 @@ void MediaWidget::mouseMoveEvent( QMouseEvent *event )
}
}
+void MediaWidget::mousePressEvent( QMouseEvent *event )
+{
+ mouseMoveEvent( event );
+}
+
+void MediaWidget::mouseReleaseEvent( QMouseEvent *event )
+{
+ mouseMoveEvent( event );
+}
+
void 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
@@ -88,6 +88,8 @@ protected:
virtual void paintEvent( QPaintEvent *pe );
virtual void mouseMoveEvent( QMouseEvent *event );
+ virtual void mousePressEvent( QMouseEvent *event );
+ virtual void mouseReleaseEvent( QMouseEvent *event );
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
@@ -241,16 +241,12 @@ void VideoWidget::updateSlider( long i, long max ) {
}
}
-void VideoWidget::mousePressEvent( QMouseEvent *event ) {
- mouseMoveEvent( event );
-}
-
void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
if ( mediaPlayerState.isFullscreen() ) {
mediaPlayerState.setFullscreen( FALSE );
makeVisible();
}
- mouseMoveEvent( event );
+ MediaWidget::mouseReleaseEvent( event );
}
void VideoWidget::showEvent( QShowEvent* ) {
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
@@ -76,7 +76,6 @@ protected:
void resizeEvent( QResizeEvent * );
void showEvent( QShowEvent *se );
- void mousePressEvent( QMouseEvent *event );
void mouseReleaseEvent( QMouseEvent *event );
void keyReleaseEvent( QKeyEvent *e);