From 715a0ab4094dae735de1a49373386eacc33c2f2b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 2 Sep 2023 15:48:40 +0900 Subject: [PATCH] Replace TQ_*Focus* and TQ_Scale* defines Signed-off-by: Michele Calgaro (cherry picked from commit a9fcc3608cafa63f3526ccb33c7afe14b6958fc7) --- amarok/src/browserbar.cpp | 2 +- amarok/src/collectiondb.cpp | 10 +++++----- amarok/src/hintlineedit.cpp | 2 +- amarok/src/osd.cpp | 4 ++-- amarok/src/playerwindow.cpp | 8 ++++---- amarok/src/playlistitem.cpp | 4 ++-- amarok/src/playlistwindow.cpp | 4 ++-- amarok/src/sliderwidget.cpp | 4 ++-- amarok/src/starmanager.cpp | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp index ef1babf4..b5585c74 100644 --- a/amarok/src/browserbar.cpp +++ b/amarok/src/browserbar.cpp @@ -255,7 +255,7 @@ BrowserBar::addBrowser( const TQString &identifier, TQWidget *widget, const TQSt m_tabBar->appendTab( SmallIcon( icon ), id, title, identifier ); 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 connect( tab, TQT_SIGNAL(clicked()), m_mapper, TQT_SLOT(map()) ); diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp index 024779e4..b4e5e0fd 100644 --- a/amarok/src/collectiondb.cpp +++ b/amarok/src/collectiondb.cpp @@ -1782,7 +1782,7 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) coverPm[i] = coverPm[i-1]; 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(); @@ -2131,7 +2131,7 @@ CollectionDB::findAmazonImage( const TQString &artist, const TQString &album, ui if ( width > 1 ) { 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 ); } @@ -2207,7 +2207,7 @@ CollectionDB::findDirectoryImage( const TQString& artist, const TQString& album, if ( !TQFile::exists( path ) ) { TQImage img( image ); - img.smoothScale( width, width, TQ_ScaleMin ).save( path, "PNG" ); + img.smoothScale( width, width, TQImage::ScaleMin ).save( path, "PNG" ); } return path; } @@ -2373,7 +2373,7 @@ CollectionDB::notAvailCover( const bool withShadow, int width ) s = cacheCoverDir().filePath( widthKey + "nocover.png" ); 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" ); } @@ -5856,7 +5856,7 @@ CollectionDB::loadHashFile( const TQCString& hash, uint width ) } else if ( TQFileInfo( full ).isReadable() ) { //debug() << "loadHashFile: scaling: " << full << endl; 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; return path; } diff --git a/amarok/src/hintlineedit.cpp b/amarok/src/hintlineedit.cpp index a934218c..b6777cde 100644 --- a/amarok/src/hintlineedit.cpp +++ b/amarok/src/hintlineedit.cpp @@ -31,7 +31,7 @@ HintLineEdit::init() reparent( m_vbox, 0, TQPoint(0,0), true ); m_hint = new TQLabel( m_vbox ); //m_hint->setBuddy( this ); - m_hint->setFocusPolicy( TQ_NoFocus ); + m_hint->setFocusPolicy( TQWidget::NoFocus ); TQFont font; font.setPointSize( font.pointSize() - 2); m_hint->setFont( font ); diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index 02a6aa58..c9a3e379 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -60,7 +60,7 @@ OSDWidget::OSDWidget( TQWidget *parent, const char *name ) , m_rating( 0 ) , m_volume( false ) { - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setBackgroundMode( NoBackground ); unsetColors(); @@ -225,7 +225,7 @@ OSDWidget::determineMetrics( const uint M ) m_scaledCover = m_cover.smoothScale( TQMIN( availableWidth, m_cover.width() ), 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; if( m_drawShadow && !m_scaledCover.hasAlpha() && diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index 28c23355..93429b9e 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -141,7 +141,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl KPushButton *switchView = new KPushButton( KGuiItem( "", "mini_dock" ), m_pFrameButtons ); switchView->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big! - switchView->setFocusPolicy( TQ_NoFocus ); + switchView->setFocusPolicy( TQWidget::NoFocus ); 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 ); setIconSet( iconSet ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setEnabled( action->isEnabled() ); 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 ); 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 ) @@ -954,7 +954,7 @@ IconButton::IconButton( TQWidget *parent, const TQString &icon, TQObject* receiv connect( this, TQT_SIGNAL(toggled( bool )), receiver, slot ); 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 ) diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp index e6522b27..c07f6e4b 100644 --- a/amarok/src/playlistitem.cpp +++ b/amarok/src/playlistitem.cpp @@ -615,7 +615,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co // Left part 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 ); imageTransparency( tmpImage, intensity ); 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 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 ); imageTransparency( tmpImage, intensity ); p.drawImage( width - tmpImage.width(), 0, tmpImage ); diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp index eecabde5..c2037b7b 100644 --- a/amarok/src/playlistwindow.cpp +++ b/amarok/src/playlistwindow.cpp @@ -424,7 +424,7 @@ void PlaylistWindow::init() layV->addWidget( statusbar ); //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->setMovingEnabled( false ); playlist->setMargin( 2 ); @@ -589,7 +589,7 @@ void PlaylistWindow::createGUI() if ( button ) { button->modeChange(); - button->setFocusPolicy( TQ_NoFocus ); + button->setFocusPolicy( TQWidget::NoFocus ); } } diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp index 8f1379db..e772a649 100644 --- a/amarok/src/sliderwidget.cpp +++ b/amarok/src/sliderwidget.cpp @@ -149,7 +149,7 @@ Amarok::PrettySlider::PrettySlider( Qt::Orientation orientation, SliderMode mode if( m_mode == Pretty) { setWFlags( TQt::WNoAutoErase ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); } // 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" ) ) ) { setWFlags( getWFlags() | WNoAutoErase ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); if (TQPaintDevice::x11AppDepth() == 32) m_pixmapInset.convertFromImage(KImageEffect::convertToPremultipliedAlpha( m_pixmapInset.convertToImage() )); diff --git a/amarok/src/starmanager.cpp b/amarok/src/starmanager.cpp index adeb8665..314c9c7a 100644 --- a/amarok/src/starmanager.cpp +++ b/amarok/src/starmanager.cpp @@ -62,7 +62,7 @@ StarManager::reinitStars( int height, int margin ) } 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" ) ); m_star = star.copy(); m_fullStar = fullStar.copy(); @@ -71,7 +71,7 @@ StarManager::reinitStars( int height, int margin ) m_greyedStar = star.copy(); TDEIconEffect::toGray( m_greyedStar, 1.0 ); 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" ) ); m_halfStar = half.copy(); m_fullHalfStar = fullHalf.copy();