TDE
/
amarok
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/amarok
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace TQ_*Focus* and TQ_Scale* defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/47/head
Michele Calgaro 9 months ago
parent f06a2d618a
commit a9fcc3608c
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
amarok/src/browserbar.cpp
Unescape View File

@ -255,7 +255,7 @@ BrowserBar::addBrowser( const TQString &identifier, TQWidget *widget, const TQSt
m_tabBar->appendTab( SmallIcon( icon ), id, title, identifier ); m_tabBar->appendTab( SmallIcon( icon ), id, title, identifier );
tab = m_tabBar->tab( id ); tab = m_tabBar->tab( id );
tab->setFocusPolicy( TQ_NoFocus ); //FIXME you can focus on the tab, but they respond to no input! tab->setFocusPolicy( TQWidget::NoFocus ); //FIXME you can focus on the tab, but they respond to no input!
//we use a SignalMapper to show/hide the corresponding browser when tabs are clicked //we use a SignalMapper to show/hide the corresponding browser when tabs are clicked
connect( tab, TQT_SIGNAL(clicked()), m_mapper, TQT_SLOT(map()) ); connect( tab, TQT_SIGNAL(clicked()), m_mapper, TQT_SLOT(map()) );

10
amarok/src/collectiondb.cpp
Unescape View File

@ -1782,7 +1782,7 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide )
coverPm[i] = coverPm[i-1]; coverPm[i] = coverPm[i-1];
TQImage im( locate( "data","amarok/images/more_albums.png" ) ); TQImage im( locate( "data","amarok/images/more_albums.png" ) );
coverPm[0].convertFromImage( im.smoothScale( coverW, coverH, TQ_ScaleMin ) ); coverPm[0].convertFromImage( im.smoothScale( coverW, coverH, TQImage::ScaleMin ) );
} }
pixmapH = coverPm[0].height(); pixmapH = coverPm[0].height();
@ -2131,7 +2131,7 @@ CollectionDB::findAmazonImage( const TQString &artist, const TQString &album, ui
if ( width > 1 ) if ( width > 1 )
{ {
TQImage img( imageDir.filePath( key ) ); TQImage img( imageDir.filePath( key ) );
img.smoothScale( width, width, TQ_ScaleMin ).save( cacheCoverDir().filePath( widthKey + key ), "PNG" ); img.smoothScale( width, width, TQImage::ScaleMin ).save( cacheCoverDir().filePath( widthKey + key ), "PNG" );
return cacheCoverDir().filePath( widthKey + key ); return cacheCoverDir().filePath( widthKey + key );
} }
@ -2207,7 +2207,7 @@ CollectionDB::findDirectoryImage( const TQString& artist, const TQString& album,
if ( !TQFile::exists( path ) ) if ( !TQFile::exists( path ) )
{ {
TQImage img( image ); TQImage img( image );
img.smoothScale( width, width, TQ_ScaleMin ).save( path, "PNG" ); img.smoothScale( width, width, TQImage::ScaleMin ).save( path, "PNG" );
} }
return path; return path;
} }
@ -2373,7 +2373,7 @@ CollectionDB::notAvailCover( const bool withShadow, int width )
s = cacheCoverDir().filePath( widthKey + "nocover.png" ); s = cacheCoverDir().filePath( widthKey + "nocover.png" );
else else
{ {
m_noCover.smoothScale( width, width, TQ_ScaleMin ).save( cacheCoverDir().filePath( widthKey + "nocover.png" ), "PNG" ); m_noCover.smoothScale( width, width, TQImage::ScaleMin ).save( cacheCoverDir().filePath( widthKey + "nocover.png" ), "PNG" );
s = cacheCoverDir().filePath( widthKey + "nocover.png" ); s = cacheCoverDir().filePath( widthKey + "nocover.png" );
} }
@ -5856,7 +5856,7 @@ CollectionDB::loadHashFile( const TQCString& hash, uint width )
} else if ( TQFileInfo( full ).isReadable() ) { } else if ( TQFileInfo( full ).isReadable() ) {
//debug() << "loadHashFile: scaling: " << full << endl; //debug() << "loadHashFile: scaling: " << full << endl;
TQImage image( full ); TQImage image( full );
if ( image.smoothScale( width, width, TQ_ScaleMin ).save( path, "PNG" ) ) { if ( image.smoothScale( width, width, TQImage::ScaleMin ).save( path, "PNG" ) ) {
//debug() << "loadHashFile: scaled: " << path << endl; //debug() << "loadHashFile: scaled: " << path << endl;
return path; return path;
} }

2
amarok/src/hintlineedit.cpp
Unescape View File

@ -31,7 +31,7 @@ HintLineEdit::init()
reparent( m_vbox, 0, TQPoint(0,0), true ); reparent( m_vbox, 0, TQPoint(0,0), true );
m_hint = new TQLabel( m_vbox ); m_hint = new TQLabel( m_vbox );
//m_hint->setBuddy( this ); //m_hint->setBuddy( this );
m_hint->setFocusPolicy( TQ_NoFocus ); m_hint->setFocusPolicy( TQWidget::NoFocus );
TQFont font; TQFont font;
font.setPointSize( font.pointSize() - 2); font.setPointSize( font.pointSize() - 2);
m_hint->setFont( font ); m_hint->setFont( font );

4
amarok/src/osd.cpp
Unescape View File

@ -60,7 +60,7 @@ OSDWidget::OSDWidget( TQWidget *parent, const char *name )
, m_rating( 0 ) , m_rating( 0 )
, m_volume( false ) , m_volume( false )
{ {
setFocusPolicy( TQ_NoFocus ); setFocusPolicy( TQWidget::NoFocus );
setBackgroundMode( NoBackground ); setBackgroundMode( NoBackground );
unsetColors(); unsetColors();
@ -225,7 +225,7 @@ OSDWidget::determineMetrics( const uint M )
m_scaledCover = m_cover.smoothScale( m_scaledCover = m_cover.smoothScale(
TQMIN( availableWidth, m_cover.width() ), TQMIN( availableWidth, m_cover.width() ),
TQMIN( rect.height(), m_cover.height() ), TQMIN( rect.height(), m_cover.height() ),
TQ_ScaleMin ); //this will force us to be with our bounds TQImage::ScaleMin ); //this will force us to be with our bounds
int shadowWidth = 0; int shadowWidth = 0;
if( m_drawShadow && !m_scaledCover.hasAlpha() && if( m_drawShadow && !m_scaledCover.hasAlpha() &&

8
amarok/src/playerwindow.cpp
Unescape View File

@ -141,7 +141,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl
KPushButton *switchView = new KPushButton( KGuiItem( "", "mini_dock" ), m_pFrameButtons ); KPushButton *switchView = new KPushButton( KGuiItem( "", "mini_dock" ), m_pFrameButtons );
switchView->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big! switchView->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big!
switchView->setFocusPolicy( TQ_NoFocus ); switchView->setFocusPolicy( TQWidget::NoFocus );
connect( switchView, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleView() ) ); connect( switchView, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleView() ) );
@ -896,7 +896,7 @@ NavButton::NavButton( TQWidget *parent, const TQString &icon, TDEAction *action
iconSet.setPixmap( pixmap, TQIconSet::Automatic, TQIconSet::Disabled, TQIconSet::Off ); iconSet.setPixmap( pixmap, TQIconSet::Automatic, TQIconSet::Disabled, TQIconSet::Off );
setIconSet( iconSet ); setIconSet( iconSet );
setFocusPolicy( TQ_NoFocus ); setFocusPolicy( TQWidget::NoFocus );
setEnabled( action->isEnabled() ); setEnabled( action->isEnabled() );
connect( action, TQT_SIGNAL( enabled( bool ) ), TQT_SLOT( setEnabled( bool ) ) ); connect( action, TQT_SIGNAL( enabled( bool ) ), TQT_SLOT( setEnabled( bool ) ) );
@ -943,7 +943,7 @@ IconButton::IconButton( TQWidget *parent, const TQString &icon, const char *sign
connect( this, TQT_SIGNAL(toggled( bool )), parent, signal ); connect( this, TQT_SIGNAL(toggled( bool )), parent, signal );
setToggleButton( true ); setToggleButton( true );
setFocusPolicy( TQ_NoFocus ); //we have no way to show focus on these widgets currently setFocusPolicy( TQWidget::NoFocus ); //we have no way to show focus on these widgets currently
} }
IconButton::IconButton( TQWidget *parent, const TQString &icon, TQObject* receiver, const char *slot ) IconButton::IconButton( TQWidget *parent, const TQString &icon, TQObject* receiver, const char *slot )
@ -954,7 +954,7 @@ IconButton::IconButton( TQWidget *parent, const TQString &icon, TQObject* receiv
connect( this, TQT_SIGNAL(toggled( bool )), receiver, slot ); connect( this, TQT_SIGNAL(toggled( bool )), receiver, slot );
setToggleButton( true ); setToggleButton( true );
setFocusPolicy( TQ_NoFocus ); //we have no way to show focus on these widgets currently setFocusPolicy( TQWidget::NoFocus ); //we have no way to show focus on these widgets currently
} }
void IconButton::drawButton( TQPainter *p ) void IconButton::drawButton( TQPainter *p )

4
amarok/src/playlistitem.cpp
Unescape View File

@ -615,7 +615,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
// Left part // Left part
if( column == listView()->m_firstColumn ) { if( column == listView()->m_firstColumn ) {
TQImage tmpImage = currentTrackLeft.smoothScale( 1, height(), TQ_ScaleMax ); TQImage tmpImage = currentTrackLeft.smoothScale( 1, height(), TQImage::ScaleMax );
TDEIconEffect::colorize( tmpImage, glowBase, colorize ); TDEIconEffect::colorize( tmpImage, glowBase, colorize );
imageTransparency( tmpImage, intensity ); imageTransparency( tmpImage, intensity );
p.drawImage( 0, 0, tmpImage, 0, 0, tmpImage.width() - 1 ); //HACK p.drawImage( 0, 0, tmpImage, 0, 0, tmpImage.width() - 1 ); //HACK
@ -627,7 +627,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
else else
if( column == Playlist::instance()->mapToLogicalColumn( Playlist::instance()->numVisibleColumns() - 1 ) ) if( column == Playlist::instance()->mapToLogicalColumn( Playlist::instance()->numVisibleColumns() - 1 ) )
{ {
TQImage tmpImage = currentTrackRight.smoothScale( 1, height(), TQ_ScaleMax ); TQImage tmpImage = currentTrackRight.smoothScale( 1, height(), TQImage::ScaleMax );
TDEIconEffect::colorize( tmpImage, glowBase, colorize ); TDEIconEffect::colorize( tmpImage, glowBase, colorize );
imageTransparency( tmpImage, intensity ); imageTransparency( tmpImage, intensity );
p.drawImage( width - tmpImage.width(), 0, tmpImage ); p.drawImage( width - tmpImage.width(), 0, tmpImage );

4
amarok/src/playlistwindow.cpp
Unescape View File

@ -424,7 +424,7 @@ void PlaylistWindow::init()
layV->addWidget( statusbar ); layV->addWidget( statusbar );
//The volume slider later becomes our FocusProxy, so all wheelEvents get redirected to it //The volume slider later becomes our FocusProxy, so all wheelEvents get redirected to it
m_toolbar->setFocusPolicy( TQ_WheelFocus ); m_toolbar->setFocusPolicy( TQWidget::WheelFocus );
m_toolbar->setFlat( true ); m_toolbar->setFlat( true );
m_toolbar->setMovingEnabled( false ); m_toolbar->setMovingEnabled( false );
playlist->setMargin( 2 ); playlist->setMargin( 2 );
@ -589,7 +589,7 @@ void PlaylistWindow::createGUI()
if ( button ) { if ( button ) {
button->modeChange(); button->modeChange();
button->setFocusPolicy( TQ_NoFocus ); button->setFocusPolicy( TQWidget::NoFocus );
} }
} }

4
amarok/src/sliderwidget.cpp
Unescape View File

@ -149,7 +149,7 @@ Amarok::PrettySlider::PrettySlider( Qt::Orientation orientation, SliderMode mode
if( m_mode == Pretty) if( m_mode == Pretty)
{ {
setWFlags( TQt::WNoAutoErase ); setWFlags( TQt::WNoAutoErase );
setFocusPolicy( TQ_NoFocus ); setFocusPolicy( TQWidget::NoFocus );
} }
// We only have to connect this *once*, since our MetaBundle // We only have to connect this *once*, since our MetaBundle
@ -357,7 +357,7 @@ Amarok::VolumeSlider::VolumeSlider( TQWidget *parent, uint max )
, m_pixmapInset( TQPixmap( locate( "data","amarok/images/volumeslider-inset.png" ) ) ) , m_pixmapInset( TQPixmap( locate( "data","amarok/images/volumeslider-inset.png" ) ) )
{ {
setWFlags( getWFlags() | WNoAutoErase ); setWFlags( getWFlags() | WNoAutoErase );
setFocusPolicy( TQ_NoFocus ); setFocusPolicy( TQWidget::NoFocus );
if (TQPaintDevice::x11AppDepth() == 32) m_pixmapInset.convertFromImage(KImageEffect::convertToPremultipliedAlpha( m_pixmapInset.convertToImage() )); if (TQPaintDevice::x11AppDepth() == 32) m_pixmapInset.convertFromImage(KImageEffect::convertToPremultipliedAlpha( m_pixmapInset.convertToImage() ));

4
amarok/src/starmanager.cpp
Unescape View File

@ -62,7 +62,7 @@ StarManager::reinitStars( int height, int margin )
} }
int hval = m_height + m_margin * 2 - 4 + ( ( m_height % 2 ) ? 1 : 0 ); int hval = m_height + m_margin * 2 - 4 + ( ( m_height % 2 ) ? 1 : 0 );
TQImage star = TQImage( locate( "data", "amarok/images/star.png" ) ).smoothScale( hval, hval, TQ_ScaleMin ); TQImage star = TQImage( locate( "data", "amarok/images/star.png" ) ).smoothScale( hval, hval, TQImage::ScaleMin );
TQImage fullStar = TQImage( locate( "data", "amarok/images/star.png" ) ); TQImage fullStar = TQImage( locate( "data", "amarok/images/star.png" ) );
m_star = star.copy(); m_star = star.copy();
m_fullStar = fullStar.copy(); m_fullStar = fullStar.copy();
@ -71,7 +71,7 @@ StarManager::reinitStars( int height, int margin )
m_greyedStar = star.copy(); m_greyedStar = star.copy();
TDEIconEffect::toGray( m_greyedStar, 1.0 ); TDEIconEffect::toGray( m_greyedStar, 1.0 );
m_greyedStarPix.convertFromImage( m_greyedStar ); m_greyedStarPix.convertFromImage( m_greyedStar );
TQImage half = TQImage( locate( "data", "amarok/images/smallstar.png" ) ).smoothScale( hval, hval, TQ_ScaleMin ); TQImage half = TQImage( locate( "data", "amarok/images/smallstar.png" ) ).smoothScale( hval, hval, TQImage::ScaleMin );
TQImage fullHalf = TQImage( locate( "data", "amarok/images/smallstar.png" ) ); TQImage fullHalf = TQImage( locate( "data", "amarok/images/smallstar.png" ) );
m_halfStar = half.copy(); m_halfStar = half.copy();
m_fullHalfStar = fullHalf.copy(); m_fullHalfStar = fullHalf.copy();

Write Preview
Loading…
Cancel
Save