| -rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 53 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 9 |
2 files changed, 28 insertions, 34 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 5cdfbf2..46d374d 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -75,5 +75,5 @@ MediaButton audioButtons[] = { }; -const char *skin_mask_file_names[10] = { +const char * const skin_mask_file_names[10] = { "play", "stop", "next", "prev", "up", "down", "loop", "playlist", "forward", "back" @@ -104,10 +104,10 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : QString skinPath = "opieplayer2/skins/" + skin; - pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); - imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); - imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); + pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); + imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); + imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); - imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); - imgButtonMask->fill( 0 ); + imgButtonMask = QImage( imgUp.width(), imgUp.height(), 8, 255 ); + imgButtonMask.fill( 0 ); for ( int i = 0; i < 10; i++ ) { @@ -117,8 +117,8 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : if ( !masks[i]->isNull() ) { QImage imgMask = masks[i]->convertToImage(); - uchar **dest = imgButtonMask->jumpTable(); - for ( int y = 0; y < imgUp->height(); y++ ) { + uchar **dest = imgButtonMask.jumpTable(); + for ( int y = 0; y < imgUp.height(); y++ ) { uchar *line = dest[y]; - for ( int x = 0; x < imgUp->width(); x++ ) + for ( int x = 0; x < imgUp.width(); x++ ) if ( !qRed( imgMask.pixel( x, y ) ) ) line[x] = i + 1; @@ -133,5 +133,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : } - setBackgroundPixmap( *pixBg ); + setBackgroundPixmap( pixBg ); songInfo.setFocusPolicy( QWidget::NoFocus ); @@ -146,5 +146,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : slider.setMaxValue( 1 ); slider.setFocusPolicy( QWidget::NoFocus ); - slider.setBackgroundPixmap( *pixBg ); + slider.setBackgroundPixmap( pixBg ); // Config cofg("qpe"); @@ -186,8 +186,4 @@ AudioWidget::~AudioWidget() { delete buttonPixDown[i]; } - delete pixBg; - delete imgUp; - delete imgDn; - delete imgButtonMask; for ( int i = 0; i < 10; i++ ) { delete masks[i]; @@ -198,10 +194,10 @@ AudioWidget::~AudioWidget() { namespace { -QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { +QPixmap combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { QPixmap pix( img.width(), img.height() ); QPainter p( &pix ); p.drawTiledPixmap( pix.rect(), bg, offset ); p.drawImage( 0, 0, img ); - return new QPixmap( pix ); + return pix; } @@ -225,10 +221,10 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); - xoff = ( w - imgUp->width() ) / 2; - yoff = (( h - imgUp->height() ) / 2) - 10; + xoff = ( w - imgUp.width() ) / 2; + yoff = (( h - imgUp.height() ) / 2) - 10; QPoint p( xoff, yoff ); - QPixmap *pixUp = combineImageWithBackground( *imgUp, *pixBg, p ); - QPixmap *pixDn = combineImageWithBackground( *imgDn, *pixBg, p ); + QPixmap pixUp = combineImageWithBackground( imgUp, pixBg, p ); + QPixmap pixDn = combineImageWithBackground( imgDn, pixBg, p ); for ( int i = 0; i < 10; i++ ) { @@ -236,11 +232,8 @@ void AudioWidget::resizeEvent( QResizeEvent * ) { delete buttonPixUp[i]; delete buttonPixDown[i]; - buttonPixUp[i] = maskPixToMask( *pixUp, *masks[i] ); - buttonPixDown[i] = maskPixToMask( *pixDn, *masks[i] ); + buttonPixUp[i] = maskPixToMask( pixUp, *masks[i] ); + buttonPixDown[i] = maskPixToMask( pixDn, *masks[i] ); } } - - delete pixUp; - delete pixDn; } @@ -398,7 +391,7 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { int y = event->pos().y() - yoff; - bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width() - && y < imgButtonMask->height() - && imgButtonMask->pixelIndex( x, y ) == i + 1 ); + bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask.width() + && y < imgButtonMask.height() + && imgButtonMask.pixelIndex( x, y ) == i + 1 ); if ( isOnButton && !audioButtons[i].isHeld ) { @@ -482,5 +475,5 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) { QPainter p( &pix ); p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); - p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() ); + p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); for ( int i = 0; i < numButtons; i++ ) paintButton( &p, i ); diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 7cb1d79..54adb36 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h @@ -43,4 +43,5 @@ #include <qframe.h> #include <qlineedit.h> +#include <qimage.h> #include <opie/oticker.h> @@ -114,8 +115,8 @@ private: int skipDirection; QString skin; - QPixmap *pixBg; - QImage *imgUp; - QImage *imgDn; - QImage *imgButtonMask; + QPixmap pixBg; + QImage imgUp; + QImage imgDn; + QImage imgButtonMask; QBitmap *masks[10]; QPixmap *buttonPixUp[10]; |