From de9b6c9ad15f9f51812daae17cce635d1050a9ba Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:14:55 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kicker/extensions/kasbar/ChangeLog | 2 +- kicker/extensions/kasbar/kasaboutdlg.cpp | 4 ++-- kicker/extensions/kasbar/kasbar.cpp | 2 +- kicker/extensions/kasbar/kasgroupitem.cpp | 16 ++++++++-------- kicker/extensions/kasbar/kasprefsdlg.cpp | 4 ++-- kicker/extensions/kasbar/kasstartupitem.cpp | 24 ++++++++++++------------ kicker/extensions/kasbar/kastaskitem.cpp | 14 +++++++------- 7 files changed, 33 insertions(+), 33 deletions(-) (limited to 'kicker/extensions') diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index cdc356180..36aba0a73 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/kicker/extensions/kasbar/ChangeLog @@ -786,7 +786,7 @@ * Moved the icon handling code out of Kasbar and into the Task class. Task now provides an API for icon loading that allows - access to different icon sizes and uses KIconLoader where needed. + access to different icon sizes and uses TDEIconLoader where needed. 2001-05-15 Tuesday 01:19 rich diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index 4d51d92ef..d5f53e2f1 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -80,8 +80,8 @@ #include "kasaboutdlg.h" #include "version.h" -#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) -#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) +#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium ) +#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeLarge ) KasAboutDialog::KasAboutDialog( TQWidget *parent ) : KDialogBase( KDialogBase::IconList, i18n("About Kasbar"), diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 430d98c84..49e7ed15e 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -717,7 +717,7 @@ void KasBar::addTestItems() KasItem *i = new KasItem( this ); insert( 0, i ); i->setText( "Animated" ); - i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) ); + i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); i->setAnimation( resources()->startupAnimation() ); TQTimer *aniTimer = new TQTimer( i, "aniTimer" ); connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) ); diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index 3c73e21f0..6fa500cda 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -145,19 +145,19 @@ void KasGroupItem::updateIcon() Task::Ptr t = items.first(); if (!t) p = TDEGlobal::iconLoader()->loadIcon( "kicker", - KIcon::NoGroup, - KIcon::SizeSmall ); + TDEIcon::NoGroup, + TDEIcon::SizeSmall ); - int sizes[] = { KIcon::SizeEnormous, - KIcon::SizeHuge, - KIcon::SizeLarge, - KIcon::SizeMedium, - KIcon::SizeSmall }; + int sizes[] = { TDEIcon::SizeEnormous, + TDEIcon::SizeHuge, + TDEIcon::SizeLarge, + TDEIcon::SizeMedium, + TDEIcon::SizeSmall }; p = t->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader ); if ( p.isNull() ) - p = TDEGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall ); + p = TDEGlobal::iconLoader()->loadIcon( "error", TDEIcon::NoGroup, TDEIcon::SizeSmall ); setIcon( p ); } diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index c3f34c0ac..9a5e75ddc 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -75,8 +75,8 @@ #include "kasprefsdlg.h" #include "kasprefsdlg.moc" -#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) -#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge ) +#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium ) +#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeLarge ) KasPrefsDialog::KasPrefsDialog( KasTasker *kas, TQWidget *parent ) diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 6011612e3..67cdd1687 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -99,34 +99,34 @@ TQPixmap KasStartupItem::icon() const case KasBar::Small: /* ***** NOP ****** pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), - KIcon::NoGroup, - KIcon::SizeSmall ); + TDEIcon::NoGroup, + TDEIcon::SizeSmall ); */ break; case KasBar::Medium: pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), - KIcon::NoGroup, - KIcon::SizeMedium ); + TDEIcon::NoGroup, + TDEIcon::SizeMedium ); break; case KasBar::Large: pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), - KIcon::NoGroup, - KIcon::SizeLarge ); + TDEIcon::NoGroup, + TDEIcon::SizeLarge ); break; case KasBar::Huge: pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), - KIcon::NoGroup, - KIcon::SizeHuge ); + TDEIcon::NoGroup, + TDEIcon::SizeHuge ); break; case KasBar::Enormous: pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(), - KIcon::NoGroup, - KIcon::SizeEnormous ); + TDEIcon::NoGroup, + TDEIcon::SizeEnormous ); break; default: pixmap = TDEGlobal::iconLoader()->loadIcon( "error", - KIcon::NoGroup, - KIcon::SizeSmall ); + TDEIcon::NoGroup, + TDEIcon::SizeSmall ); } return pixmap; diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index fc2bea8bb..86d424f60 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -85,7 +85,7 @@ #include "kastaskitem.h" #include "kasbarextension.h" -#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium ) +#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium ) static const int CHECK_ATTENTION_DELAY = 2000; @@ -124,11 +124,11 @@ KasTasker *KasTaskItem::kasbar() const TQPixmap KasTaskItem::icon() { - int sizes[] = { KIcon::SizeEnormous, - KIcon::SizeHuge, - KIcon::SizeLarge, - KIcon::SizeMedium, - KIcon::SizeSmall }; + int sizes[] = { TDEIcon::SizeEnormous, + TDEIcon::SizeHuge, + TDEIcon::SizeLarge, + TDEIcon::SizeMedium, + TDEIcon::SizeSmall }; if ( kasbar()->embedThumbnails() && task_->hasThumbnail() ) { usedIconLoader = true; @@ -194,7 +194,7 @@ void KasTaskItem::paint( TQPainter *p ) // // Overlay the small icon if the icon has changed, we have space, - // and we are using a KIconLoader icon rather than one from the NET props. + // and we are using a TDEIconLoader icon rather than one from the NET props. // This only exists because we are almost always using the icon loader for // large icons. // -- cgit v1.2.1