Rename KIcon to enhance compatibility with KDE4

4 files changed, 28 insertions, 28 deletions

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>