summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp8
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h1
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h1
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h1
6 files changed, 12 insertions, 17 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 277d162..8c7e614 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -307,10 +307,2 @@ void AudioWidget::updateSlider( long i, long max ) {
307 307
308
309void AudioWidget::setToggleButton( int i, bool down ) {
310 qDebug("setToggleButton %d", i);
311 if ( down != buttons[i].isDown ) {
312 toggleButton( i );
313 }
314}
315
316void AudioWidget::skipFor() { 308void AudioWidget::skipFor() {
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 8c433ac..9b276b5 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -92,3 +92,2 @@ private slots:
92private: 92private:
93 void setToggleButton( int, bool );
94 int skipDirection; 93 int skipDirection;
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 271f788..9c5291b 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -99,3 +99,3 @@ void MediaWidget::paintAllButtons( QPainter &p )
99 it != buttons.end(); ++it ) 99 it != buttons.end(); ++it )
100 paintButton( *it ); 100 paintButton( p, *it );
101} 101}
@@ -116,2 +116,12 @@ void MediaWidget::paintButton( QPainter &p, const Button &button )
116 116
117void MediaWidget::setToggleButton( int buttonId, bool down )
118{
119 qDebug("setToggleButton %d", buttonId );
120
121 Button &button = buttons[ buttonId ];
122
123 if ( down != button.isDown )
124 toggleButton( buttonId );
125}
126
117void MediaWidget::toggleButton( int buttonId ) 127void MediaWidget::toggleButton( int buttonId )
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 34910fb..b7860dc 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -93,2 +93,3 @@ protected:
93 93
94 void setToggleButton( int buttonId, bool down );
94 void toggleButton( int buttonId ); 95 void toggleButton( int buttonId );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 8f6a8a9..db4a396 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -244,8 +244,2 @@ void VideoWidget::updateSlider( long i, long max ) {
244 244
245void VideoWidget::setToggleButton( int i, bool down ) {
246 if ( down != buttons[i].isDown ) {
247 toggleButton( i );
248 }
249}
250
251void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { 245void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 45279d7..915e9cc 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -103,3 +103,2 @@ private:
103 103
104 void setToggleButton( int, bool );
105 104