Rename KIcon to enhance compatibility with KDE4

31 files changed, 151 insertions, 151 deletions

diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 2c4083443..5cfd3a308 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -370,7 +370,7 @@ void DigitalClock::loadSettings()
     setSegmentStyle(TQLCDNumber::Flat);
 
     if (_prefs->digitalLCDStyle())
-        lcdPattern = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User);
+        lcdPattern = TDEIconLoader("clockapplet").loadIcon("lcd", TDEIcon::User);
 
     setNumDigits(_prefs->digitalShowSeconds() ? 8:5);
 
@@ -477,14 +477,14 @@ void AnalogClock::initBackgroundPixmap()
     //if no antialiasing, use pixmap as-is
     if (_prefs->analogAntialias() == 0)
     {
-      lcdPattern = KIconLoader("clockapplet").loadIcon("lcd",KIcon::User);
+      lcdPattern = TDEIconLoader("clockapplet").loadIcon("lcd",TDEIcon::User);
       _bgScale = 1;
     }
     else
     {
         //make a scaled pixmap -- so when image is reduced it'll look "OK".
         _bgScale = _prefs->analogAntialias()+1;
-        TQImage bgImage = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User).convertToImage();
+        TQImage bgImage = TDEIconLoader("clockapplet").loadIcon("lcd", TDEIcon::User).convertToImage();
         lcdPattern = TQPixmap(bgImage.scale(bgImage.width() * _bgScale,
                              bgImage.height() * _bgScale));
 
@@ -1780,7 +1780,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
         TZoffset = zone->calc_TZ_offset(activeZone);
     }
 
-    data.icon = DesktopIcon("date", KIcon::SizeMedium);
+    data.icon = DesktopIcon("date", TDEIcon::SizeMedium);
     data.direction = popupDirection();
     data.duration = 4000;
 }
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 199a7b750..eb5a3b2de 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -126,7 +126,7 @@ void QuickURL::run() const
 }
 
 //similar to MimeType::pixmapForURL
-TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group,
+TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group,
                           int _force_size, int _state, TQString *) const
 {
    TQPixmap pxmap;
@@ -206,8 +206,8 @@ void QuickButton::loadIcon()
     // Set Icon Dimension from size
    _iconDim=std::min(size().width(),size().height())-2*ICON_MARGIN;
    // Load icons
-   _icon = _qurl->pixmap(0, KIcon::Panel, _iconDim, KIcon::DefaultState);
-   _iconh = _qurl->pixmap(0, KIcon::Panel, _iconDim, KIcon::ActiveState);
+   _icon = _qurl->pixmap(0, TDEIcon::Panel, _iconDim, TDEIcon::DefaultState);
+   _iconh = _qurl->pixmap(0, TDEIcon::Panel, _iconDim, TDEIcon::ActiveState);
    setPixmap(_icon);
 }
 
@@ -262,7 +262,7 @@ void QuickButton::launch()
    if (!KickerSettings::showDeepButtons()) {
        setDown(false);
        update();
-       KIconEffect::visualActivate(this, rect());
+       TDEIconEffect::visualActivate(this, rect());
    }
    if (_qurl->kurl().url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
        if (isOn()) {
@@ -344,10 +344,10 @@ void QuickButton::updateKickerTip(KickerTip::Data &data)
         data.subtext = data.message;
     }
     if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
-        data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
+        data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", TDEIcon::Panel, TDEIcon::SizeHuge, TDEIcon::DefaultState);
     }
     else {
-        data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
+        data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, TDEIcon::Panel, TDEIcon::SizeHuge, TDEIcon::DefaultState);
     }
 }
 
diff --git a/kicker/applets/launcher/quickbutton.h b/kicker/applets/launcher/quickbutton.h
index 4629093cc..ea5ed21aa 100644
--- a/kicker/applets/launcher/quickbutton.h
+++ b/kicker/applets/launcher/quickbutton.h
@@ -53,7 +53,7 @@ public:
     TQString name() const { return m_name; }
     KService::Ptr service() const {return _service;};
     void run() const;
-    TQPixmap pixmap(mode_t _mode = 0, KIcon::Group _group = KIcon::Desktop,
+    TQPixmap pixmap(mode_t _mode = 0, TDEIcon::Group _group = TDEIcon::Desktop,
                    int _force_size = 0, int _state = 0, TQString * _path = 0L) const;
 
 private:
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index eb1ba784c..3e51a199e 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -829,7 +829,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
     }
 
     data.duration = 4000;
-    data.icon = DesktopIcon("window_list", KIcon::SizeMedium);
+    data.icon = DesktopIcon("window_list", TDEIcon::SizeMedium);
     data.message = TQStyleSheet::escape(m_desktopName);
     data.direction = m_pager->popupDirection();
 }
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.
     //
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index fa4af2ea6..d302034de 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -979,7 +979,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         saveContainerConfig(true);
 
         PanelDrag *dd = new PanelDrag(_moveAC, this);
-        dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), KIcon::Small));
+        dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small));
         grabKeyboard();
         dd->drag();
         releaseKeyboard();
@@ -1334,13 +1334,13 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
             {
                 // non-TDE executable
                 TQString pixmapFile;
-                KMimeType::pixmapForURL(url, 0, KIcon::Panel, 0,
-                                        KIcon::DefaultState, &pixmapFile);
+                KMimeType::pixmapForURL(url, 0, TDEIcon::Panel, 0,
+                                        TDEIcon::DefaultState, &pixmapFile);
                 PanelExeDialog dlg(TQString::null, TQString::null, url.path(),
                                    pixmapFile, TQString::null, false, 0);
                 if (dlg.exec() == TQDialog::Accepted)
                 {
-                    // KIconloader returns a full path, we only want the name
+                    // TDEIconloader returns a full path, we only want the name
                     TQFileInfo iconfi(dlg.iconPath());
                     a = new NonKDEAppButtonContainer(dlg.title(),
                                                      dlg.description(),
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index 75e4df12f..9c1d718c9 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -74,8 +74,8 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
 
     itemDescription->installEventFilter(this);
 
-    KIconLoader * ldr = TDEGlobal::iconLoader();
-    TQPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge);
+    TDEIconLoader * ldr = TDEGlobal::iconLoader();
+    TQPixmap icon = ldr->loadIcon(info.icon(), TDEIcon::Panel, TDEIcon::SizeLarge);
     itemPixmap->setPixmap(icon);
     itemPixmap->installEventFilter(this);
 }
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index 86c5e386e..ca5958ad9 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -100,8 +100,8 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
         }
 
         TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon,
-                                                     KIcon::Small, 0,
-                                                     KIcon::DefaultState,
+                                                     TDEIcon::Small, 0,
+                                                     TDEIcon::DefaultState,
                                                      0, true));
         insertItem(iconPix, i18n("&About %1").arg( titleText ), About);
         needSeparator = !(actions & KPanelApplet::Help);
diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp
index 3ebe095dc..66b8aa475 100644
--- a/kicker/kicker/ui/browser_dlg.cpp
+++ b/kicker/kicker/ui/browser_dlg.cpp
@@ -46,9 +46,9 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic
     hbox2->setSpacing( KDialog::spacingHint() );
     TQLabel *label1 = new TQLabel( i18n( "Button icon:" ), hbox2 );
 
-    iconBtn = new KIconButton( hbox2 );
+    iconBtn = new TDEIconButton( hbox2 );
     iconBtn->setFixedSize( 50, 50 );
-    iconBtn->setIconType( KIcon::Panel, KIcon::Place );
+    iconBtn->setIconType( TDEIcon::Panel, TDEIcon::Place );
     label1->setBuddy( iconBtn );
 
     TQHBox *hbox1 = new TQHBox( page );
diff --git a/kicker/kicker/ui/browser_dlg.h b/kicker/kicker/ui/browser_dlg.h
index 113a7b83a..d1b3b623d 100644
--- a/kicker/kicker/ui/browser_dlg.h
+++ b/kicker/kicker/ui/browser_dlg.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kdialogbase.h>
 
-class KIconButton;
+class TDEIconButton;
 class KLineEdit;
 
 class PanelBrowserDialog : public KDialogBase
@@ -45,7 +45,7 @@ protected slots:
     virtual void slotOk();
     void slotPathChanged( const TQString &_text );
 protected:
-    KIconButton *iconBtn;
+    TDEIconButton *iconBtn;
     KLineEdit *pathInput;
     TQPushButton *browseBtn;
 };
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index 9aa352500..5ab73edb3 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -197,8 +197,8 @@ void PanelBrowserMenu::initialize()
                     iconPath = path + '/' + iconPath.mid(2);
 
                 icon = TDEGlobal::iconLoader()->loadIcon(iconPath,
-                                                       KIcon::Small, KIcon::SizeSmall,
-                                                       KIcon::DefaultState, 0, true);
+                                                       TDEIcon::Small, TDEIcon::SizeSmall,
+                                                       TDEIcon::DefaultState, 0, true);
                 if(icon.isNull())
                     icon = CICON("folder");
                 name = c.readEntry("Name", name);
@@ -245,8 +245,8 @@ void PanelBrowserMenu::initialize()
 
                 TQString s = c.readEntry("Icon");
                 if(!_icons->contains(s)) {
-                    icon  = TDEGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
-                                                            KIcon::DefaultState, 0, true);
+                    icon  = TDEGlobal::iconLoader()->loadIcon(s, TDEIcon::Small, TDEIcon::SizeSmall,
+                                                            TDEIcon::DefaultState, 0, true);
 
                     if(icon.isNull()) {
                         TQString type = c.readEntry("Type", "Application");
diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index fcdc76176..0f77862f0 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -64,7 +64,7 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio
     ui->m_exec->setURL(path);
     ui->m_commandLine->setText(cmd);
     ui->m_inTerm->setChecked(inTerm);
-    ui->m_icon->setIconType(KIcon::Panel, KIcon::Application);
+    ui->m_icon->setIconType(TDEIcon::Panel, TDEIcon::Application);
 
     updateIcon();
 
@@ -168,7 +168,7 @@ void PanelExeDialog::slotTextChanged(const TQString &str)
 
     if (it != m_partialPath2full.end())
         exeLocation = it.data();
-    KMimeType::pixmapForURL(KURL( exeLocation ), 0, KIcon::Panel, 0, KIcon::DefaultState, &m_icon);
+    KMimeType::pixmapForURL(KURL( exeLocation ), 0, TDEIcon::Panel, 0, TDEIcon::DefaultState, &m_icon);
     updateIcon();
 }
 
@@ -196,7 +196,7 @@ void PanelExeDialog::slotSelect(const TQString& exec)
         return;
     }
 
-    KMimeType::pixmapForURL(KURL( exec ), 0, KIcon::Panel, 0, KIcon::DefaultState, &m_icon);
+    KMimeType::pixmapForURL(KURL( exec ), 0, TDEIcon::Panel, 0, TDEIcon::DefaultState, &m_icon);
     updateIcon();
 }
 
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 0054fbb60..29b617e3f 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -140,10 +140,10 @@ void HideButton::generateIcons()
     TQImage image = pixmap()->convertToImage();
     image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin);
 
-    KIconEffect effect;
+    TDEIconEffect effect;
 
-    m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState);
-    m_activeIcon = effect.apply(image, KIcon::Panel, KIcon::ActiveState);
+    m_normalIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DefaultState);
+    m_activeIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::ActiveState);
 }
 
 void HideButton::slotSettingsChanged(int category)
@@ -167,7 +167,7 @@ void HideButton::slotSettingsChanged(int category)
 
 void HideButton::slotIconChanged(int group)
 {
-    if (group != KIcon::Panel)
+    if (group != TDEIcon::Panel)
     {
         return;
     }
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index abe5370a6..a1616f79f 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -139,7 +139,7 @@ void KMenuItem::setDescription(const TQString& txt)
 void KMenuItem::setIcon(const TQString& icon, int size)
 {
     m_icon = icon;
-    TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size ));
+    TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::Panel, size ));
 }
 
 void KMenuItem::setHasChildren( bool flag )
@@ -1013,8 +1013,8 @@ TQDragObject * ItemView::dragObject()
         return 0;
 
       o = new KMultipleDrag(viewport());
-      TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize);
-      TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", KIcon::Small );
+      TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), TDEIcon::Panel, m_iconSize);
+      TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", TDEIcon::Small );
 
       TQPainter p( &pix );
       p.drawPixmap(pix.height()-add.height(), pix.width()-add.width(), add);
diff --git a/kicker/kicker/ui/nonKDEButtonSettings.ui b/kicker/kicker/ui/nonKDEButtonSettings.ui
index 187dd7cb5..cbd85b4d0 100644
--- a/kicker/kicker/ui/nonKDEButtonSettings.ui
+++ b/kicker/kicker/ui/nonKDEButtonSettings.ui
@@ -128,7 +128,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="KIconButton" row="0" column="0" rowspan="3" colspan="1">
+        <widget class="TDEIconButton" row="0" column="0" rowspan="3" colspan="1">
             <property name="name">
                 <cstring>m_icon</cstring>
             </property>
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index baea6a54b..c6e6639e9 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -783,7 +783,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
 
         case KST_KService:
         {
-            icon = static_cast<KService *>(e)->pixmap(KIcon::Small);
+            icon = static_cast<KService *>(e)->pixmap(TDEIcon::Small);
             TQString filePath = static_cast<KService *>(e)->desktopEntryPath();
             if (filePath[0] != '/')
             {
@@ -796,7 +796,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
         case KST_KServiceGroup:
         {
             icon = TDEGlobal::iconLoader()
-                   ->loadIcon(static_cast<KServiceGroup *>(e)->icon(), KIcon::Small);
+                   ->loadIcon(static_cast<KServiceGroup *>(e)->icon(), TDEIcon::Small);
             url = "programs:/" + static_cast<KServiceGroup *>(e)->relPath();
             break;
         }
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 87f990b30..62f7f055a 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -159,11 +159,11 @@ int sizeValue(KPanelExtension::Size s)
 int maxButtonDim()
 {
     int maxDim;
-    //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge;
+    //return (2 * KickerSettings::iconMargin()) + TDEIcon::SizeLarge;
 
     KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
     kickerconfig->setGroup("General");
-    maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);;
+    maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);;
     delete kickerconfig;
     return maxDim;
 }
@@ -358,7 +358,7 @@ void colorize(TQImage& image)
         b = (b + (76 - gray) > 255 ? 255 : b + (76 - gray));
     }
     color.setRgb(r, g, b);
-    KIconEffect::colorize(image, color, 1.0);
+    TDEIconEffect::colorize(image, color, 1.0);
 }
 
 TQColor blendColors(const TQColor& c1, const TQColor& c2)
@@ -415,22 +415,22 @@ TQIconSet menuIconSet(const TQString& icon)
         if (iconSize > 0)
         {
             iconset = TDEGlobal::iconLoader()->loadIconSet(icon,
-                                                     KIcon::NoGroup,
+                                                     TDEIcon::NoGroup,
                                                      iconSize, true);
         }
         else if (iconSize == 0)
         {
             TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(icon,
-                                                         KIcon::Small,
+                                                         TDEIcon::Small,
                                                          0,
-                                                         KIcon::DefaultState,
+                                                         TDEIcon::DefaultState,
                                                          0,
                                                          true);
 
             TQPixmap active = TDEGlobal::iconLoader()->loadIcon(icon,
-                                                         KIcon::Small,
+                                                         TDEIcon::Small,
                                                          0,
-                                                         KIcon::ActiveState,
+                                                         TDEIcon::ActiveState,
                                                          0,
                                                          true);
 
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 1f011da5a..c1bd517d8 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -74,7 +74,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
       m_popupDirection(KPanelApplet::Up),
       m_iconAlignment(AlignCenter),
       m_orientation(Qt::Horizontal),
-      m_size((KIcon::StdSizes)-1),
+      m_size((TDEIcon::StdSizes)-1),
       m_fontPercent(0.40),
       m_forceStandardCursor(forceStandardCursor)
 {
@@ -208,7 +208,7 @@ void PanelButton::setOrientation(Orientation o)
 
 void PanelButton::updateIcon(int group)
 {
-    if (group != KIcon::Panel)
+    if (group != TDEIcon::Panel)
     {
         return;
     }
@@ -516,7 +516,7 @@ void PanelButton::mouseReleaseEvent(TQMouseEvent *e)
 	
 	TQPixmap pix = labelIcon();
 	if (KickerSettings::showIconActivationEffect() == true) {
-		KIconEffect::visualActivate(this, this->geometry(), &pix);
+		TDEIconEffect::visualActivate(this, this->geometry(), &pix);
 	}
     }
     TQButton::mouseReleaseEvent(e);
@@ -781,16 +781,16 @@ int PanelButton::preferredIconSize(int proposed_size) const
 {
     // (re)calculates the icon sizes and report true if they have changed.
     // Get sizes from icontheme. We assume they are sorted.
-    KIconTheme *ith = TDEGlobal::iconLoader()->theme();
+    TDEIconTheme *ith = TDEGlobal::iconLoader()->theme();
 
     if (!ith)
     {
         return -1; // unknown icon size
     }
 
-    TQValueList<int> sizes = ith->querySizes(KIcon::Panel);
+    TQValueList<int> sizes = ith->querySizes(TDEIcon::Panel);
 
-    int sz = ith->defaultSize(KIcon::Panel);
+    int sz = ith->defaultSize(TDEIcon::Panel);
 
     if (proposed_size < 0)
     {
@@ -878,10 +878,10 @@ void PanelButton::loadTiles()
 
 void PanelButton::loadIcons()
 {
-    KIconLoader * ldr = TDEGlobal::iconLoader();
+    TDEIconLoader * ldr = TDEGlobal::iconLoader();
     TQString nm = m_iconName;
-    KIcon::States defaultState = isEnabled() ? KIcon::DefaultState :
-                                               KIcon::DisabledState;
+    TDEIcon::States defaultState = isEnabled() ? TDEIcon::DefaultState :
+                                               TDEIcon::DisabledState;
     if (nm=="kmenu-suse")
     {
         TQString pth = locate( "data", "kicker/data/kickoff/kmenu_basic.png" );
@@ -894,12 +894,12 @@ void PanelButton::loadIcons()
         }
     }
     else
-        m_icon = ldr->loadIcon(nm, KIcon::Panel, m_size, defaultState, 0L, true);
+        m_icon = ldr->loadIcon(nm, TDEIcon::Panel, m_size, defaultState, 0L, true);
 
     if (m_icon.isNull())
     {
         nm = defaultIcon();
-        m_icon = ldr->loadIcon(nm, KIcon::Panel, m_size, defaultState);
+        m_icon = ldr->loadIcon(nm, TDEIcon::Panel, m_size, defaultState);
     }
 
     if (!isEnabled())
@@ -908,11 +908,11 @@ void PanelButton::loadIcons()
     }
     else
     {
-        m_iconh = ldr->loadIcon(nm, KIcon::Panel, m_size,
-                                KIcon::ActiveState, 0L, true);
+        m_iconh = ldr->loadIcon(nm, TDEIcon::Panel, m_size,
+                                TDEIcon::ActiveState, 0L, true);
     }
 
-    m_iconz = ldr->loadIcon(nm, KIcon::Panel, KIcon::SizeHuge,
+    m_iconz = ldr->loadIcon(nm, TDEIcon::Panel, TDEIcon::SizeHuge,
                             defaultState, 0L, true );
 }
 
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 87fd17200..a046ca266 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -154,11 +154,11 @@ void SimpleButton::generateIcons()
     }
 
     TQImage image = pixmap()->convertToImage();
-    KIconEffect effect;
+    TDEIconEffect effect;
 
-    m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState);
-    m_activeIcon = effect.apply(image, KIcon::Panel, KIcon::ActiveState);
-    m_disabledIcon = effect.apply(image, KIcon::Panel, KIcon::DisabledState);
+    m_normalIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DefaultState);
+    m_activeIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::ActiveState);
+    m_disabledIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DisabledState);
     
     updateGeometry();
 }
@@ -188,7 +188,7 @@ void SimpleButton::slotSettingsChanged(int category)
 
 void SimpleButton::slotIconChanged( int group )
 {
-    if (group != KIcon::Panel)
+    if (group != TDEIcon::Panel)
     {
         return;
     }
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 03e53682b..977fe87ce 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -170,7 +170,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
     {
         case KST_KService:
         {
-            icon = static_cast<KService *>(e)->pixmap(KIcon::Small);
+            icon = static_cast<KService *>(e)->pixmap(TDEIcon::Small);
             TQString filePath = static_cast<KService *>(e)->desktopEntryPath();
             if (filePath[0] != '/')
             {
@@ -183,7 +183,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
         case KST_KServiceGroup:
         {
             icon = TDEGlobal::iconLoader()->loadIcon(static_cast<KServiceGroup*>(e)->icon(),
-                                                   KIcon::Small);
+                                                   TDEIcon::Small);
             url = "programs:/" + static_cast<KServiceGroup*>(e)->relPath();
             break;
         }
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index 4ff5c8c32..0e8dfd333 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -97,10 +97,10 @@ class runMenuWidget : public TQWidget, public QMenuItem
             TQHBoxLayout* runLayout = new TQHBoxLayout(this);
             textRect = fontMetrics().boundingRect(i18n("Run:"));
             runLayout->setSpacing(KDialog::spacingHint());
-            runLayout->addSpacing((KDialog::spacingHint() * 3) + KIcon::SizeMedium + textRect.width());
-            icon = DesktopIcon("run", KIcon::SizeMedium);
+            runLayout->addSpacing((KDialog::spacingHint() * 3) + TDEIcon::SizeMedium + textRect.width());
+            icon = DesktopIcon("run", TDEIcon::SizeMedium);
             /*TQLabel* l1 = new TQLabel(this);
-            TQPixmap foo = DesktopIcon("run", KIcon::SizeMedium);
+            TQPixmap foo = DesktopIcon("run", TDEIcon::SizeMedium);
             cout << "foo is: " << foo.width() << " by " << foo.height() << endl;
             l1->setPixmap(foo);
             runLayout->addWidget(l1);*/
@@ -133,7 +133,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
                 //m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
             }
 
-            setMinimumHeight(KIcon::SizeMedium + 2);
+            setMinimumHeight(TDEIcon::SizeMedium + 2);
         }
         ~runMenuWidget() {}
 
@@ -144,9 +144,9 @@ class runMenuWidget : public TQWidget, public QMenuItem
             TQRect r(rect());
             // ew, nasty hack. may result in coredumps due to horrid C-style cast???
             kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
-                                      TQStyleOption(static_cast<TQMenuItem*>(this), 0, KIcon::SizeMedium ));
+                                      TQStyleOption(static_cast<TQMenuItem*>(this), 0, TDEIcon::SizeMedium ));
             p.drawPixmap(KDialog::spacingHint(), 1, icon);
-            p.drawText((KDialog::spacingHint() * 2) + KIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:"));
+            p.drawText((KDialog::spacingHint() * 2) + TDEIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:"));
         }
 
         void focusInEvent (TQFocusEvent* e)
@@ -238,7 +238,7 @@ void TOM::initializeRecentDocs()
          */
 
         KDesktopFile f(*it, true /* read only */);
-        m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), KIcon::SizeMedium),
+        m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), TDEIcon::SizeMedium),
                                      f.readName().replace('&', "&&"), id);
         ++id;
     }
@@ -274,7 +274,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
 
         if (icon != TQString::null)
         {
-            insertItem(DesktopIcon(icon, KIcon::SizeMedium), name, taskGroup);
+            insertItem(DesktopIcon(icon, TDEIcon::SizeMedium), name, taskGroup);
         }
         else
         {
@@ -459,7 +459,7 @@ void TOM::initialize()
 
     PanelServiceMenu* moreApps = new PanelServiceMenu(TQString::null, TQString::null, this, "More Applications");
     moreApps->setFont(m_largerFont);
-    insertItem(DesktopIcon("misc", KIcon::SizeMedium), i18n("More Applications"), moreApps);
+    insertItem(DesktopIcon("misc", TDEIcon::SizeMedium), i18n("More Applications"), moreApps);
     m_submenus.append(moreApps);
 
     if (!m_isImmutable)
@@ -486,7 +486,7 @@ void TOM::initialize()
     }
     else if (kapp->authorize("run_command"))
     {
-        insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
+        insertItem(DesktopIcon("run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
     }
 
     // RECENTLY USED ITEMS
@@ -496,7 +496,7 @@ void TOM::initialize()
     m_recentDocsMenu->setFont(m_largerFont);
     connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs()));
     connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int)));
-    insertItem(DesktopIcon("document", KIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu);
+    insertItem(DesktopIcon("document", TDEIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu);
     m_submenus.append(m_recentDocsMenu);
 
     TDEPopupMenu* recentApps = new TDEPopupMenu(this, "recentApps");
@@ -512,7 +512,7 @@ void TOM::initialize()
     // if we have no destinations, put the run command here
     if (numDests == 0 && kapp->authorize("run_command"))
     {
-        insertItem(DesktopIcon("run", KIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
+        insertItem(DesktopIcon("run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
     }
 
 
@@ -533,7 +533,7 @@ void TOM::initialize()
             if (menu)
             {
                 ++m_maxIndex;
-                insertItem(DesktopIcon(info.icon(), KIcon::SizeMedium), info.name(), menu, m_maxIndex);
+                insertItem(DesktopIcon(info.icon(), TDEIcon::SizeMedium), info.name(), menu, m_maxIndex);
                 m_submenus.append(menu);
                 needSeparator = true;
             }
@@ -563,7 +563,7 @@ void TOM::initialize()
         }
     }
 
-    insertItem(DesktopIcon("exit", KIcon::SizeMedium),
+    insertItem(DesktopIcon("exit", TDEIcon::SizeMedium),
                i18n("Logout %1").arg(username), this, TQT_SLOT(logout()));
 }
 
@@ -677,7 +677,7 @@ bool TOM::loadSidePixmap()
     return false;
   }
 
-  KIconEffect::colorize(image, color, 1.0);
+  TDEIconEffect::colorize(image, color, 1.0);
   m_sidePixmap.convertFromImage(image);
 
   image.load(locate("data", "kicker/pics/" + sideTileName));
@@ -687,7 +687,7 @@ bool TOM::loadSidePixmap()
     return false;
   }
 
-  KIconEffect::colorize(image, color, 1.0);
+  TDEIconEffect::colorize(image, color, 1.0);
   m_sideTilePixmap.convertFromImage(image);
 
   if (m_sidePixmap.width() != m_sideTilePixmap.width())
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index c35820e4b..7a96c5f42 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -154,7 +154,7 @@ void TaskBarContainer::configure()
         }
 
         windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
-                                                                 KIcon::Panel,
+                                                                 TDEIcon::Panel,
                                                                  16));
         windowListButton->setMinimumSize(windowListButton->sizeHint());
         layout->insertWidget(0, windowListButton);
@@ -258,7 +258,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
     if (windowListButton)
     {
         windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
-                                                                 KIcon::Panel,
+                                                                 TDEIcon::Panel,
                                                                  16));
         windowListButton->setMinimumSize(windowListButton->sizeHint());
     }
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index dd5cfff4d..f0c12e0f3 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -698,7 +698,7 @@ void TaskContainer::drawButton(TQPainter *p)
             // fade out the icon when minimized
             if (iconified)
             {
-                KIconEffect::semiTransparent( pixmap );
+                TDEIconEffect::semiTransparent( pixmap );
             }
 
             // draw icon
@@ -731,7 +731,7 @@ void TaskContainer::drawButton(TQPainter *p)
 
             if (iconified)
             {
-                KIconEffect::semiTransparent(modPixmap);
+                TDEIconEffect::semiTransparent(modPixmap);
             }
 
             p->drawPixmap(r, modPixmap);
@@ -1664,9 +1664,9 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
         data.duration = 4000;
         data.subtext = i18n("Loading application ...");
         data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(),
-                                                    KIcon::Small,
-                                                    KIcon::SizeMedium,
-                                                    KIcon::DefaultState,
+                                                    TDEIcon::Small,
+                                                    TDEIcon::SizeMedium,
+                                                    TDEIcon::DefaultState,
                                                     0, true);
         return;
     }
@@ -1689,8 +1689,8 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
         {
             // try to load icon via net_wm
             pixmap = KWin::icon(tasks.last()->window(),
-                                KIcon::SizeMedium,
-                                KIcon::SizeMedium,
+                                TDEIcon::SizeMedium,
+                                TDEIcon::SizeMedium,
                                 true);
         }
     
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 8803b1cd1..777142b47 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -629,9 +629,9 @@ Task::Task(WId win, TQObject *parent, const char *name)
     if(_pixmap.isNull())
     {
         TDEGlobal::iconLoader()->loadIcon(className().lower(),
-                                                    KIcon::Small,
-                                                    KIcon::Small,
-                                                    KIcon::DefaultState,
+                                                    TDEIcon::Small,
+                                                    TDEIcon::Small,
+                                                    TDEIcon::DefaultState,
                                                     0, true);
     }
 
@@ -710,9 +710,9 @@ void Task::refreshIcon()
     if(_pixmap.isNull())
     {
         TDEGlobal::iconLoader()->loadIcon(className().lower(),
-                                                    KIcon::Small,
-                                                    KIcon::Small,
-                                                    KIcon::DefaultState,
+                                                    TDEIcon::Small,
+                                                    TDEIcon::Small,
+                                                    TDEIcon::DefaultState,
                                                     0, true);
     }
 
@@ -908,20 +908,20 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
   isStaticIcon = false;
 
   switch( size ) {
-  case KIcon::SizeSmall:
+  case TDEIcon::SizeSmall:
     {
       pixmap = icon( 16, 16, true  );
 
       // Icon of last resort
       if( pixmap.isNull() ) {
         pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
-                                                  KIcon::NoGroup,
-                                                  KIcon::SizeSmall );
+                                                  TDEIcon::NoGroup,
+                                                  TDEIcon::SizeSmall );
         isStaticIcon = true;
       }
     }
     break;
-  case KIcon::SizeMedium:
+  case TDEIcon::SizeMedium:
     {
       //
       // Try 34x34 first for KDE 2.1 icons with shadows, if we don't
@@ -938,13 +938,13 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
       // Icon of last resort
       if( pixmap.isNull() ) {
         pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
-                            KIcon::NoGroup,
-                            KIcon::SizeMedium );
+                            TDEIcon::NoGroup,
+                            TDEIcon::SizeMedium );
         isStaticIcon = true;
       }
     }
     break;
-  case KIcon::SizeLarge:
+  case TDEIcon::SizeLarge:
     {
       // If there's a 48x48 icon in the hints then use it
       pixmap = icon( size, size, false  );
@@ -952,9 +952,9 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
       // If not, try to get one from the classname
       if ( pixmap.isNull() || pixmap.width() != size || pixmap.height() != size ) {
         pixmap = TDEGlobal::iconLoader()->loadIcon( className(),
-                            KIcon::NoGroup,
+                            TDEIcon::NoGroup,
                             size,
-                            KIcon::DefaultState,
+                            TDEIcon::DefaultState,
                             0L,
                             true );
         isStaticIcon = true;
@@ -969,7 +969,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
       // Icon of last resort
       if( pixmap.isNull() ) {
         pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
-                                                  KIcon::NoGroup,
+                                                  TDEIcon::NoGroup,
                                                   size );
         isStaticIcon = true;
       }
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index 6b9dab397..f35e10f6c 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -127,25 +127,25 @@ public:
     WindowList transients() const { return _transients; }
 
     /**
-     * Returns a 16x16 (KIcon::Small) icon for the task. This method will
+     * Returns a 16x16 (TDEIcon::Small) icon for the task. This method will
      * only fall back to a static icon if there is no icon of any size in
      * the WM hints.
      */
     TQPixmap pixmap() const { return _pixmap; }
 
     /**
-     * Returns the best icon for any of the KIcon::StdSizes. If there is no
+     * Returns the best icon for any of the TDEIcon::StdSizes. If there is no
      * icon of the specified size specified in the WM hints, it will try to
-     * get one using KIconLoader.
+     * get one using TDEIconLoader.
      *
      * <pre>
      *   bool gotStaticIcon;
-     *   TQPixmap icon = myTask->icon( KIcon::SizeMedium, gotStaticIcon );
+     *   TQPixmap icon = myTask->icon( TDEIcon::SizeMedium, gotStaticIcon );
      * </pre>
      *
-     * @param size Any of the constants in KIcon::StdSizes.
-     * @param isStaticIcon Set to true if KIconLoader was used, false otherwise.
-     * @see KIcon
+     * @param size Any of the constants in TDEIcon::StdSizes.
+     * @param isStaticIcon Set to true if TDEIconLoader was used, false otherwise.
+     * @see TDEIcon
      */
     TQPixmap bestIcon( int size, bool &isStaticIcon );