diff options
Diffstat (limited to 'amarok/src/osd.cpp')
| -rw-r--r-- | amarok/src/osd.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index 187340ea..cc475524 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -45,8 +45,8 @@ namespace ShadowEngine #define MOODBAR_HEIGHT 20 -OSDWidget::OSDWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ) +OSDWidget::OSDWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ) , m_duration( 2000 ) , m_timer( new TQTimer( this ) ) , m_tqalignment( Middle ) @@ -284,16 +284,16 @@ OSDWidget::render( const uint M, const TQSize &size ) const uint xround = (M * 200) / size.width(); const uint yround = (M * 200) / size.height(); - { /// apply the tqmask - static TQBitmap tqmask; + { /// apply the mask + static TQBitmap mask; - tqmask.resize( size ); - tqmask.fill( TQt::black ); + mask.resize( size ); + mask.fill( TQt::black ); - TQPainter p( &tqmask ); + TQPainter p( &mask ); p.setBrush( TQt::white ); p.drawRoundRect( rect, xround, yround ); - setMask( tqmask ); + setMask( mask ); } TQColor shadowColor; @@ -370,11 +370,11 @@ OSDWidget::render( const uint M, const TQSize &size ) KPixmap pixmapGradient; { // gradient - TQBitmap tqmask; - tqmask.resize( vol.size() ); - tqmask.fill( TQt::black ); + TQBitmap mask; + mask.resize( vol.size() ); + mask.fill( TQt::black ); - TQPainter p( &tqmask ); + TQPainter p( &mask ); p.setBrush( TQt::white ); p.drawRoundRect ( 3, 3, vol.width() - 6, vol.height() - 6, M * 300 / vol.width(), 99 ); @@ -383,7 +383,7 @@ OSDWidget::render( const uint M, const TQSize &size ) pixmapGradient = TQPixmap( vol.size() ); KPixmapEffect::gradient( pixmapGradient, tqcolorGroup().background(), tqcolorGroup().highlight(), KPixmapEffect::EllipticGradient ); - pixmapGradient.setMask( tqmask ); + pixmapGradient.setMask( mask ); } if( m_translucency ) @@ -396,11 +396,11 @@ OSDWidget::render( const uint M, const TQSize &size ) vol.fill( backgroundColor() ); { // vol ( bg-alpha ) - static TQBitmap tqmask; - tqmask.resize( vol.size() ); - tqmask.fill( TQt::white ); + static TQBitmap mask; + mask.resize( vol.size() ); + mask.fill( TQt::white ); - TQPainter p( &tqmask ); + TQPainter p( &mask ); p.setBrush( TQt::black ); p.drawRoundRect ( 1, 1, rect.width()-2, rect.height() + fontMetrics().height() / 4 - 2, M * 300 / vol.width(), 99 ); @@ -408,7 +408,7 @@ OSDWidget::render( const uint M, const TQSize &size ) p.drawRoundRect ( 3, 3, vol.width() - 6, vol.height() - 6, M * 300 / vol.width(), 99 ); p.end(); - vol.setMask( tqmask ); + vol.setMask( mask ); } buf.fill( backgroundColor().dark() ); @@ -544,8 +544,8 @@ namespace Amarok TQImage icon() { return TQImage( KIconLoader().iconPath( "amarok", -KIcon::SizeHuge ) ); } } -OSDPreviewWidget::OSDPreviewWidget( TQWidget *tqparent ) - : OSDWidget( tqparent, "osdpreview" ) +OSDPreviewWidget::OSDPreviewWidget( TQWidget *parent ) + : OSDWidget( parent, "osdpreview" ) , m_dragging( false ) { m_text = i18n( "OSD Preview - drag to reposition" ); @@ -841,7 +841,7 @@ Amarok::OSD::slotImageChanged( const TQString &remoteURL ) if( CollectionDB::instance()->getPodcastEpisodeBundle( url, &peb ) ) { PodcastChannelBundle pcb; - if( CollectionDB::instance()->getPodcastChannelBundle( peb.tqparent().url(), &pcb ) ) + if( CollectionDB::instance()->getPodcastChannelBundle( peb.parent().url(), &pcb ) ) { if( pcb.imageURL().url() == remoteURL ) { |