Rename KIcon to enhance compatibility with KDE4

2 files changed, 23 insertions, 23 deletions

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 );