From 8141d8e2e3da6a10c5144abc80ffb8f33c525c2a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:00:27 -0600 Subject: [PATCH] Rename KIcon to enhance compatibility with KDE4 --- amarok/src/actionclasses.cpp | 2 +- amarok/src/app.cpp | 2 +- amarok/src/collectionbrowser.cpp | 2 +- amarok/src/configdialog.cpp | 2 +- amarok/src/contextbrowser.cpp | 8 ++--- amarok/src/covermanager.cpp | 4 +-- amarok/src/covermanager.h | 4 +-- amarok/src/deletedialog.cpp | 4 +-- amarok/src/directorylist.cpp | 2 +- .../magnatunelistviewitems.cpp | 6 ++-- amarok/src/mediabrowser.cpp | 32 +++++++++---------- amarok/src/mediadevice/daap/daapclient.cpp | 4 +-- amarok/src/multitabbar.cpp | 2 +- amarok/src/osd.cpp | 2 +- amarok/src/playerwindow.cpp | 10 +++--- amarok/src/playlist.cpp | 2 +- amarok/src/playlistitem.cpp | 6 ++-- amarok/src/prettypopupmenu.cpp | 2 +- amarok/src/sliderwidget.cpp | 2 +- amarok/src/starmanager.cpp | 8 ++--- amarok/src/statistics.cpp | 4 +-- amarok/src/statusbar/queueLabel.cpp | 2 +- amarok/src/statusbar/selectLabel.h | 2 +- amarok/src/statusbar/statusBarBase.cpp | 6 ++-- amarok/src/statusbar/toggleLabel.h | 2 +- amarok/src/systray.cpp | 6 ++-- 26 files changed, 64 insertions(+), 64 deletions(-) diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp index 630ccd46..3223ae56 100644 --- a/amarok/src/actionclasses.cpp +++ b/amarok/src/actionclasses.cpp @@ -398,7 +398,7 @@ void SelectAction::setIcons( TQStringList icons ) { m_icons = icons; for( int i = 0, n = items().count(); i < n; ++i ) - popupMenu()->changeItem( i, kapp->iconLoader()->loadIconSet( *icons.at( i ), KIcon::Small ), popupMenu()->text( i ) ); + popupMenu()->changeItem( i, kapp->iconLoader()->loadIconSet( *icons.at( i ), TDEIcon::Small ), popupMenu()->text( i ) ); } TQStringList SelectAction::icons() const { return m_icons; } diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index 4733cd99..260bdad4 100644 --- a/amarok/src/app.cpp +++ b/amarok/src/app.cpp @@ -1077,7 +1077,7 @@ void App::engineStateChanged( Engine::State state, Engine::State oldState ) m_pPlaylistWindow->setCaption( kapp->makeStdCaption( i18n("Playlist") ) ); else m_pPlaylistWindow->setCaption( "Amarok" ); TrackToolTip::instance()->clear(); - Amarok::OSD::instance()->setImage( KIconLoader().iconPath( "amarok", -KIcon::SizeHuge ) ); + Amarok::OSD::instance()->setImage( TDEIconLoader().iconPath( "amarok", -TDEIcon::SizeHuge ) ); break; case Engine::Playing: diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp index 0fd0006f..26244c91 100644 --- a/amarok/src/collectionbrowser.cpp +++ b/amarok/src/collectionbrowser.cpp @@ -2736,7 +2736,7 @@ CollectionView::iconForCategory( const int cat ) const break; } - return TDEGlobal::iconLoader()->loadIcon( icon, KIcon::Toolbar, KIcon::SizeSmall ); + return TDEGlobal::iconLoader()->loadIcon( icon, TDEIcon::Toolbar, TDEIcon::SizeSmall ); } TQString diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp index cf47b311..6f746ebe 100644 --- a/amarok/src/configdialog.cpp +++ b/amarok/src/configdialog.cpp @@ -185,7 +185,7 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, TDEC // Show information labels (must be done after insertions) TQObjectList *list = queryList( TQLABEL_OBJECT_NAME_STRING, "infoPixmap" ); - TQPixmap const info = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -KIcon::SizeHuge ); + TQPixmap const info = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -TDEIcon::SizeHuge ); for( TQObject *label = list->first(); label; label = list->next() ) static_cast(TQT_TQWIDGET(label))->setPixmap( info ); delete list; diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp index 95da8984..057e7331 100644 --- a/amarok/src/contextbrowser.cpp +++ b/amarok/src/contextbrowser.cpp @@ -1117,7 +1117,7 @@ public: m_amarokIconPath = TQDeepCopy(TDEGlobal::iconLoader()->iconPath( "amarok", - -KIcon::SizeEnormous ) ); + -TDEIcon::SizeEnormous ) ); m_musicBrainIconPath = TQDeepCopy(locate( "data", "amarok/images/musicbrainz.png" ) ); m_lastfmIcon = "file://" + locate( "data","amarok/images/lastfm.png" ); @@ -1774,9 +1774,9 @@ void CurrentTrackJob::showLastFm( const MetaBundle ¤tTrack ) for ( TQString* url = newUrls.first(); url; url = newUrls.next() ) url->replace( TQRegExp( "^http:" ), "externalurl:" ); - const TQString skipIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("next"), -KIcon::SizeSmallMedium ); - const TQString loveIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("love"), -KIcon::SizeSmallMedium ); - const TQString banIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("remove"), -KIcon::SizeSmallMedium ); + const TQString skipIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("next"), -TDEIcon::SizeSmallMedium ); + const TQString loveIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("love"), -TDEIcon::SizeSmallMedium ); + const TQString banIcon = TDEGlobal::iconLoader()->iconPath( Amarok::icon("remove"), -TDEIcon::SizeSmallMedium ); m_HTMLSource.append( QStringx( diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp index e8f9e61f..03905134 100644 --- a/amarok/src/covermanager.cpp +++ b/amarok/src/covermanager.cpp @@ -885,7 +885,7 @@ void CoverManager::setStatusText( TQString text ) ///////////////////////////////////////////////////////////////////// CoverView::CoverView( TQWidget *parent, const char *name, WFlags f ) - : KIconView( parent, name, f ) + : TDEIconView( parent, name, f ) { Debug::Block block( __PRETTY_FUNCTION__ ); @@ -952,7 +952,7 @@ void CoverView::setStatusText( TQIconViewItem *item ) ///////////////////////////////////////////////////////////////////// CoverViewItem::CoverViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &artist, const TQString &album ) - : KIconViewItem( parent, after, album ) + : TDEIconViewItem( parent, after, album ) , m_artist( artist ) , m_album( album ) , m_coverImagePath( CollectionDB::instance()->albumImage( m_artist, m_album, false, 0, &m_embedded ) ) diff --git a/amarok/src/covermanager.h b/amarok/src/covermanager.h index c88a4f01..413b48e5 100644 --- a/amarok/src/covermanager.h +++ b/amarok/src/covermanager.h @@ -108,7 +108,7 @@ class CoverManager : public TQSplitter int m_coverErrors; }; -class CoverView : public KIconView +class CoverView : public TDEIconView { Q_OBJECT @@ -123,7 +123,7 @@ class CoverView : public KIconView void setStatusText( TQIconViewItem *item ); }; -class CoverViewItem : public KIconViewItem +class CoverViewItem : public TDEIconViewItem { public: CoverViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &artist, const TQString &album ); diff --git a/amarok/src/deletedialog.cpp b/amarok/src/deletedialog.cpp index 253313c0..cd8d38d6 100644 --- a/amarok/src/deletedialog.cpp +++ b/amarok/src/deletedialog.cpp @@ -71,12 +71,12 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete) ddDeleteText->setText(i18n("These items will be permanently " "deleted from your hard disk.")); ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", - KIcon::Desktop, KIcon::SizeLarge)); + TDEIcon::Desktop, TDEIcon::SizeLarge)); } else { ddDeleteText->setText(i18n("These items will be moved to the Trash Bin.")); ddWarningIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("trashcan_full", - KIcon::Desktop, KIcon::SizeLarge)); + TDEIcon::Desktop, TDEIcon::SizeLarge)); } } diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp index 414d9989..4aa30b49 100644 --- a/amarok/src/directorylist.cpp +++ b/amarok/src/directorylist.cpp @@ -280,7 +280,7 @@ Item::newItems( const KFileItemList &list ) //SLOT } } - item->setPixmap( 0, (*it)->pixmap( KIcon::SizeSmall ) ); + item->setPixmap( 0, (*it)->pixmap( TDEIcon::SizeSmall ) ); } } diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp index eafe018a..59964ad5 100644 --- a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp +++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp @@ -34,7 +34,7 @@ MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist { TDEListViewItem::setText( 0, artist.getName() ); - setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Toolbar, KIcon::SizeSmall ) ); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); setDragEnabled ( true ); } @@ -90,7 +90,7 @@ MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, TD TDEListViewItem::setText( 0, album.getName() ); setDragEnabled( true ); - //setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "cdrom_unmount", KIcon::Toolbar, KIcon::SizeSmall ) ); + //setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "cdrom_unmount", TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); } @@ -166,7 +166,7 @@ MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, TD setDragEnabled( true ); - //setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "track", KIcon::Toolbar, KIcon::SizeSmall ) ); + //setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "track", TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); } MagnatuneListViewTrackItem::~ MagnatuneListViewTrackItem( ) diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp index 261a92e7..7d2da609 100644 --- a/amarok/src/mediabrowser.cpp +++ b/amarok/src/mediabrowser.cpp @@ -217,13 +217,13 @@ MediaBrowser::MediaBrowser( const char *name ) s_instance = this; // preload pixmaps used in browser - KIconLoader iconLoader; - MediaItem::s_pixUnknown = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "unknown" ), KIcon::Toolbar, KIcon::SizeSmall )); - MediaItem::s_pixTrack = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "playlist" ), KIcon::Toolbar, KIcon::SizeSmall )); - MediaItem::s_pixFile = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "sound" ), KIcon::Toolbar, KIcon::SizeSmall ) ); - MediaItem::s_pixPodcast = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "podcast" ), KIcon::Toolbar, KIcon::SizeSmall ) ); - MediaItem::s_pixPlaylist = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "playlist" ), KIcon::Toolbar, KIcon::SizeSmall ) ); - MediaItem::s_pixRootItem = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "files2" ), KIcon::Toolbar, KIcon::SizeSmall ) ); + TDEIconLoader iconLoader; + MediaItem::s_pixUnknown = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "unknown" ), TDEIcon::Toolbar, TDEIcon::SizeSmall )); + MediaItem::s_pixTrack = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "playlist" ), TDEIcon::Toolbar, TDEIcon::SizeSmall )); + MediaItem::s_pixFile = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "sound" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixPodcast = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "podcast" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixPlaylist = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "playlist" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixRootItem = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "files2" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); // history // favorites // collection @@ -232,15 +232,15 @@ MediaBrowser::MediaBrowser( const char *name ) // player_playlist_2 // cancel // sound - MediaItem::s_pixArtist = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "personal" ), KIcon::Toolbar, KIcon::SizeSmall ) ); - MediaItem::s_pixAlbum = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cdrom_unmount" ), KIcon::Toolbar, KIcon::SizeSmall ) ); - MediaItem::s_pixInvisible = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), KIcon::Toolbar, KIcon::SizeSmall ) ); - MediaItem::s_pixStale = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), KIcon::Toolbar, KIcon::SizeSmall ) ); - MediaItem::s_pixOrphaned = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), KIcon::Toolbar, KIcon::SizeSmall ) ); - MediaItem::s_pixDirectory = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "folder" ), KIcon::Toolbar, KIcon::SizeSmall ) ); - MediaItem::s_pixTransferBegin = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "play" ), KIcon::Toolbar, KIcon::SizeSmall ) ); - MediaItem::s_pixTransferEnd = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "stop" ), KIcon::Toolbar, KIcon::SizeSmall ) ); - MediaItem::s_pixTransferFailed = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), KIcon::Toolbar, KIcon::SizeSmall ) ); + MediaItem::s_pixArtist = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "personal" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixAlbum = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cdrom_unmount" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixInvisible = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixStale = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixOrphaned = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixDirectory = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "folder" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixTransferBegin = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "play" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixTransferEnd = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "stop" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixTransferFailed = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); setSpacing( 4 ); diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp index 8c336835..0b2fd4b1 100644 --- a/amarok/src/mediadevice/daap/daapclient.cpp +++ b/amarok/src/mediadevice/daap/daapclient.cpp @@ -472,7 +472,7 @@ DaapClient::customClicked() : KDialogBase( parent, "DaapAddHostDialog", true, i18n( "Add Computer" ) , Ok|Cancel) { m_base = new AddHostBase( this, "DaapAddHostBase" ); - m_base->m_downloadPixmap->setPixmap( TQPixmap( TDEGlobal::iconLoader()->iconPath( Amarok::icon( "download" ), -KIcon::SizeEnormous ) ) ); + m_base->m_downloadPixmap->setPixmap( TQPixmap( TDEGlobal::iconLoader()->iconPath( Amarok::icon( "download" ), -TDEIcon::SizeEnormous ) ) ); m_base->m_hostName->setFocus(); setMainWidget( m_base ); } @@ -523,7 +523,7 @@ DaapClient::passwordPrompt() setButtonOK( ok ); TQLabel* passIcon = new TQLabel( mainWidget(), "passicon" ); - passIcon->setPixmap( TQPixmap( TDEGlobal::iconLoader()->iconPath( "password", -KIcon::SizeHuge ) ) ); + passIcon->setPixmap( TQPixmap( TDEGlobal::iconLoader()->iconPath( "password", -TDEIcon::SizeHuge ) ) ); TQHBox* loginArea = new TQHBox( mainWidget(), "passhbox" ); new TQLabel( i18n( "Password:"), loginArea, "passlabel" ); m_input = new KPasswordEdit( loginArea, "passedit" ); diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp index 06fd0487..3a8227d7 100644 --- a/amarok/src/multitabbar.cpp +++ b/amarok/src/multitabbar.cpp @@ -1063,7 +1063,7 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint ) // Apply icon effect when widget disabled. Should really be cached, but *shrug*. if( !isEnabled() ) - icon = kapp->iconLoader()->iconEffect()->apply( icon, KIcon::Small, KIcon::DisabledState ); + icon = kapp->iconLoader()->iconEffect()->apply( icon, TDEIcon::Small, TDEIcon::DisabledState ); if( m_position == MultiTabBar::Left || m_position == MultiTabBar::Right ) { TQPixmap pixmap( height(), width() ); diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index 99d0b275..e425469d 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -608,7 +608,7 @@ OSDWidget::useMoodbar( void ) namespace Amarok { - TQImage icon() { return TQImage( KIconLoader().iconPath( "amarok", -KIcon::SizeHuge ) ); } + TQImage icon() { return TQImage( TDEIconLoader().iconPath( "amarok", -TDEIcon::SizeHuge ) ); } } OSDPreviewWidget::OSDPreviewWidget( TQWidget *parent ) diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index 928a0ba7..814b163f 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -857,12 +857,12 @@ NavButton::NavButton( TQWidget *parent, const TQString &icon, TDEAction *action setWFlags( TQt::WNoAutoErase ); TQPixmap pixmap( getPNG( "b_" + icon ) ); - KIconEffect ie; + TDEIconEffect ie; // Tint icon blueish for "off" state - m_pixmapOff = ie.apply( pixmap, KIconEffect::Colorize, 0.5, TQColor( 0x30, 0x10, 0xff ), false ); + m_pixmapOff = ie.apply( pixmap, TDEIconEffect::Colorize, 0.5, TQColor( 0x30, 0x10, 0xff ), false ); // Tint gray and make pseudo-transparent for "disabled" state - m_pixmapDisabled = ie.apply( pixmap, KIconEffect::ToGray, 0.7, TQColor(), true ); + m_pixmapDisabled = ie.apply( pixmap, TDEIconEffect::ToGray, 0.7, TQColor(), true ); int r = 0x20, g = 0x10, b = 0xff; float percentRed = 0.0; @@ -871,8 +871,8 @@ NavButton::NavButton( TQWidget *parent, const TQString &icon, TDEAction *action for ( int i = 0; i < NUMPIXMAPS; i++ ) { TQImage img = pixmap.convertToImage(); temp = KImageEffect::channelIntensity( img, percentRed, KImageEffect::Red ); - temp = ie.apply( temp, KIconEffect::Colorize, 1.0, TQColor( r, 0x10, 0x30 ), false ); - temp = ie.apply( temp, KIconEffect::Colorize, 1.0, TQColor( r, g, b ), false ); + temp = ie.apply( temp, TDEIconEffect::Colorize, 1.0, TQColor( r, 0x10, 0x30 ), false ); + temp = ie.apply( temp, TDEIconEffect::Colorize, 1.0, TQColor( r, g, b ), false ); // Create new pixmap on the heap and add pointer to list m_glowPixmaps.append( temp ); diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp index db690e65..f09e5593 100644 --- a/amarok/src/playlist.cpp +++ b/amarok/src/playlist.cpp @@ -1616,7 +1616,7 @@ Playlist::activate( TQListViewItem *item ) EngineController::instance()->stop(); setCurrentTrack( 0 ); Amarok::OSD::instance()->OSDWidget::show( i18n("Playlist finished"), - TQImage( KIconLoader().iconPath( "amarok", -KIcon::SizeHuge ) ) ); + TQImage( TDEIconLoader().iconPath( "amarok", -TDEIcon::SizeHuge ) ) ); return; } diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp index 5eaed3f2..adddb261 100644 --- a/amarok/src/playlistitem.cpp +++ b/amarok/src/playlistitem.cpp @@ -614,7 +614,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 ); - KIconEffect::colorize( tmpImage, glowBase, colorize ); + TDEIconEffect::colorize( tmpImage, glowBase, colorize ); imageTransparency( tmpImage, intensity ); p.drawImage( 0, 0, tmpImage, 0, 0, tmpImage.width() - 1 ); //HACK leftOffset = tmpImage.width() - 1; //HACK Subtracting 1, to work around the black line bug @@ -626,7 +626,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co if( column == Playlist::instance()->mapToLogicalColumn( Playlist::instance()->numVisibleColumns() - 1 ) ) { TQImage tmpImage = currentTrackRight.smoothScale( 1, height(), TQ_ScaleMax ); - KIconEffect::colorize( tmpImage, glowBase, colorize ); + TDEIconEffect::colorize( tmpImage, glowBase, colorize ); imageTransparency( tmpImage, intensity ); p.drawImage( width - tmpImage.width(), 0, tmpImage ); rightOffset = tmpImage.width(); @@ -636,7 +636,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co // Middle part // Here we scale the one pixel wide middel image to stretch to the full column width. TQImage tmpImage = currentTrackMid.copy(); - KIconEffect::colorize( tmpImage, glowBase, colorize ); + TDEIconEffect::colorize( tmpImage, glowBase, colorize ); imageTransparency( tmpImage, intensity ); tmpImage = tmpImage.smoothScale( width - leftOffset - rightOffset, height() ); p.drawImage( leftOffset, 0, tmpImage ); diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp index 73db24f4..beb539ba 100644 --- a/amarok/src/prettypopupmenu.cpp +++ b/amarok/src/prettypopupmenu.cpp @@ -58,7 +58,7 @@ PrettyPopupMenu::generateSidePixmap() if ( newColor != s_sidePixmapColor ) { s_sidePixmapColor = newColor; s_sidePixmap.load( locate( "data","amarok/images/menu_sidepixmap.png" ) ); - KIconEffect::colorize( s_sidePixmap, newColor, 1.0 ); + TDEIconEffect::colorize( s_sidePixmap, newColor, 1.0 ); } } diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp index e81cd9ee..c885cd35 100644 --- a/amarok/src/sliderwidget.cpp +++ b/amarok/src/sliderwidget.cpp @@ -390,7 +390,7 @@ void Amarok::VolumeSlider::generateGradient() { //TQImage temp( locate( "data","amarok/images/volumeslider-gradient.png" ) ); - //KIconEffect::colorize( temp, colorGroup().highlight(), 1.0 ); + //TDEIconEffect::colorize( temp, colorGroup().highlight(), 1.0 ); const TQPixmap temp( locate( "data","amarok/images/volumeslider-gradient.png" ) ); const TQBitmap mask( temp.createHeuristicMask() ); diff --git a/amarok/src/starmanager.cpp b/amarok/src/starmanager.cpp index 9070dd23..d759ead4 100644 --- a/amarok/src/starmanager.cpp +++ b/amarok/src/starmanager.cpp @@ -67,14 +67,14 @@ StarManager::reinitStars( int height, int margin ) m_starPix.convertFromImage( star ); m_fullStarPix.convertFromImage( fullStar ); m_greyedStar = star.copy(); - KIconEffect::toGray( m_greyedStar, 1.0 ); + 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 fullHalf = TQImage( locate( "data", "amarok/images/smallstar.png" ) ); m_halfStar = half.copy(); m_fullHalfStar = fullHalf.copy(); if( AmarokConfig::customRatingsColors() ) - KIconEffect::colorize( m_halfStar, m_halfStarColor, 1.0 ); + TDEIconEffect::colorize( m_halfStar, m_halfStarColor, 1.0 ); m_halfStarPix.convertFromImage( m_halfStar ); m_fullHalfStarPix.convertFromImage( m_fullHalfStar ); @@ -86,9 +86,9 @@ StarManager::reinitStars( int height, int margin ) temphalfstar = half.copy(); if( AmarokConfig::customRatingsColors() ) { - KIconEffect::colorize( tempstar, m_colors[i], 1.0 ); + TDEIconEffect::colorize( tempstar, m_colors[i], 1.0 ); if( !AmarokConfig::fixedHalfStarColor() ) - KIconEffect::colorize( temphalfstar, m_colors[i], 1.0 ); + TDEIconEffect::colorize( temphalfstar, m_colors[i], 1.0 ); } m_images[i] = tempstar.copy(); m_halfimages[i] = temphalfstar.copy(); diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp index cb008f35..ab9c5035 100644 --- a/amarok/src/statistics.cpp +++ b/amarok/src/statistics.cpp @@ -700,8 +700,8 @@ StatisticsItem::StatisticsItem( TQString text, StatisticsList *parent, TDEListVi void StatisticsItem::setIcon( const TQString &icon ) { - TQString path = kapp->iconLoader()->iconPath( icon, -KIcon::SizeHuge ); - path.replace( "32x32", "48x48" ); //HACK: KIconLoader only returns 32x32 max. Why? + TQString path = kapp->iconLoader()->iconPath( icon, -TDEIcon::SizeHuge ); + path.replace( "32x32", "48x48" ); //HACK: TDEIconLoader only returns 32x32 max. Why? // debug() << "ICONPATH: " << path << endl; diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp index e8f3c57b..448ba654 100644 --- a/amarok/src/statusbar/queueLabel.cpp +++ b/amarok/src/statusbar/queueLabel.cpp @@ -75,7 +75,7 @@ void QueueLabel::getCover( const TQString &artist, const TQString &album ) { m_cover = CollectionDB::instance()->albumImage( artist, album, 50 ); if( m_cover == CollectionDB::instance()->notAvailCover( 50 ) ) - m_cover = TDEGlobal::iconLoader()->iconPath( "goto", -KIcon::SizeHuge ); + m_cover = TDEGlobal::iconLoader()->iconPath( "goto", -TDEIcon::SizeHuge ); } void QueueLabel::setNum( int num ) diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h index d30c8df5..a1aa338a 100644 --- a/amarok/src/statusbar/selectLabel.h +++ b/amarok/src/statusbar/selectLabel.h @@ -147,7 +147,7 @@ class SelectLabel : public TQLabel m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); m_tooltip->setText( tip ); const TQPixmap pix = TDEGlobal::iconLoader() - ->loadIconSet( m_action->currentIcon(), KIcon::Toolbar, KIcon::SizeHuge ) + ->loadIconSet( m_action->currentIcon(), TDEIcon::Toolbar, TDEIcon::SizeHuge ) .pixmap( TQIconSet::Large, m_action->isEnabled() ? TQIconSet::Normal : TQIconSet::Disabled ); diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp index b57bbcb1..ebd0503d 100644 --- a/amarok/src/statusbar/statusBarBase.cpp +++ b/amarok/src/statusbar/statusBarBase.cpp @@ -297,16 +297,16 @@ StatusBar::longMessage( const TQString &text, int type ) { case Information: case Question: - image = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -KIcon::SizeHuge ); + image = TDEGlobal::iconLoader()->iconPath( "messagebox_info", -TDEIcon::SizeHuge ); break; case Sorry: case Warning: - image = TDEGlobal::iconLoader()->iconPath( "messagebox_warning", -KIcon::SizeHuge ); + image = TDEGlobal::iconLoader()->iconPath( "messagebox_warning", -TDEIcon::SizeHuge ); break; case Error: - image = TDEGlobal::iconLoader()->iconPath( "messagebox_critical", -KIcon::SizeHuge ); + image = TDEGlobal::iconLoader()->iconPath( "messagebox_critical", -TDEIcon::SizeHuge ); // don't hide error messages. // message->setTimeout( 0 ); break; diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h index 4417a790..3730a1aa 100644 --- a/amarok/src/statusbar/toggleLabel.h +++ b/amarok/src/statusbar/toggleLabel.h @@ -116,7 +116,7 @@ class ToggleLabel : public TQLabel tip += i18n(" 
 Disabled"); tip += " "; - const TQString path = TDEGlobal::iconLoader()->iconPath( m_action->icon(), -KIcon::SizeHuge ); + const TQString path = TDEGlobal::iconLoader()->iconPath( m_action->icon(), -TDEIcon::SizeHuge ); m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), parentWidget(), 0 /*timeout*/ ); diff --git a/amarok/src/systray.cpp b/amarok/src/systray.cpp index 026f0e5e..854b6fc9 100644 --- a/amarok/src/systray.cpp +++ b/amarok/src/systray.cpp @@ -198,7 +198,7 @@ Amarok::TrayIcon::paintIcon( int mergePixels, bool force ) if ( grayedIcon.isNull() ) { TQImage tmpTrayIcon = baseIcon.convertToImage(); - KIconEffect::semiTransparent( tmpTrayIcon ); + TDEIconEffect::semiTransparent( tmpTrayIcon ); grayedIcon = tmpTrayIcon; } @@ -213,7 +213,7 @@ Amarok::TrayIcon::paintIcon( int mergePixels, bool force ) int hue, sat, value; saturatedColor.getHsv( &hue, &sat, &value ); saturatedColor.setHsv( hue, sat > 200 ? 200 : sat, value < 100 ? 100 : value ); - KIconEffect::colorize( tmpTrayIcon, saturatedColor/* TQt::blue */, 0.9 ); + TDEIconEffect::colorize( tmpTrayIcon, saturatedColor/* TQt::blue */, 0.9 ); alternateIcon = tmpTrayIcon; } @@ -255,7 +255,7 @@ Amarok::TrayIcon::blendOverlay( TQPixmap &sourcePixmap ) // blend the overlay image over the cropped rectangle TQImage blendedImage = sourceCropped.convertToImage(); TQImage overlayImage = overlay->convertToImage(); - KIconEffect::overlay( blendedImage, overlayImage ); + TDEIconEffect::overlay( blendedImage, overlayImage ); sourceCropped.convertFromImage( blendedImage ); // put back the blended rectangle to the original image