Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index fe7ddc1..2081b4f 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -131,6 +131,4 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
131 | 131 | ||
132 | for ( int i = 0; i < 10; i++ ) { | 132 | buttonPixUp.resize( masks.size(), QPixmap() ); |
133 | buttonPixUp[i] = 0l; | 133 | buttonPixDown.resize( masks.size(), QPixmap() ); |
134 | buttonPixDown[i] = 0l; | ||
135 | } | ||
136 | 134 | ||
@@ -182,6 +180,2 @@ AudioWidget::~AudioWidget() { | |||
182 | 180 | ||
183 | for ( int i = 0; i < 10; i++ ) { | ||
184 | delete buttonPixUp[i]; | ||
185 | delete buttonPixDown[i]; | ||
186 | } | ||
187 | // mediaPlayerState->setPlaying(false); | 181 | // mediaPlayerState->setPlaying(false); |
@@ -200,5 +194,5 @@ QPixmap combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | |||
200 | 194 | ||
201 | QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) { | 195 | QPixmap maskPixToMask( QPixmap pix, QBitmap mask ) { |
202 | QPixmap *pixmap = new QPixmap( pix ); | 196 | QPixmap pixmap( pix ); |
203 | pixmap->setMask( mask ); | 197 | pixmap.setMask( mask ); |
204 | return pixmap; | 198 | return pixmap; |
@@ -227,4 +221,2 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { | |||
227 | if ( !masks[i].isNull() ) { | 221 | if ( !masks[i].isNull() ) { |
228 | delete buttonPixUp[i]; | ||
229 | delete buttonPixDown[i]; | ||
230 | buttonPixUp[i] = maskPixToMask( pixUp, masks[i] ); | 222 | buttonPixUp[i] = maskPixToMask( pixUp, masks[i] ); |
@@ -334,5 +326,5 @@ void AudioWidget::paintButton( QPainter &p, int i ) { | |||
334 | if ( buttons[i].isDown ) { | 326 | if ( buttons[i].isDown ) { |
335 | p.drawPixmap( upperLeftOfButtonMask, *buttonPixDown[i] ); | 327 | p.drawPixmap( upperLeftOfButtonMask, buttonPixDown[i] ); |
336 | } else { | 328 | } else { |
337 | p.drawPixmap( upperLeftOfButtonMask, *buttonPixUp[i] ); | 329 | p.drawPixmap( upperLeftOfButtonMask, buttonPixUp[i] ); |
338 | } | 330 | } |