Rename KIcon to enhance compatibility with KDE4

5 files changed, 15 insertions, 15 deletions

diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp
index fb3d9daa..f48506e8 100644
--- a/kbabel/addons/preview/pothumbcreator.cpp
+++ b/kbabel/addons/preview/pothumbcreator.cpp
@@ -325,17 +325,17 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
            if(pix.width() < 80)
            {
                kbabelPix = TDEGlobal::iconLoader()->loadIcon("kbabel"
-                       ,KIcon::Small,16,KIcon::DefaultState,0,true);
+                       ,TDEIcon::Small,16,TDEIcon::DefaultState,0,true);
            }
            else if(pix.width() < 150)
            {
                kbabelPix = TDEGlobal::iconLoader()->loadIcon("kbabel"
-                       ,KIcon::Desktop,32,KIcon::DefaultState,0,true);
+                       ,TDEIcon::Desktop,32,TDEIcon::DefaultState,0,true);
            }
            else
            {
                kbabelPix = TDEGlobal::iconLoader()->loadIcon("kbabel"
-                       ,KIcon::Desktop,48,KIcon::DefaultState,0,true);
+                       ,TDEIcon::Desktop,48,TDEIcon::DefaultState,0,true);
            }
            
            int x = pix.width()-kbabelPix.width()-4;
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index da21075b..6d7e33f2 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -2532,7 +2532,7 @@ void CatalogManagerView::contentsMouseMoveEvent(TQMouseEvent* event)
                uri.append(TQUriDrag::localFileToUri(item->potFile()));
 
             TQUriDrag* drag = new TQUriDrag(uri,this);
-            TQPixmap icon=TDEGlobal::iconLoader()->loadIcon("txt",KIcon::Desktop);
+            TQPixmap icon=TDEGlobal::iconLoader()->loadIcon("txt",TDEIcon::Desktop);
             drag->setPixmap(icon,TQPoint(icon.width()/2,icon.height()/2));
             drag->drag();
          }
diff --git a/kbabel/catalogmanager/catmanresource.h b/kbabel/catalogmanager/catmanresource.h
index 0c8a694a..cf3cdb9f 100644
--- a/kbabel/catalogmanager/catmanresource.h
+++ b/kbabel/catalogmanager/catmanresource.h
@@ -47,18 +47,18 @@
 #define COL_REVISION 6
 #define COL_TRANSLATOR 7
 
-#define ICON_OK UserIcon("ok",KIcon::DefaultState)
-#define ICON_MISSING UserIcon("missing",KIcon::DefaultState)
-#define ICON_NEEDWORK UserIcon("needwork",KIcon::DefaultState)
-#define ICON_BROKEN UserIcon("broken",KIcon::DefaultState)
+#define ICON_OK UserIcon("ok",TDEIcon::DefaultState)
+#define ICON_MISSING UserIcon("missing",TDEIcon::DefaultState)
+#define ICON_NEEDWORK UserIcon("needwork",TDEIcon::DefaultState)
+#define ICON_BROKEN UserIcon("broken",TDEIcon::DefaultState)
 #define ICON_UPDATING SmallIcon("reload")
 #define ICON_FLAG SmallIcon("flag")
 #define ICON_FOLDER_CLOSED_OK SmallIcon("folder_green")
 #define ICON_FOLDER_CLOSED_WORK SmallIcon("folder_red")
 #define ICON_FOLDER_OPEN_OK SmallIcon("folder_green_open")
 #define ICON_FOLDER_OPEN_WORK SmallIcon("folder_red_open")
-#define ICON_ERROR UserIcon("error",KIcon::DefaultState)
-#define ICON_NOFLAG UserIcon("noflag",KIcon::DefaultState)
+#define ICON_ERROR UserIcon("error",TDEIcon::DefaultState)
+#define ICON_NOFLAG UserIcon("noflag",TDEIcon::DefaultState)
 
 // Needed for determining which actions should be enabled and which not.
 #define NEEDS_PO       1
diff --git a/kbabel/commonui/tdeactionselector.cpp b/kbabel/commonui/tdeactionselector.cpp
index 3758b2be..fd497a4b 100644
--- a/kbabel/commonui/tdeactionselector.cpp
+++ b/kbabel/commonui/tdeactionselector.cpp
@@ -72,7 +72,7 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name )
   d->selectedInsertionPolicy = BelowCurrent;
   d->showUpDownButtons = true;
 
-  //int isz = IconSize( KIcon::Small );
+  //int isz = IconSize( TDEIcon::Small );
 
   TQHBoxLayout *lo = new TQHBoxLayout( this );
   lo->setSpacing( KDialog::spacingHint() );
@@ -148,7 +148,7 @@ TQListBox *TDEActionSelector::selectedListBox()
 void TDEActionSelector::setButtonIcon( const TQString &icon, MoveButton button )
 {
   int isz;
-  if ( d->iconSize == SmallIcon ) isz = IconSize( KIcon::Small );
+  if ( d->iconSize == SmallIcon ) isz = IconSize( TDEIcon::Small );
   else if ( d->iconSize == Small )  isz = 16;
   else if ( d->iconSize == Medium ) isz = 22;
   else if ( d->iconSize == Large )  isz = 32;
@@ -501,7 +501,7 @@ void TDEActionSelector::itemDoubleClicked( TQListBoxItem *item )
 void TDEActionSelector::loadIcons()
 {
   int isz;
-  if ( d->iconSize == SmallIcon ) isz = IconSize( KIcon::Small );
+  if ( d->iconSize == SmallIcon ) isz = IconSize( TDEIcon::Small );
   else if ( d->iconSize == Small )  isz = 16;
   else if ( d->iconSize == Medium ) isz = 22;
   else if ( d->iconSize == Large )  isz = 32;
diff --git a/kbabel/commonui/tdeactionselector.h b/kbabel/commonui/tdeactionselector.h
index eaa1ab72..6f92484d 100644
--- a/kbabel/commonui/tdeactionselector.h
+++ b/kbabel/commonui/tdeactionselector.h
@@ -124,7 +124,7 @@ public:
   /**
     This enum identifies the icon sizes, used for the move buttons.
     The values correspond to the following pixel sizes:
-    @li SmallIcon - the return value of IconSize( KIcon::Small ), the user defined size
+    @li SmallIcon - the return value of IconSize( TDEIcon::Small ), the user defined size
                 of a small icon in KDE. This is the default setting.
     @li Small - 16px
     @li Medium - 22px
@@ -283,7 +283,7 @@ public:
     Sets the iconset for button @p button to @p iconset.
     You can use this method to et a costum icon set. Either
     created by @ref TQIconSet, or use the application instance of
-    @ref KIconLoader (recommended).
+    @ref TDEIconLoader (recommended).
   */
   void setButtonIconSet( const TQIconSet &iconset, MoveButton button );