summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h1
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
6 files changed, 7 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 3070bc3..f6e6086 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -439,9 +439,4 @@ void AudioWidget::showEvent( QShowEvent* ) {
439 439
440 440
441void AudioWidget::closeEvent( QCloseEvent* ) {
442 mediaPlayerState.setList();
443}
444
445
446void AudioWidget::paintEvent( QPaintEvent * pe ) { 441void AudioWidget::paintEvent( QPaintEvent * pe ) {
447 if ( !pe->erased() ) { 442 if ( !pe->erased() ) {
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 1778a30..f092699 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -86,5 +86,4 @@ protected:
86 void mouseReleaseEvent( QMouseEvent *event ); 86 void mouseReleaseEvent( QMouseEvent *event );
87 void timerEvent( QTimerEvent *event ); 87 void timerEvent( QTimerEvent *event );
88 void closeEvent( QCloseEvent *event );
89 void keyReleaseEvent( QKeyEvent *e); 88 void keyReleaseEvent( QKeyEvent *e);
90private slots: 89private slots:
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 01a7295..2992fd6 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -39,4 +39,9 @@ MediaWidget::~MediaWidget()
39} 39}
40 40
41void MediaWidget::closeEvent( QCloseEvent * )
42{
43 mediaPlayerState.setList();
44}
45
41void MediaWidget::handleCommand( Command command, bool buttonDown ) 46void MediaWidget::handleCommand( Command command, bool buttonDown )
42{ 47{
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 550f0fc..e3f09ce 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -46,4 +46,6 @@ signals:
46 46
47protected: 47protected:
48 virtual void closeEvent( QCloseEvent * );
49
48 void handleCommand( Command command, bool buttonDown ); 50 void handleCommand( Command command, bool buttonDown );
49 51
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index b4ecb4c..41dddb7 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -448,9 +448,4 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
448 448
449 449
450void VideoWidget::closeEvent( QCloseEvent* ) {
451 mediaPlayerState.setList();
452}
453
454
455void VideoWidget::keyReleaseEvent( QKeyEvent *e) { 450void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
456 switch ( e->key() ) { 451 switch ( e->key() ) {
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 38eb726..149c78e 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -92,5 +92,4 @@ protected:
92 void mousePressEvent( QMouseEvent *event ); 92 void mousePressEvent( QMouseEvent *event );
93 void mouseReleaseEvent( QMouseEvent *event ); 93 void mouseReleaseEvent( QMouseEvent *event );
94 void closeEvent( QCloseEvent *event );
95 void keyReleaseEvent( QKeyEvent *e); 94 void keyReleaseEvent( QKeyEvent *e);
96 95