Rename KIcon to enhance compatibility with KDE4

17 files changed, 94 insertions, 94 deletions

diff --git a/sip/kio/kmimetype.sip b/sip/kio/kmimetype.sip
index 803c70c..279933b 100644
--- a/sip/kio/kmimetype.sip
+++ b/sip/kio/kmimetype.sip
@@ -43,9 +43,9 @@ public:
                          KMimeType (TQDataStream&, int);
     virtual TQString      icon (const TQString&, bool) const;
     virtual TQString      icon (const KURL&, bool) const;
-    virtual TQPixmap      pixmap (KIcon::Group, int = 0, int = 0, TQString* = 0) const;
-    virtual TQPixmap      pixmap (const KURL&, KIcon::Group, int = 0, int = 0, TQString* = 0) const;
-    static TQPixmap       pixmapForURL (const KURL&, mode_t = 0, KIcon::Group = KIcon ::Desktop , int = 0, int = 0, TQString* = 0);
+    virtual TQPixmap      pixmap (TDEIcon::Group, int = 0, int = 0, TQString* = 0) const;
+    virtual TQPixmap      pixmap (const KURL&, TDEIcon::Group, int = 0, int = 0, TQString* = 0) const;
+    static TQPixmap       pixmapForURL (const KURL&, mode_t = 0, TDEIcon::Group = TDEIcon ::Desktop , int = 0, int = 0, TQString* = 0);
     static TQString       iconForURL (const KURL&, mode_t = 0);
     static TQString       favIconForURL (const KURL&);
     TQString              comment () const;
@@ -188,7 +188,7 @@ public:
                          KDEDesktopMimeType (TQDataStream&, int);
     virtual TQString      icon (const TQString&, bool) const;
     virtual TQString      icon (const KURL&, bool) const;
-    virtual TQPixmap      pixmap (const KURL&, KIcon::Group, int = 0, int = 0, TQString* = 0) const;
+    virtual TQPixmap      pixmap (const KURL&, TDEIcon::Group, int = 0, int = 0, TQString* = 0) const;
     virtual TQString      comment (const TQString&, bool) const;
     virtual TQString      comment (const KURL&, bool) const;
     static TQValueList<KDEDesktopMimeType::Service> builtinServices (const KURL&);
@@ -208,7 +208,7 @@ public:
     static pid_t         run (const KURL&, bool);
 
 protected:
-    virtual TQPixmap      pixmap (KIcon::Group, int, int, TQString*) const;
+    virtual TQPixmap      pixmap (TDEIcon::Group, int, int, TQString*) const;
     static pid_t         runFSDevice (const KURL&, const KSimpleConfig&);
     static pid_t         runApplication (const KURL&, const TQString&);
     static pid_t         runLink (const KURL&, const KSimpleConfig&);
diff --git a/sip/kio/kservice.sip b/sip/kio/kservice.sip
index 07799a6..c26cbaa 100644
--- a/sip/kio/kservice.sip
+++ b/sip/kio/kservice.sip
@@ -46,7 +46,7 @@ public:
     TQString              library () const;
     TQString              init () const;
     TQString              icon () const;
-    TQPixmap              pixmap (KIcon::Group, int = 0, int = 0, TQString* = 0) const;
+    TQPixmap              pixmap (TDEIcon::Group, int = 0, int = 0, TQString* = 0) const;
     bool                 terminal () const;
     TQString              terminalOptions () const;
     bool                 substituteUid () const;
diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip
index e05454b..645ca68 100644
--- a/sip/tdecore/kglobal.sip
+++ b/sip/tdecore/kglobal.sip
@@ -40,7 +40,7 @@ public:
     static TDESharedConfig* sharedConfig ();
 %End
 
-    static KIconLoader*  iconLoader ();
+    static TDEIconLoader*  iconLoader ();
     static TDELocale*      locale ();
     static KCharsets*    charsets ();
     static const TQString& staticQString (const char*);
diff --git a/sip/tdecore/kiconeffect.sip b/sip/tdecore/kiconeffect.sip
index b6982f5..90e75a6 100644
--- a/sip/tdecore/kiconeffect.sip
+++ b/sip/tdecore/kiconeffect.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KIconEffect
+class TDEIconEffect
 {
 %TypeHeaderCode
 #include <kiconeffect.h>
@@ -32,7 +32,7 @@ class KIconEffect
 
 
 public:
-                         KIconEffect ();
+                         TDEIconEffect ();
 
 %If ( KDE_3_4_0 -  )
 
@@ -98,5 +98,5 @@ public:
 %End
 
 
-};  // class KIconEffect
+};  // class TDEIconEffect
 
diff --git a/sip/tdecore/kiconloader.sip b/sip/tdecore/kiconloader.sip
index 990725d..d805133 100644
--- a/sip/tdecore/kiconloader.sip
+++ b/sip/tdecore/kiconloader.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KIconLoader
+class TDEIconLoader
 {
 %TypeHeaderCode
 #include <kiconloader.h>
@@ -32,37 +32,37 @@ class KIconLoader
 
 
 public:
-                         KIconLoader (const TQString& = TQString ::null , TDEStandardDirs* = 0);
+                         TDEIconLoader (const TQString& = TQString ::null , TDEStandardDirs* = 0);
     void                 addAppDir (const TQString&);
-    TQPixmap              loadIcon (const TQString&, KIcon::Group, int = 0, int = KIcon ::DefaultState , TQString* = 0, bool = 0) const;
+    TQPixmap              loadIcon (const TQString&, TDEIcon::Group, int = 0, int = TDEIcon ::DefaultState , TQString* = 0, bool = 0) const;
 
 %If ( KDE_3_5_0 -  )
-    TQIconSet             loadIconSet (const TQString&, KIcon::Group, int, bool, bool);
+    TQIconSet             loadIconSet (const TQString&, TDEIcon::Group, int, bool, bool);
 %End
 
 
 %If ( KDE_3_1_0 -  )
-    TQIconSet             loadIconSet (const TQString&, KIcon::Group, int, bool);
+    TQIconSet             loadIconSet (const TQString&, TDEIcon::Group, int, bool);
 %End
 
-    TQIconSet             loadIconSet (const TQString&, KIcon::Group, int = 0);
+    TQIconSet             loadIconSet (const TQString&, TDEIcon::Group, int = 0);
     TQString              iconPath (const TQString&, int, bool = 0) const;
-    TQMovie               loadMovie (const TQString&, KIcon::Group, int = 0) const;
-    TQString              moviePath (const TQString&, KIcon::Group, int = 0) const;
-    TQStringList          loadAnimated (const TQString&, KIcon::Group, int = 0) const;
-    TQStringList          queryIcons (int, KIcon::Context = KIcon ::Any ) const;
-    TQStringList          queryIconsByContext (int, KIcon::Context = KIcon ::Any ) const;
+    TQMovie               loadMovie (const TQString&, TDEIcon::Group, int = 0) const;
+    TQString              moviePath (const TQString&, TDEIcon::Group, int = 0) const;
+    TQStringList          loadAnimated (const TQString&, TDEIcon::Group, int = 0) const;
+    TQStringList          queryIcons (int, TDEIcon::Context = TDEIcon ::Any ) const;
+    TQStringList          queryIconsByContext (int, TDEIcon::Context = TDEIcon ::Any ) const;
 
 %If ( KDE_3_1_0 -  )
     TQStringList          queryIconsByDir (const TQString&) const;
 %End
 
-    int                  currentSize (KIcon::Group) const;
-    KIconTheme*          theme ();
-    KIconEffect*         iconEffect ();
+    int                  currentSize (TDEIcon::Group) const;
+    TDEIconTheme*          theme ();
+    TDEIconEffect*         iconEffect ();
     void                 reconfigure (const TQString&, TDEStandardDirs*);
     static TQPixmap       unknown ();
-    bool                 alphaBlending (KIcon::Group) const;
+    bool                 alphaBlending (TDEIcon::Group) const;
 
 %If ( KDE_3_1_0 -  )
     void                 addExtraDesktopThemes ();
@@ -72,26 +72,26 @@ public:
 %End
 
 
-};  // class KIconLoader
+};  // class TDEIconLoader
 
 
 %ModuleCode
 #include <kiconloader.h>
 %End
 
-TQPixmap              DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
+TQPixmap              DesktopIcon (const TQString&, int = 0, int = TDEIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
 TQPixmap              DesktopIcon (const TQString&, TDEInstance*);
 TQIconSet             DesktopIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ());
-TQPixmap              BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
+TQPixmap              BarIcon (const TQString&, int = 0, int = TDEIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
 TQPixmap              BarIcon (const TQString&, TDEInstance*);
 TQIconSet             BarIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ());
-TQPixmap              SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
+TQPixmap              SmallIcon (const TQString&, int = 0, int = TDEIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
 TQPixmap              SmallIcon (const TQString&, TDEInstance*);
 TQIconSet             SmallIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ());
-TQPixmap              MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
+TQPixmap              MainBarIcon (const TQString&, int = 0, int = TDEIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
 TQPixmap              MainBarIcon (const TQString&, TDEInstance*);
 TQIconSet             MainBarIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ());
-TQPixmap              UserIcon (const TQString&, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
+TQPixmap              UserIcon (const TQString&, int = TDEIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
 TQPixmap              UserIcon (const TQString&, TDEInstance*);
 TQIconSet             UserIconSet (const TQString&, TDEInstance* = TDEGlobal ::instance ());
-int                  IconSize (KIcon::Group, TDEInstance* = TDEGlobal ::instance ());
+int                  IconSize (TDEIcon::Group, TDEInstance* = TDEGlobal ::instance ());
diff --git a/sip/tdecore/kicontheme.sip b/sip/tdecore/kicontheme.sip
index c8f2f6a..bbd8ae6 100644
--- a/sip/tdecore/kicontheme.sip
+++ b/sip/tdecore/kicontheme.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KIcon
+class TDEIcon
 {
 %TypeHeaderCode
 #include <kicontheme.h>
@@ -32,7 +32,7 @@ class KIcon
 
 
 public:
-                         KIcon ();
+                         TDEIcon ();
     bool                 isValid () const;
 
     enum Context
@@ -198,10 +198,10 @@ public:
 %End
 
 
-};  // class KIcon
+};  // class TDEIcon
 
 
-class KIconTheme
+class TDEIconTheme
 {
 %TypeHeaderCode
 #include <kicontheme.h>
@@ -209,7 +209,7 @@ class KIconTheme
 
 
 public:
-                         KIconTheme (const TQString&, const TQString& = TQString ::null );
+                         TDEIconTheme (const TQString&, const TQString& = TQString ::null );
     TQString              name () const;
     TQString              description () const;
     TQString              example () const;
@@ -231,11 +231,11 @@ public:
 %End
 
     int                  depth () const;
-    int                  defaultSize (KIcon::Group) const;
-    TQValueList<int>      querySizes (KIcon::Group) const;
-    TQStringList          queryIcons (int, KIcon::Context = KIcon ::Any ) const;
-    TQStringList          queryIconsByContext (int, KIcon::Context = KIcon ::Any ) const;
-    KIcon                iconPath (const TQString&, int, KIcon::MatchType) const;
+    int                  defaultSize (TDEIcon::Group) const;
+    TQValueList<int>      querySizes (TDEIcon::Group) const;
+    TQStringList          queryIcons (int, TDEIcon::Context = TDEIcon ::Any ) const;
+    TQStringList          queryIconsByContext (int, TDEIcon::Context = TDEIcon ::Any ) const;
+    TDEIcon                iconPath (const TQString&, int, TDEIcon::MatchType) const;
     static TQStringList   list ();
     static TQString       current ();
     static void          reconfigure ();
@@ -245,5 +245,5 @@ public:
 %End
 
 
-};  // class KIconTheme
+};  // class TDEIconTheme
 
diff --git a/sip/tdecore/kinstance.sip b/sip/tdecore/kinstance.sip
index 94a23c3..b960c83 100644
--- a/sip/tdecore/kinstance.sip
+++ b/sip/tdecore/kinstance.sip
@@ -42,7 +42,7 @@ public:
     TDESharedConfig*       sharedConfig () const;
 %End
 
-    KIconLoader*         iconLoader () const;
+    TDEIconLoader*         iconLoader () const;
     void                 newIconLoader () const;
     const TDEAboutData*    aboutData () const;
     TQCString             instanceName () const;
diff --git a/sip/tdecore/kmimesourcefactory.sip b/sip/tdecore/kmimesourcefactory.sip
index 44da6f9..af484a6 100644
--- a/sip/tdecore/kmimesourcefactory.sip
+++ b/sip/tdecore/kmimesourcefactory.sip
@@ -32,7 +32,7 @@ class KMimeSourceFactory : TQMimeSourceFactory
 
 
 public:
-                         KMimeSourceFactory (KIconLoader* = TDEGlobal ::iconLoader ());
+                         KMimeSourceFactory (TDEIconLoader* = TDEGlobal ::iconLoader ());
     virtual TQString      makeAbsolute (const TQString&, const TQString&) const;
 
 protected:
diff --git a/sip/tdefile/kicondialog.sip b/sip/tdefile/kicondialog.sip
index eebdcb0..c53df67 100644
--- a/sip/tdefile/kicondialog.sip
+++ b/sip/tdefile/kicondialog.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KIconCanvas : KIconView
+class TDEIconCanvas : TDEIconView
 {
 %TypeHeaderCode
 #include <kicondialog.h>
@@ -32,7 +32,7 @@ class KIconCanvas : KIconView
 
 
 public:
-                         KIconCanvas (TQWidget* /TransferThis/ = 0, const char* = 0);
+                         TDEIconCanvas (TQWidget* /TransferThis/ = 0, const char* = 0);
     void                 loadFiles (const TQStringList&);
     TQString              getCurrent ();
 
@@ -48,10 +48,10 @@ signals:
 protected:
 //igx     virtual void         virtual_hook (int, void*);
 
-};  // class KIconCanvas
+};  // class TDEIconCanvas
 
 
-class KIconDialog : KDialogBase
+class TDEIconDialog : KDialogBase
 {
 %TypeHeaderCode
 #include <kicondialog.h>
@@ -59,8 +59,8 @@ class KIconDialog : KDialogBase
 
 
 public:
-                         KIconDialog (TQWidget* /TransferThis/ = 0, const char* = 0);
-                         KIconDialog (KIconLoader*, TQWidget* /TransferThis/ = 0, const char* = 0);
+                         TDEIconDialog (TQWidget* /TransferThis/ = 0, const char* = 0);
+                         TDEIconDialog (TDEIconLoader*, TQWidget* /TransferThis/ = 0, const char* = 0);
     void                 setStrictIconSize (bool);
     bool                 strictIconSize () const;
 
@@ -70,11 +70,11 @@ public:
 
     void                 setIconSize (int);
     int                  iconSize () const;
-    TQString              selectIcon (KIcon::Group = KIcon ::Desktop , KIcon::Context = KIcon ::Application , bool = 0);
-    void                 setup (KIcon::Group, KIcon::Context = KIcon ::Application , bool = 0, int = 0, bool = 0);
+    TQString              selectIcon (TDEIcon::Group = TDEIcon ::Desktop , TDEIcon::Context = TDEIcon ::Application , bool = 0);
+    void                 setup (TDEIcon::Group, TDEIcon::Context = TDEIcon ::Application , bool = 0, int = 0, bool = 0);
 
 %If ( KDE_3_3_0 -  )
-    void                 setup (KIcon::Group, KIcon::Context, bool, int, bool, bool, bool);
+    void                 setup (TDEIcon::Group, TDEIcon::Context, bool, int, bool, bool, bool);
 %End
 
     TQString              openDialog ();
@@ -83,7 +83,7 @@ public:
     void                 showDialog ();
 %End
 
-    static TQString       getIcon (KIcon::Group = KIcon ::Desktop , KIcon::Context = KIcon ::Application , bool = 0, int = 0, bool = 0, TQWidget* /Transfer/ = 0, const TQString& = TQString ::null );
+    static TQString       getIcon (TDEIcon::Group = TDEIcon ::Desktop , TDEIcon::Context = TDEIcon ::Application , bool = 0, int = 0, bool = 0, TQWidget* /Transfer/ = 0, const TQString& = TQString ::null );
 
 signals:
 
@@ -102,10 +102,10 @@ protected slots:
 protected:
 //igx     virtual void         virtual_hook (int, void*);
 
-};  // class KIconDialog
+};  // class TDEIconDialog
 
 
-class KIconButton : TQPushButton
+class TDEIconButton : TQPushButton
 {
 %TypeHeaderCode
 #include <kicondialog.h>
@@ -113,11 +113,11 @@ class KIconButton : TQPushButton
 
 
 public:
-                         KIconButton (TQWidget* /TransferThis/ = 0, const char* = 0);
-                         KIconButton (KIconLoader*, TQWidget* /TransferThis/, const char* = 0);
+                         TDEIconButton (TQWidget* /TransferThis/ = 0, const char* = 0);
+                         TDEIconButton (TDEIconLoader*, TQWidget* /TransferThis/, const char* = 0);
     void                 setStrictIconSize (bool);
     bool                 strictIconSize () const;
-    void                 setIconType (KIcon::Group, KIcon::Context, bool = 0);
+    void                 setIconType (TDEIcon::Group, TDEIcon::Context, bool = 0);
     void                 setIcon (const TQString&);
     void                 resetIcon ();
     const TQString        icon ();
@@ -127,5 +127,5 @@ public:
 signals:
 //ig     void                 iconChanged (TQString);
 
-};  // class KIconButton
+};  // class TDEIconButton
 
diff --git a/sip/tdefile/kurlbar.sip b/sip/tdefile/kurlbar.sip
index 253a07b..cc15994 100644
--- a/sip/tdefile/kurlbar.sip
+++ b/sip/tdefile/kurlbar.sip
@@ -34,12 +34,12 @@ class KURLBarItem : TQListBoxPixmap
 public:
 
 %If ( KDE_3_2_0 -  )
-                         KURLBarItem (KURLBar* /TransferThis/, const KURL&, bool, const TQString& = TQString ::null , const TQString& = TQString ::null , KIcon::Group = KIcon ::Panel );
+                         KURLBarItem (KURLBar* /TransferThis/, const KURL&, bool, const TQString& = TQString ::null , const TQString& = TQString ::null , TDEIcon::Group = TDEIcon ::Panel );
 %End
 
-                         KURLBarItem (KURLBar* /TransferThis/, const KURL&, const TQString& = TQString ::null , const TQString& = TQString ::null , KIcon::Group = KIcon ::Panel );
+                         KURLBarItem (KURLBar* /TransferThis/, const KURL&, const TQString& = TQString ::null , const TQString& = TQString ::null , TDEIcon::Group = TDEIcon ::Panel );
     void                 setURL (const KURL&);
-    void                 setIcon (const TQString&, KIcon::Group = KIcon ::Panel );
+    void                 setIcon (const TQString&, TDEIcon::Group = TDEIcon ::Panel );
     void                 setDescription (const TQString&);
     void                 setToolTip (const TQString&);
 
@@ -53,7 +53,7 @@ public:
     const TQString&       description () const;
     const TQString&       icon () const;
     TQString              toolTip () const;
-    KIcon::Group         iconGroup () const;
+    TDEIcon::Group         iconGroup () const;
     virtual const TQPixmap* pixmap () const;
     void                 setApplicationLocal (bool);
     bool                 applicationLocal () const;
@@ -81,10 +81,10 @@ class KURLBar : TQFrame
 
 public:
                          KURLBar (bool, TQWidget* /TransferThis/ = 0, const char* = 0, WFlags = 0);
-    virtual KURLBarItem* insertItem (const KURL&, const TQString&, bool = 1, const TQString& = TQString ::null , KIcon::Group = KIcon ::Panel );
+    virtual KURLBarItem* insertItem (const KURL&, const TQString&, bool = 1, const TQString& = TQString ::null , TDEIcon::Group = TDEIcon ::Panel );
 
 %If ( KDE_3_2_0 -  )
-    virtual KURLBarItem* insertDynamicItem (const KURL&, const TQString&, const TQString& = TQString ::null , KIcon::Group = KIcon ::Panel );
+    virtual KURLBarItem* insertDynamicItem (const KURL&, const TQString&, const TQString& = TQString ::null , TDEIcon::Group = TDEIcon ::Panel );
 %End
 
     virtual void         setOrientation (TQt::Orientation);
@@ -198,7 +198,7 @@ class KURLBarItemDialog : KDialogBase
 
 public:
     static bool          getInformation (bool, KURL&, TQString&, TQString&, bool&, int, TQWidget* /Transfer/ = 0);
-                         KURLBarItemDialog (bool, const KURL&, const TQString&, TQString, bool = 1, int = KIcon ::SizeMedium , TQWidget* /TransferThis/ = 0, const char* = 0);
+                         KURLBarItemDialog (bool, const KURL&, const TQString&, TQString, bool = 1, int = TDEIcon ::SizeMedium , TQWidget* /TransferThis/ = 0, const char* = 0);
     KURL                 url () const;
     TQString              description () const;
     TQString              icon () const;
diff --git a/sip/tdefile/tdefiledetailview.sip b/sip/tdefile/tdefiledetailview.sip
index 8453f86..3970841 100644
--- a/sip/tdefile/tdefiledetailview.sip
+++ b/sip/tdefile/tdefiledetailview.sip
@@ -170,9 +170,9 @@ private:
         {sipName_KFileTreeView,           &sipClass_KFileTreeView},
         {sipName_KFileTreeViewToolTip,    &sipClass_KFileTreeViewToolTip},
         {sipName_KFileViewSignaler,       &sipClass_KFileViewSignaler},
-        {sipName_KIconButton,             &sipClass_KIconButton},
-        {sipName_KIconCanvas,             &sipClass_KIconCanvas},
-        {sipName_KIconDialog,             &sipClass_KIconDialog},
+        {sipName_TDEIconButton,             &sipClass_TDEIconButton},
+        {sipName_TDEIconCanvas,             &sipClass_TDEIconCanvas},
+        {sipName_TDEIconDialog,             &sipClass_TDEIconDialog},
         {sipName_KImageFilePreview,       &sipClass_KImageFilePreview},
 #if TDE_VERSION >= 0x030100
         {sipName_KNotifyDialog,           &sipClass_KNotifyDialog},
diff --git a/sip/tdefile/tdefileiconview.sip b/sip/tdefile/tdefileiconview.sip
index bd69889..a57d044 100644
--- a/sip/tdefile/tdefileiconview.sip
+++ b/sip/tdefile/tdefileiconview.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KFileIconViewItem : KIconViewItem
+class KFileIconViewItem : TDEIconViewItem
 {
 %TypeHeaderCode
 #include <tdefileiconview.h>
@@ -43,7 +43,7 @@ public:
 };  // class KFileIconViewItem
 
 
-class KFileIconView : KIconView, KFileView
+class KFileIconView : TDEIconView, KFileView
 {
 %TypeHeaderCode
 #include <tdefileiconview.h>
diff --git a/sip/tdeui/kaboutapplication.sip b/sip/tdeui/kaboutapplication.sip
index b00ba76..51eaf8b 100644
--- a/sip/tdeui/kaboutapplication.sip
+++ b/sip/tdeui/kaboutapplication.sip
@@ -119,7 +119,7 @@ protected:
         {sipName_KHSSelector,             &sipClass_KHSSelector},
         {sipName_KHelpMenu,               &sipClass_KHelpMenu},
         {sipName_KHistoryCombo,           &sipClass_KHistoryCombo},
-        {sipName_KIconView,               &sipClass_KIconView},
+        {sipName_TDEIconView,               &sipClass_TDEIconView},
         {sipName_KIntSpinBox,             &sipClass_KIntSpinBox},
         {sipName_KIntValidator,           &sipClass_KIntValidator},
         {sipName_KJanusWidget,            &sipClass_KJanusWidget},
diff --git a/sip/tdeui/kguiitem.sip b/sip/tdeui/kguiitem.sip
index 23b4f16..9b58e20 100644
--- a/sip/tdeui/kguiitem.sip
+++ b/sip/tdeui/kguiitem.sip
@@ -38,7 +38,7 @@ public:
                          KGuiItem (const KGuiItem&);
     TQString              text () const;
     TQString              plainText () const;
-    TQIconSet             iconSet (KIcon::Group, int = 0, TDEInstance* = TDEGlobal ::instance ()) const;
+    TQIconSet             iconSet (TDEIcon::Group, int = 0, TDEInstance* = TDEGlobal ::instance ()) const;
     TQIconSet             iconSet () const;
     TQString              iconName () const;
     TQString              toolTip () const;
diff --git a/sip/tdeui/kiconview.sip b/sip/tdeui/kiconview.sip
index 7940f1a..44bf275 100644
--- a/sip/tdeui/kiconview.sip
+++ b/sip/tdeui/kiconview.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KIconView : TQIconView
+class TDEIconView : TQIconView
 {
 %TypeHeaderCode
 #include <kiconview.h>
@@ -32,7 +32,7 @@ class KIconView : TQIconView
 
 
 public:
-                         KIconView (TQWidget* /TransferThis/ = 0, const char* = 0, WFlags = 0);
+                         TDEIconView (TQWidget* /TransferThis/ = 0, const char* = 0, WFlags = 0);
 
     enum Mode
     {
@@ -40,7 +40,7 @@ public:
         Select
     };
 
-    void                 setMode (KIconView::Mode);
+    void                 setMode (TDEIconView::Mode);
     Mode                 mode () const;
     virtual void         setFont (const TQFont&);
 
@@ -105,10 +105,10 @@ protected:
 protected:
 //igx     virtual void         virtual_hook (int, void*);
 
-};  // class KIconView
+};  // class TDEIconView
 
 
-class KIconViewItem : TQIconViewItem
+class TDEIconViewItem : TQIconViewItem
 {
 %TypeHeaderCode
 #include <kiconview.h>
@@ -116,14 +116,14 @@ class KIconViewItem : TQIconViewItem
 
 
 public:
-                         KIconViewItem (TQIconView* /TransferThis/);
-                         KIconViewItem (TQIconView* /TransferThis/, TQIconViewItem*);
-                         KIconViewItem (TQIconView* /TransferThis/, const TQString&);
-                         KIconViewItem (TQIconView* /TransferThis/, TQIconViewItem*, const TQString&);
-                         KIconViewItem (TQIconView* /TransferThis/, const TQString&, const TQPixmap&);
-                         KIconViewItem (TQIconView* /TransferThis/, TQIconViewItem*, const TQString&, const TQPixmap&);
-                         KIconViewItem (TQIconView* /TransferThis/, const TQString&, const TQPicture&);
-                         KIconViewItem (TQIconView* /TransferThis/, TQIconViewItem*, const TQString&, const TQPicture&);
+                         TDEIconViewItem (TQIconView* /TransferThis/);
+                         TDEIconViewItem (TQIconView* /TransferThis/, TQIconViewItem*);
+                         TDEIconViewItem (TQIconView* /TransferThis/, const TQString&);
+                         TDEIconViewItem (TQIconView* /TransferThis/, TQIconViewItem*, const TQString&);
+                         TDEIconViewItem (TQIconView* /TransferThis/, const TQString&, const TQPixmap&);
+                         TDEIconViewItem (TQIconView* /TransferThis/, TQIconViewItem*, const TQString&, const TQPixmap&);
+                         TDEIconViewItem (TQIconView* /TransferThis/, const TQString&, const TQPicture&);
+                         TDEIconViewItem (TQIconView* /TransferThis/, TQIconViewItem*, const TQString&, const TQPicture&);
 
 %If ( KDE_3_3_0 -  )
     void                 setPixmapSize (const TQSize&);
@@ -143,5 +143,5 @@ protected:
 %End
 
 
-};  // class KIconViewItem
+};  // class TDEIconViewItem
 
diff --git a/sip/tdeui/kiconviewsearchline.sip b/sip/tdeui/kiconviewsearchline.sip
index cdc6c9e..bde2ab8 100644
--- a/sip/tdeui/kiconviewsearchline.sip
+++ b/sip/tdeui/kiconviewsearchline.sip
@@ -26,7 +26,7 @@
 
 %If ( KDE_3_4_0 -  )
 
-class KIconViewSearchLine : KLineEdit
+class TDEIconViewSearchLine : KLineEdit
 {
 %TypeHeaderCode
 #include <kiconviewsearchline.h>
@@ -34,8 +34,8 @@ class KIconViewSearchLine : KLineEdit
 
 
 public:
-                         KIconViewSearchLine (TQWidget* /TransferThis/ = 0, TQIconView* = 0, const char* = 0);
-                         KIconViewSearchLine (TQWidget* /TransferThis/, const char*);
+                         TDEIconViewSearchLine (TQWidget* /TransferThis/ = 0, TQIconView* = 0, const char* = 0);
+                         TDEIconViewSearchLine (TQWidget* /TransferThis/, const char*);
     bool                 caseSensitive () const;
     TQIconView*           iconView () const;
 
@@ -55,7 +55,7 @@ protected slots:
     void                 queueSearch (const TQString&);
     void                 activateSearch ();
 
-};  // class KIconViewSearchLine
+};  // class TDEIconViewSearchLine
 
 %End
 
diff --git a/sip/tdeui/tdeaction.sip b/sip/tdeui/tdeaction.sip
index f0596bf..6a24c6e 100644
--- a/sip/tdeui/tdeaction.sip
+++ b/sip/tdeui/tdeaction.sip
@@ -77,7 +77,7 @@ public:
     virtual TQString      group () const;
     virtual TQString      whatsThis () const;
     virtual TQString      toolTip () const;
-    virtual TQIconSet     iconSet (KIcon::Group, int = 0) const;
+    virtual TQIconSet     iconSet (TDEIcon::Group, int = 0) const;
     TQIconSet             iconSet () const;
     virtual TQString      icon () const;
     TDEActionCollection*   parentCollection () const;