Rename KIcon to enhance compatibility with KDE4

7 files changed, 7 insertions, 7 deletions

diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 932d49d..1e2a45a 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -561,7 +561,7 @@ KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo *
   TQWhatsThis::add( leTemplate, i18n("<p>This string is used as the template's name "
       "and is displayed, for example, in the Template menu. It should describe the "
       "meaning of the template, for example 'HTML Document'.</p>") );
-  ibIcon = new KIconButton( hb );
+  ibIcon = new TDEIconButton( hb );
   TQWhatsThis::add( ibIcon, i18n(
       "Press to select or change the icon for this template") );
 
diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h
index c1fa754..29c0fff 100644
--- a/kate/filetemplates/plugin/filetemplates.h
+++ b/kate/filetemplates/plugin/filetemplates.h
@@ -169,7 +169,7 @@ class KateTemplateInfoWidget : public TQWidget
     class TQLineEdit *leTemplate, *leDocumentName, *leDescription, *leAuthor;
     class TQComboBox *cmbGroup;
     class TQPushButton *btnHighlight;
-    class KIconButton *ibIcon;
+    class TDEIconButton *ibIcon;
 
   private slots:
     void slotHlSet( int id );
diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h
index eb8b10f..1c96849 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.h
+++ b/kate/insertcommand/plugin_kateinsertcommand.h
@@ -75,7 +75,7 @@ class PluginKateInsertCommand : public Kate::Plugin,
     TQString configPageFullName(uint) const {
       return i18n("Configure Insert Command Plugin"); }
     TQPixmap configPagePixmap (uint /*number = 0*/,
-                              int /*size = KIcon::SizeSmall*/) const
+                              int /*size = TDEIcon::SizeSmall*/) const
                                { return 0L; }
 
   private:
diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp
index ff87170..04b5a96 100644
--- a/kate/kjswrapper/plugin_katekjswrapper.cpp
+++ b/kate/kjswrapper/plugin_katekjswrapper.cpp
@@ -167,7 +167,7 @@ TQString PluginKateKJSWrapper::configPageFullName(uint id) const {
 }
 
 TQPixmap PluginKateKJSWrapper::configPagePixmap (uint /*number = 0*/,
-                              int /*size = KIcon::SizeSmall*/) const {
+                              int /*size = TDEIcon::SizeSmall*/) const {
 	return 0;
 }
 
diff --git a/kate/kjswrapper/plugin_katekjswrapper.h b/kate/kjswrapper/plugin_katekjswrapper.h
index 5110eb1..2f13588 100644
--- a/kate/kjswrapper/plugin_katekjswrapper.h
+++ b/kate/kjswrapper/plugin_katekjswrapper.h
@@ -91,7 +91,7 @@ class PluginKateKJSWrapper : public Kate::Plugin,
     TQString configPageName(uint) const;
     TQString configPageFullName(uint) const;
     TQPixmap configPagePixmap (uint /*number = 0*/, 
-                              int /*size = KIcon::SizeSmall*/) const;
+                              int /*size = TDEIcon::SizeSmall*/) const;
     PluginKateKJSWrapperView *getViewObject(Kate::MainWindow *win);
 
   public slots:
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index 7d625f9..109c563 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -311,7 +311,7 @@ class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface
     Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0);
     TQString configPageName(uint) const { return i18n("Tab Bar Extension"); }
     TQString configPageFullName(uint) const { return i18n("Configure Tab Bar Extension"); }
-    TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const { return 0L; }
+    TQPixmap configPagePixmap (uint number = 0, int size = TDEIcon::SizeSmall) const { return 0L; }
 
   public slots:
     void applyConfig( KateTabBarExtensionConfigPage* );
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml
index 913dbf8..e3e1270 100644
--- a/kate/xmltools/kde-docbook.dtd.xml
+++ b/kate/xmltools/kde-docbook.dtd.xml
@@ -1869,7 +1869,7 @@
 </entity>
 <entity name="kiconedit" type="gen">
 <text-expanded>
-<application>KIconEdit</application>
+<application>TDEIconEdit</application>
 </text-expanded>
 </entity>
 <entity name="lrarr2" type="gen">