Rename KIcon to enhance compatibility with KDE4

5 files changed, 18 insertions, 18 deletions

diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 0efaa6aa9..1d0ce7afe 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -89,13 +89,13 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
 
   path.clear();
   path << i18n("Application");
-  setFolderIcon (path, SmallIcon("kate", KIcon::SizeSmall));
+  setFolderIcon (path, SmallIcon("kate", TDEIcon::SizeSmall));
 
   path.clear();
 
   //BEGIN General page
   path << i18n("Application") << i18n("General");
-  TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", KIcon::SizeSmall));
+  TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", TDEIcon::SizeSmall));
 
   TQVBoxLayout *lo = new TQVBoxLayout( frGeneral );
   lo->setSpacing(KDialog::spacingHint());
@@ -193,7 +193,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
 
   //BEGIN Session page
   path << i18n("Application") << i18n("Sessions");
-  TQFrame* frSessions = addPage(path, i18n("Session Management"), BarIcon("history", KIcon::SizeSmall));
+  TQFrame* frSessions = addPage(path, i18n("Session Management"), BarIcon("history", TDEIcon::SizeSmall));
 
   lo = new TQVBoxLayout( frSessions );
   lo->setSpacing(KDialog::spacingHint());
@@ -264,7 +264,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   path << i18n("Application") << i18n("File Selector");
 
   TQVBox *page = addVBoxPage( path, i18n("File Selector Settings"),
-                              BarIcon("fileopen", KIcon::SizeSmall) );
+                              BarIcon("fileopen", TDEIcon::SizeSmall) );
   fileSelConfigPage = new KFSConfigPage( page, "file selector config page",
                                          mainWindow->fileselector );
   connect( fileSelConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@@ -272,7 +272,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
 
   path << i18n("Application") << i18n("Document List");
   page = addVBoxPage( path, i18n("Document List Settings"),
-  BarIcon("view_text", KIcon::SizeSmall) );
+  BarIcon("view_text", TDEIcon::SizeSmall) );
   filelistConfigPage = new KFLConfigPage( page, "file list config page",
 					  mainWindow->filelist );
   connect( filelistConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@@ -280,7 +280,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
 
   path << i18n("Application") << i18n("Plugins");
   /*TQVBox **/page=addVBoxPage(path,i18n("Plugin Manager"),
-                          BarIcon("connect_established",KIcon::SizeSmall));
+                          BarIcon("connect_established",TDEIcon::SizeSmall));
   KateConfigPluginPage *configPluginPage = new KateConfigPluginPage(page, this);
   connect( configPluginPage, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotChanged() ) );
 
@@ -288,21 +288,21 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   path.clear();
   path << i18n("Application") << i18n("External Tools");
   page = addVBoxPage( path, i18n("External Tools"),
-      BarIcon("configure", KIcon::SizeSmall) );
+      BarIcon("configure", TDEIcon::SizeSmall) );
   configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page");
   connect( configExternalToolsPage, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotChanged()) );
 
   // editor widgets from kwrite/kwdialog
   path.clear();
   path << i18n("Editor");
-  setFolderIcon (path, SmallIcon("edit", KIcon::SizeSmall));
+  setFolderIcon (path, SmallIcon("edit", TDEIcon::SizeSmall));
 
   for (uint i = 0; i < KTextEditor::configInterfaceExtension (v->document())->configPages (); i++)
   {
     path.clear();
     path << i18n("Editor") << KTextEditor::configInterfaceExtension (v->document())->configPageName (i);
     /*TQVBox **/page = addVBoxPage(path, KTextEditor::configInterfaceExtension (v->document())->configPageFullName (i),
-                              KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, KIcon::SizeSmall) );
+                              KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, TDEIcon::SizeSmall) );
 
     KTextEditor::ConfigPage *cPage = KTextEditor::configInterfaceExtension (v->document())->configPage(i, page);
     connect( cPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@@ -336,7 +336,7 @@ void KateConfigDialog::addPluginPage (Kate::Plugin *plugin)
     TQStringList path;
     path.clear();
     path << i18n("Application")<<i18n("Plugins") << Kate::pluginConfigInterfaceExtension(plugin)->configPageName(i);
-    TQVBox *page=addVBoxPage(path, Kate::pluginConfigInterfaceExtension(plugin)->configPageFullName(i), Kate::pluginConfigInterfaceExtension(plugin)->configPagePixmap(i, KIcon::SizeSmall));
+    TQVBox *page=addVBoxPage(path, Kate::pluginConfigInterfaceExtension(plugin)->configPageFullName(i), Kate::pluginConfigInterfaceExtension(plugin)->configPagePixmap(i, TDEIcon::SizeSmall));
 
     PluginPageListItem *info=new PluginPageListItem;
     info->plugin = plugin;
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 90e934409..f24a0cf97 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -445,8 +445,8 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   TQWhatsThis::add( leName, i18n(
       "The name will be displayed in the 'Tools->External' menu") );
 
-  btnIcon = new KIconButton( w );
-  btnIcon->setIconSize( KIcon::SizeSmall );
+  btnIcon = new TDEIconButton( w );
+  btnIcon->setIconSize( TDEIcon::SizeSmall );
   lo->addWidget( btnIcon, 1, 3 );
   if ( tool && !tool->icon.isEmpty() )
     btnIcon->setIcon( tool->icon );
@@ -649,7 +649,7 @@ void KateExternalToolsConfigWidget::reload()
 
 TQPixmap KateExternalToolsConfigWidget::blankIcon()
 {
-  TQPixmap pm( KIcon::SizeSmall, KIcon::SizeSmall );
+  TQPixmap pm( TDEIcon::SizeSmall, TDEIcon::SizeSmall );
   pm.fill();
   pm.setMask( pm.createHeuristicMask() );
   return pm;
diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h
index 363ae6377..ef3a9e9fd 100644
--- a/kate/app/kateexternaltools.h
+++ b/kate/app/kateexternaltools.h
@@ -210,7 +210,7 @@ class KateExternalToolServiceEditor : public KDialogBase
 
     class TQLineEdit *leName, *leExecutable, *leMimetypes,*leCmdLine;
     class TQTextEdit *teCommand;
-    class KIconButton *btnIcon;
+    class TDEIconButton *btnIcon;
     class TQComboBox *cmbSave;
 
   private slots:
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index 4925b6e90..f4eb73e38 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -48,16 +48,16 @@ public:
 	STATE state() const { return m_state;}
 	void setState(enum STATE state) {
 		m_state=state;
-		KIconLoader *loader = TDEGlobal::instance()->iconLoader();
+		TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
 		switch (state) {
 			case InitialState:
 				setPixmap(0,TQPixmap());
 				break;
 			case SaveOKState:
-				setPixmap(0,loader->loadIcon("ok",KIcon::NoGroup,height()));
+				setPixmap(0,loader->loadIcon("ok",TDEIcon::NoGroup,height()));
 				break;
 			case SaveFailedState:
-				setPixmap(0,loader->loadIcon("cancel",KIcon::NoGroup,height()));
+				setPixmap(0,loader->loadIcon("cancel",TDEIcon::NoGroup,height()));
 				break;
 		}
 	}
diff --git a/kate/interfaces/pluginconfiginterfaceextension.h b/kate/interfaces/pluginconfiginterfaceextension.h
index 2e66f9d79..8a64ec090 100644
--- a/kate/interfaces/pluginconfiginterfaceextension.h
+++ b/kate/interfaces/pluginconfiginterfaceextension.h
@@ -88,7 +88,7 @@ class KDE_EXPORT PluginConfigInterfaceExtension
   
     virtual TQString configPageName (uint number = 0) const = 0;
     virtual TQString configPageFullName (uint number = 0) const = 0;
-    virtual TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const = 0;    
+    virtual TQPixmap configPagePixmap (uint number = 0, int size = TDEIcon::SizeSmall) const = 0;    
     
   private:
     class PrivatePluginConfigInterfaceExtension *d;