Rename KIcon to enhance compatibility with KDE4

48 files changed, 92 insertions, 92 deletions

diff --git a/buildtools/autotools/addapplicationdlg.cpp b/buildtools/autotools/addapplicationdlg.cpp
index e6bdc20d..d7c6e3e6 100644
--- a/buildtools/autotools/addapplicationdlg.cpp
+++ b/buildtools/autotools/addapplicationdlg.cpp
@@ -73,11 +73,11 @@ AddApplicationDialog::~AddApplicationDialog()
 
 void AddApplicationDialog::iconClicked()
 {
-    KIconLoader *loader = AutoProjectFactory::instance()->iconLoader();
-    TQString name = KIconDialog::getIcon(KIcon::Desktop);
+    TDEIconLoader *loader = AutoProjectFactory::instance()->iconLoader();
+    TQString name = TDEIconDialog::getIcon(TDEIcon::Desktop);
     if (!name.isNull()) {
         iconName = name;
-        icon_button->setPixmap(loader->loadIcon(name, KIcon::Desktop));
+        icon_button->setPixmap(loader->loadIcon(name, TDEIcon::Desktop));
     }
 }
 
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index d9168924..1fe346aa 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -84,7 +84,7 @@ void AddExistingDirectoriesDialog::init()
 {
 	progressBar->hide();
 
-	importView->setMode ( KIconView::Select );
+	importView->setMode ( TDEIconView::Select );
     importView->setItemsMovable ( false );
 
 	connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) );
diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp
index 0c3796d9..5e6be576 100644
--- a/buildtools/autotools/addexistingfilesdlg.cpp
+++ b/buildtools/autotools/addexistingfilesdlg.cpp
@@ -125,7 +125,7 @@ void AddExistingFilesDialog::init()
 {
 	progressBar->hide();
 
-	importView->setMode ( KIconView::Select );
+	importView->setMode ( TDEIconView::Select );
     importView->setItemsMovable ( false );
 
 	connect ( okButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotOk () ) );
diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp
index 2f1ab292..965d3b4e 100644
--- a/buildtools/autotools/addicondlg.cpp
+++ b/buildtools/autotools/addicondlg.cpp
@@ -88,7 +88,7 @@ void AddIconDialog::accept()
     TQString destpath = destdir + "/" + name;
 
     TQString size = size_combo->currentText();
-    TQString unknown = KIconTheme::defaultThemeName()+ "/" + size + "x" + size + "/mimetypes/unknown.png";
+    TQString unknown = TDEIconTheme::defaultThemeName()+ "/" + size + "x" + size + "/mimetypes/unknown.png";
 
     TQString templateFileName = locate("icon", unknown);
     kdDebug(9020) << "Unknown: " << unknown << ", template: " << templateFileName << endl;
diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp
index 7576741e..e8e47c98 100644
--- a/buildtools/autotools/addservicedlg.cpp
+++ b/buildtools/autotools/addservicedlg.cpp
@@ -93,11 +93,11 @@ void AddServiceDialog::updateProperties()
 
 void AddServiceDialog::iconClicked()
 {
-    KIconLoader *loader = AutoProjectFactory::instance()->iconLoader();
-    TQString name = KIconDialog::getIcon(KIcon::Desktop);
+    TDEIconLoader *loader = AutoProjectFactory::instance()->iconLoader();
+    TQString name = TDEIconDialog::getIcon(TDEIcon::Desktop);
     if (!name.isNull()) {
         iconName = name;
-        icon_button->setPixmap(loader->loadIcon(name, KIcon::Desktop));
+        icon_button->setPixmap(loader->loadIcon(name, TDEIcon::Desktop));
     }
 }
 
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index 39f2fde6..1f63b870 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -193,14 +193,14 @@ CustomProjectPart::~CustomProjectPart()
 void CustomProjectPart::projectConfigWidget( KDialogBase *dlg )
 {
     TQVBox *vbox;
-    vbox = dlg->addVBoxPage( i18n( "Custom Manager" ), i18n( "Custom Manager" ), BarIcon( "make", KIcon::SizeMedium ) );
+    vbox = dlg->addVBoxPage( i18n( "Custom Manager" ), i18n( "Custom Manager" ), BarIcon( "make", TDEIcon::SizeMedium ) );
     CustomManagerWidget *w0 = new CustomManagerWidget( this, vbox );
     connect( dlg, TQT_SIGNAL( okClicked() ), w0, TQT_SLOT( accept() ) );
 
-    vbox = dlg->addVBoxPage( i18n( "Run Options" ), i18n( "Run Options" ), BarIcon( "make", KIcon::SizeMedium ) );
+    vbox = dlg->addVBoxPage( i18n( "Run Options" ), i18n( "Run Options" ), BarIcon( "make", TDEIcon::SizeMedium ) );
     RunOptionsWidget *w1 = new RunOptionsWidget( *projectDom(), "/kdevcustomproject", buildDirectory(), vbox );
     connect( dlg, TQT_SIGNAL( okClicked() ), w1, TQT_SLOT( accept() ) );
-    vbox = dlg->addVBoxPage( i18n( "Build Options" ), i18n( "Build Options" ), BarIcon( "make", KIcon::SizeMedium ) );
+    vbox = dlg->addVBoxPage( i18n( "Build Options" ), i18n( "Build Options" ), BarIcon( "make", TDEIcon::SizeMedium ) );
     TQTabWidget *buildtab = new TQTabWidget( vbox );
 
     CustomBuildOptionsWidget *w2 = new CustomBuildOptionsWidget( *projectDom(), buildtab );
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index f1ee2758..3c5cddcd 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -400,7 +400,7 @@ void PascalProjectPart::projectConfigWidget( KDialogBase * dlg )
     connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
     connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) );
 
-    vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", KIcon::SizeMedium ));
+    vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", TDEIcon::SizeMedium ));
     RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevpascalproject", buildDirectory(), vbox);
     connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) );
 
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index 4f125d68..6a84b9fc 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -270,13 +270,13 @@ TQString TrollProjectPart::makeEnvironment()
 void TrollProjectPart::projectConfigWidget(KDialogBase *dlg)
 {
     TQVBox *vbox;
-    vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", KIcon::SizeMedium ));
+    vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", TDEIcon::SizeMedium ));
     RunOptionsWidget *optdlg = new RunOptionsWidget(*projectDom(), "/kdevtrollproject", buildDirectory(), vbox);
 
-    vbox = dlg->addVBoxPage(i18n("Make Options"), i18n("Make Options"), BarIcon( "make", KIcon::SizeMedium ));
+    vbox = dlg->addVBoxPage(i18n("Make Options"), i18n("Make Options"), BarIcon( "make", TDEIcon::SizeMedium ));
     MakeOptionsWidget *w4 = new MakeOptionsWidget(*projectDom(), "/kdevtrollproject", vbox);
 
-    vbox = dlg->addVBoxPage(i18n("TQMake Manager"), i18n("TQMake Manager"), BarIcon( "make", KIcon::SizeMedium ));
+    vbox = dlg->addVBoxPage(i18n("TQMake Manager"), i18n("TQMake Manager"), BarIcon( "make", TDEIcon::SizeMedium ));
     QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox);
 
 
diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp
index bd9c0747..89c38abb 100644
--- a/buildtools/script/scriptprojectpart.cpp
+++ b/buildtools/script/scriptprojectpart.cpp
@@ -72,7 +72,7 @@ ScriptProjectPart::~ScriptProjectPart()
 void ScriptProjectPart::projectConfigWidget(KDialogBase *dlg)
 {
     TQVBox *vbox;
-    vbox = dlg->addVBoxPage(i18n("Script Project Options"), i18n("Script Project Options"), BarIcon("tdevelop", KIcon::SizeMedium));
+    vbox = dlg->addVBoxPage(i18n("Script Project Options"), i18n("Script Project Options"), BarIcon("tdevelop", TDEIcon::SizeMedium));
     ScriptOptionsWidget *w = new ScriptOptionsWidget(this, vbox);
     connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }
diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook
index ca503917..78a9f60c 100644
--- a/doc/kde_app_devel/index.docbook
+++ b/doc/kde_app_devel/index.docbook
@@ -1126,7 +1126,7 @@ and capable of more functionality than what Qt alone is offering. The tdeui libr
 TDEListView: a more powerful version of <classname>QListView</classname>
 </para></listitem>
 <listitem><para>
-KIconView: a graphical viewer of icon files
+TDEIconView: a graphical viewer of icon files
 </para></listitem>
 </orderedlist>
 </para>
diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook
index 7f035d77..7cd28837 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/kdearch/index.docbook
@@ -311,15 +311,15 @@ Image processing - icon loading and manipulating.
 
 <itemizedlist>
 
-<listitem><formalpara><title><ulink url="kdeapi:tdecore/KIconLoader">KIconLoader</ulink></title>
+<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEIconLoader">TDEIconLoader</ulink></title>
 <para>
 Loads icons in a theme-conforming way.
 </para>
 </formalpara></listitem>
 
-<listitem><formalpara><title><ulink url="kdeapi:tdecore/KIconTheme">KIconTheme</ulink></title>
+<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEIconTheme">TDEIconTheme</ulink></title>
 <para>
-Helper classes for KIconLoader.
+Helper classes for TDEIconLoader.
 </para>
 </formalpara></listitem>
 
@@ -413,7 +413,7 @@ A variant of <classname>QListBox</classname> that honors KDE's system-wide setti
 </para>
 </formalpara></listitem>
 
-<listitem><formalpara><title><ulink url="kdeapi:tdeui/TDEListView">KIconView</ulink></title>
+<listitem><formalpara><title><ulink url="kdeapi:tdeui/TDEListView">TDEIconView</ulink></title>
 <para>
 A variant of <classname>QIconView</classname> that honors KDE's system-wide settings.
 </para>
@@ -512,7 +512,7 @@ A font selection dialog.
 </para>
 </formalpara></listitem>
 
-<listitem><formalpara><title><ulink url="kdeapi:tdefile/KIconDialog">KIconDialog</ulink></title>
+<listitem><formalpara><title><ulink url="kdeapi:tdefile/TDEIconDialog">TDEIconDialog</ulink></title>
 <para>
 An icon selection dialog.
 </para>
diff --git a/doc/tdevelop/project-management.docbook b/doc/tdevelop/project-management.docbook
index 8c38d9d7..c6670448 100644
--- a/doc/tdevelop/project-management.docbook
+++ b/doc/tdevelop/project-management.docbook
@@ -494,7 +494,7 @@ When you &RMB; click on a <emphasis>file name</emphasis> in the detail view the
     The <guimenuitem>CVS</guimenuitem> item offers a variety of CVS operations on the file.
     </para></listitem>
     <listitem><para>
-    The <guimenuitem>Open With</guimenuitem> item allows you to open the file with a variety of editors or with any application at all (&eg; you can open the icon file in our example with <application>KIcon</application>).
+    The <guimenuitem>Open With</guimenuitem> item allows you to open the file with a variety of editors or with any application at all (&eg; you can open the icon file in our example with <application>TDEIcon</application>).
     </para></listitem>
     <listitem><para>
     The <guimenuitem>Perforce</guimenuitem> item is used for similar operations as in CVS using the commercial <quote><application>Perforce</application></quote> version control system.
diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp
index 4dffa96d..0ebe4136 100644
--- a/editors/editor-chooser/editorchooser_part.cpp
+++ b/editors/editor-chooser/editorchooser_part.cpp
@@ -32,7 +32,7 @@ EditorChooserPart::~EditorChooserPart()
 
 void EditorChooserPart::configWidget(KDialogBase *dlg)
 {
-  TQVBox *vbox = dlg->addVBoxPage(i18n("Editor"), i18n("Editor"), BarIcon("kate", KIcon::SizeMedium) );
+  TQVBox *vbox = dlg->addVBoxPage(i18n("Editor"), i18n("Editor"), BarIcon("kate", TDEIcon::SizeMedium) );
   EditorChooserWidget *w = new EditorChooserWidget(vbox);
   connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
 }
diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp
index 4ec0e94e..c9565118 100644
--- a/embedded/visualboyadvance/visualboyadvance_part.cpp
+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp
@@ -68,7 +68,7 @@ void VisualBoyAdvancePart::slotExecute(){
 
 void VisualBoyAdvancePart::projectConfigWidget(KDialogBase *dlg){
   TQVBox *vbox;
-  vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", KIcon::SizeMedium ));
+  vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", TDEIcon::SizeMedium ));
   VBAConfigWidget* w = new VBAConfigWidget(this,vbox);
   connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }
diff --git a/kdevdesigner/README b/kdevdesigner/README
index 33b906d9..99b55648 100644
--- a/kdevdesigner/README
+++ b/kdevdesigner/README
@@ -2,7 +2,7 @@ KDevDesigner is a port of Qt Designer (code taken from Qt 3.3 distribution) to K
 1) XML GUI
 2) KParts
 3) KFileDialog
-4) KIconLoader
+4) TDEIconLoader
 
 KDevDesigner consists of a part and a shell. 
 Part can be used in Konqueror and KDevelop to edit and view ui files and projects.
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index 5e672c41..f95b9e2c 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -253,7 +253,7 @@ void ProblemReporter::configure()
 void ProblemReporter::configWidget( KDialogBase* dlg )
 {
     kdDebug() << "ProblemReporter::configWidget()" << endl;
-    TQVBox *vbox = dlg->addVBoxPage(i18n("Ada Parsing"), i18n("Ada Parsing"),  BarIcon( "source", KIcon::SizeMedium ));
+    TQVBox *vbox = dlg->addVBoxPage(i18n("Ada Parsing"), i18n("Ada Parsing"),  BarIcon( "source", TDEIcon::SizeMedium ));
     ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox );
     connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
     connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure()));
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h
index 86776a53..f47140bf 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h
@@ -50,7 +50,7 @@ public:
     Kate::PluginConfigPage *configPage (uint , TQWidget *w, const char *name=0);
     TQString configPageName(uint) const { return i18n("%{APPNAME}"); };
     TQString configPageFullName(uint) const { return i18n("Configure KatePlugin%{APPNAME}"); };
-    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 slotInsertHello();
diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp
index 5cfd1342..d224123c 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4.cpp
@@ -53,7 +53,7 @@ void %{APPNAME}::setupActions()
     TDEStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
 
     // custom menu and menu item - the slot is in the class %{APPNAME}View
-    TDEAction *custom = new TDEAction(KIcon("colorize"), i18n("Swi&tch Colors"), this);
+    TDEAction *custom = new TDEAction(TDEIcon("colorize"), i18n("Swi&tch Colors"), this);
     actionCollection()->addAction( TQLatin1String("switch_action"), custom );
     connect(custom, TQT_SIGNAL(triggered(bool)), m_view, TQT_SLOT(switchColors()));
 }
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 57e5c757..a1ef51e6 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -436,7 +436,7 @@ void CppSupportPart::projectConfigWidget( KDialogBase* dlg )
 	TQVBox * vbox = 0;
 
 	vbox = dlg->addVBoxPage( i18n( "C++ Support" ), i18n( "C++ Support" ),
-	                         BarIcon( info() ->icon(), KIcon::SizeMedium ) );
+	                         BarIcon( info() ->icon(), TDEIcon::SizeMedium ) );
 	CCConfigWidget* w = new CCConfigWidget( this, vbox );
 	connect( dlg, TQT_SIGNAL( okClicked( ) ), w, TQT_SLOT( accept( ) ) );
 }
@@ -444,12 +444,12 @@ void CppSupportPart::projectConfigWidget( KDialogBase* dlg )
 void CppSupportPart::configWidget( KDialogBase *dlg )
 {
 	TQVBox * vbox = dlg->addVBoxPage( i18n( "C++ Class Generator" ), i18n( "C++ Class Generator" ),
-	                                 BarIcon( info() ->icon(), KIcon::SizeMedium ) );
+	                                 BarIcon( info() ->icon(), TDEIcon::SizeMedium ) );
 	ClassGeneratorConfig *w = new ClassGeneratorConfig( vbox, "classgenerator config widget" );
 	connect( dlg, TQT_SIGNAL( okClicked() ), w, TQT_SLOT( storeConfig() ) );
 
 	vbox = dlg->addVBoxPage(i18n("C++ Parsing"), i18n("C++ Parsing"),
-	                               BarIcon( "source_cpp", KIcon::SizeMedium) );
+	                               BarIcon( "source_cpp", TDEIcon::SizeMedium) );
 	ConfigureProblemReporter* ww = new ConfigureProblemReporter( vbox );
 	ww->setPart( this );
 	connect(dlg, TQT_SIGNAL(okClicked()), ww, TQT_SLOT(accept()));
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index a185ade9..e0fafa95 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -560,7 +560,7 @@ void DebuggerPart::contextEvaluate()
 
 void DebuggerPart::projectConfigWidget(KDialogBase *dlg)
 {
-    TQVBox *vbox = dlg->addVBoxPage(i18n("Debugger"), i18n("Debugger"), BarIcon( info()->icon(), KIcon::SizeMedium) );
+    TQVBox *vbox = dlg->addVBoxPage(i18n("Debugger"), i18n("Debugger"), BarIcon( info()->icon(), TDEIcon::SizeMedium) );
     DebuggerConfigWidget *w = new DebuggerConfigWidget(this, vbox, "debugger config widget");
     connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
     connect( dlg, TQT_SIGNAL(finished()), controller, TQT_SLOT(configure()) );
diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
index 960dcbe4..dbd05de9 100644
--- a/languages/fortran/fortransupportpart.cpp
+++ b/languages/fortran/fortransupportpart.cpp
@@ -157,7 +157,7 @@ void FortranSupportPart::slotFtnchek()
 
 void FortranSupportPart::projectConfigWidget(KDialogBase *dlg)
 {
-    TQVBox *vbox = dlg->addVBoxPage(i18n("Ftnchek"), i18n("Ftnchek"), BarIcon("tdevelop", KIcon::SizeMedium));
+    TQVBox *vbox = dlg->addVBoxPage(i18n("Ftnchek"), i18n("Ftnchek"), BarIcon("tdevelop", TDEIcon::SizeMedium));
     FtnchekConfigWidget *w = new FtnchekConfigWidget(*projectDom(), vbox, "ftnchek config widget");
     connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index 42abe30a..e240a813 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -208,7 +208,7 @@ void PHPSupportPart::slotConfigStored() {
 }
 
 void PHPSupportPart::projectConfigWidget(KDialogBase *dlg) {
-   TQVBox *vbox = dlg->addVBoxPage(i18n( "PHP Specific" ), i18n("PHP Settings"), BarIcon( "source", KIcon::SizeMedium ));
+   TQVBox *vbox = dlg->addVBoxPage(i18n( "PHP Specific" ), i18n("PHP Settings"), BarIcon( "source", TDEIcon::SizeMedium ));
    PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget");
    connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 9a85f065..35358313 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -73,7 +73,7 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr
   kdDebug() << "Creating RubySupportPart" << endl;
 
   m_shellWidget = new KDevShellWidget( 0, "irb console");
-  m_shellWidget->setIcon( SmallIcon("ruby_config.png", KIcon::SizeMedium, KIcon::DefaultState, RubySupportPart::instance()));
+  m_shellWidget->setIcon( SmallIcon("ruby_config.png", TDEIcon::SizeMedium, TDEIcon::DefaultState, RubySupportPart::instance()));
   m_shellWidget->setCaption(i18n("Ruby Shell"));
   mainWindow()->embedOutputView( m_shellWidget, i18n("Ruby Shell"), i18n("Ruby Shell"));
   mainWindow()->raiseView( m_shellWidget );
@@ -99,7 +99,7 @@ RubySupportPart::~RubySupportPart()
 
 void RubySupportPart::projectConfigWidget(KDialogBase *dlg)
 {
-    TQVBox *vbox = dlg->addVBoxPage(i18n("Ruby"), i18n("Ruby"), BarIcon("ruby_config.png", KIcon::SizeMedium, KIcon::DefaultState, RubySupportPart::instance()));
+    TQVBox *vbox = dlg->addVBoxPage(i18n("Ruby"), i18n("Ruby"), BarIcon("ruby_config.png", TDEIcon::SizeMedium, TDEIcon::DefaultState, RubySupportPart::instance()));
     RubyConfigWidget *w = new RubyConfigWidget(*projectDom(), (TQWidget *)vbox, "ruby config widget");
     connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index f61c6bea..5b0d6d20 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -132,7 +132,7 @@ void SQLSupportPart::loadConfig()
 
 void SQLSupportPart::projectConfigWidget( KDialogBase *dlg )
 {
-    TQVBox *vbox = dlg->addVBoxPage( TQString( "SQL" ), i18n( "Specify Your Database Connections" ), BarIcon("source", KIcon::SizeMedium) );
+    TQVBox *vbox = dlg->addVBoxPage( TQString( "SQL" ), i18n( "Specify Your Database Connections" ), BarIcon("source", TDEIcon::SizeMedium) );
     SqlConfigWidget *w = new SqlConfigWidget( (TQWidget*)vbox, "SQL config widget" );
     w->setProjectDom( projectDom() );
     w->loadConfig();
diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp
index 3396adfd..bea1c79a 100644
--- a/lib/util/configwidgetproxy.cpp
+++ b/lib/util/configwidgetproxy.cpp
@@ -62,7 +62,7 @@ void ConfigWidgetProxy::slotConfigWidget( KDialogBase * dlg )
 	TitleMap::Iterator it = _globalTitleMap.begin();
 	while ( it != _globalTitleMap.end() )
 	{
-		_pageMap.insert( dlg->addVBoxPage( it.data().first, it.data().first, BarIcon( it.data().second, KIcon::SizeMedium ) ), it.key() );
+		_pageMap.insert( dlg->addVBoxPage( it.data().first, it.data().first, BarIcon( it.data().second, TDEIcon::SizeMedium ) ), it.key() );
 		++it;
 	}
 
@@ -75,7 +75,7 @@ void ConfigWidgetProxy::slotProjectConfigWidget( KDialogBase * dlg )
 	TitleMap::Iterator it = _projectTitleMap.begin();
 	while ( it != _projectTitleMap.end() )
 	{
-		_pageMap.insert( dlg->addVBoxPage( it.data().first, it.data().first, BarIcon( it.data().second, KIcon::SizeMedium ) ), it.key() );
+		_pageMap.insert( dlg->addVBoxPage( it.data().first, it.data().first, BarIcon( it.data().second, TDEIcon::SizeMedium ) ), it.key() );
 		++it;
 	}
 	
diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp
index fc45f704..ec749bd2 100644
--- a/lib/widgets/kdevtabwidget.cpp
+++ b/lib/widgets/kdevtabwidget.cpp
@@ -30,7 +30,7 @@ KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name)
 {
   m_pPopupMenu = new TQPopupMenu(this);
 
-  TQPixmap closePixmap = TDEGlobal::instance()->iconLoader()->loadIcon( "tab_remove", KIcon::Small, 0, KIcon::DefaultState, 0, true ); 
+  TQPixmap closePixmap = TDEGlobal::instance()->iconLoader()->loadIcon( "tab_remove", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true ); 
   if (closePixmap.isNull())
     closePixmap = SmallIcon("fileclose");
 
diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 197457eb..2b69c7d5 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -241,7 +241,7 @@ TQString AbbrevPart::currentWord() const
 
 void AbbrevPart::configWidget(KDialogBase *dlg)
 {
-	TQVBox *vbox = dlg->addVBoxPage(i18n("Abbreviations"), i18n("Abbreviations"), BarIcon( info()->icon(), KIcon::SizeMedium) );
+	TQVBox *vbox = dlg->addVBoxPage(i18n("Abbreviations"), i18n("Abbreviations"), BarIcon( info()->icon(), TDEIcon::SizeMedium) );
     AbbrevConfigWidget *w = new AbbrevConfigWidget(this, vbox, "abbrev config widget");
     connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
 }
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 76ac124c..8b841371 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -1112,7 +1112,7 @@ void AppWizardDialog::addFavourite(TQListViewItem* item, TQString favouriteName)
 
 	if(!info->favourite)
 	{
-		info->favourite = new KIconViewItem(favourites_iconview,
+		info->favourite = new TDEIconViewItem(favourites_iconview,
 											((favouriteName=="")?info->name:favouriteName),
 											DesktopIcon("tdevelop"));
 
diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui
index 891c1c10..a8071f83 100644
--- a/parts/appwizard/appwizarddlgbase.ui
+++ b/parts/appwizard/appwizarddlgbase.ui
@@ -110,7 +110,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="KIconView" row="0" column="0">
+                        <widget class="TDEIconView" row="0" column="0">
                             <property name="name">
                                 <cstring>favourites_iconview</cstring>
                             </property>
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index 43ccfa18..845352fb 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -39,37 +39,37 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
 
     parents_button = new TQToolButton(this);
-    parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) );
+    parents_button->setPixmap( UserIcon("CTparents", TDEIcon::DefaultState, ClassViewFactory::instance()) );
     parents_button->setToggleButton(true);
     parents_button->setFixedSize(parents_button->sizeHint());
     TQToolTip::add(parents_button, i18n("Show parents"));
 
     children_button = new TQToolButton(this);
-    children_button->setPixmap( UserIcon("CTchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
+    children_button->setPixmap( UserIcon("CTchildren", TDEIcon::DefaultState, ClassViewFactory::instance()) );
     children_button->setToggleButton(true);
     children_button->setFixedSize(children_button->sizeHint());
     TQToolTip::add(children_button, i18n("Show children"));
 
     clients_button = new TQToolButton(this);
-    clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) );
+    clients_button->setPixmap( UserIcon("CTclients", TDEIcon::DefaultState, ClassViewFactory::instance()) );
     clients_button->setToggleButton(true);
     clients_button->setFixedSize(clients_button->sizeHint());
     TQToolTip::add(clients_button, i18n("Show clients"));
 
     suppliers_button = new TQToolButton(this);
-    suppliers_button->setPixmap( UserIcon("CTsuppliers", KIcon::DefaultState, ClassViewFactory::instance()) );
+    suppliers_button->setPixmap( UserIcon("CTsuppliers", TDEIcon::DefaultState, ClassViewFactory::instance()) );
     suppliers_button->setToggleButton(true);
     suppliers_button->setFixedSize(suppliers_button->sizeHint());
     TQToolTip::add(suppliers_button, i18n("Show suppliers"));
 
     methods_button = new TQToolButton(this);
-    methods_button->setPixmap( UserIcon("CVpublic_meth", KIcon::DefaultState, ClassViewFactory::instance()) );
+    methods_button->setPixmap( UserIcon("CVpublic_meth", TDEIcon::DefaultState, ClassViewFactory::instance()) );
     methods_button->setToggleButton(true);
     methods_button->setFixedSize(methods_button->sizeHint());
     TQToolTip::add(methods_button, i18n("Show methods"));
 
     attributes_button = new TQToolButton(this);
-    attributes_button->setPixmap( UserIcon("CVpublic_var", KIcon::DefaultState, ClassViewFactory::instance()) );
+    attributes_button->setPixmap( UserIcon("CVpublic_var", TDEIcon::DefaultState, ClassViewFactory::instance()) );
     attributes_button->setToggleButton(true);
     attributes_button->setFixedSize(attributes_button->sizeHint());
     TQToolTip::add(attributes_button, i18n("Show attributes"));
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index 8af0efc8..d6d75974 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -142,7 +142,7 @@ void ClassTreeOrganizerItem::init()
 void ClassTreeScopeItem::init()
 {
     setExpandable(true);
-    setPixmap(0, UserIcon("CVnamespace", KIcon::DefaultState, ClassViewFactory::instance()));
+    setPixmap(0, UserIcon("CVnamespace", TDEIcon::DefaultState, ClassViewFactory::instance()));
 }
 
 
@@ -217,7 +217,7 @@ void ClassTreeScopeItem::setOpen(bool o)
 void ClassTreeClassItem::init()
 {
     setExpandable(true);
-    setPixmap(0, UserIcon(m_isStruct ? "CVstruct" : "CVclass", KIcon::DefaultState, ClassViewFactory::instance()));
+    setPixmap(0, UserIcon(m_isStruct ? "CVstruct" : "CVclass", TDEIcon::DefaultState, ClassViewFactory::instance()));
 }
 
 
@@ -302,7 +302,7 @@ ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *parent, ClassTreeItem *l
     else
         icon = "CVglobal_meth";
 
-    setPixmap(0, UserIcon(icon, KIcon::DefaultState, ClassViewFactory::instance()));
+    setPixmap(0, UserIcon(icon, TDEIcon::DefaultState, ClassViewFactory::instance()));
 }
 
 TQString ClassTreeMethodItem::text( int ) const
@@ -356,7 +356,7 @@ ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastS
     else
         icon = "CVglobal_var";
 
-    setPixmap(0, UserIcon(icon, KIcon::DefaultState, ClassViewFactory::instance()));
+    setPixmap(0, UserIcon(icon, TDEIcon::DefaultState, ClassViewFactory::instance()));
 }
 
 
@@ -380,7 +380,7 @@ ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *l
 
     //need a icon for scripts
     icon = "CVpublic_var";
-    setPixmap(0, UserIcon(icon, KIcon::DefaultState, ClassViewFactory::instance()));
+    setPixmap(0, UserIcon(icon, TDEIcon::DefaultState, ClassViewFactory::instance()));
 }
 
 
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index de025d7b..89c0db1e 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -948,7 +948,7 @@ void FolderBrowserItem::setup( )
 void NamespaceDomBrowserItem::setup( )
 {
     ClassViewItem::setup();
-    setPixmap( 0, UserIcon("CVnamespace", KIcon::DefaultState, listView()->m_part->instance()) );
+    setPixmap( 0, UserIcon("CVnamespace", TDEIcon::DefaultState, listView()->m_part->instance()) );
     setExpandable( true );
 
     TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
@@ -958,7 +958,7 @@ void NamespaceDomBrowserItem::setup( )
 void ClassDomBrowserItem::setup( )
 {
     ClassViewItem::setup();
-    setPixmap( 0, UserIcon("CVclass", KIcon::DefaultState, listView()->m_part->instance()) );
+    setPixmap( 0, UserIcon("CVclass", TDEIcon::DefaultState, listView()->m_part->instance()) );
     setExpandable( true );
 
     TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
@@ -968,7 +968,7 @@ void ClassDomBrowserItem::setup( )
 void TypeAliasDomBrowserItem::setup( )
 {
     ClassViewItem::setup();
-    setPixmap( 0, UserIcon("CVtypedef", KIcon::DefaultState, listView()->m_part->instance()) );
+    setPixmap( 0, UserIcon("CVtypedef", TDEIcon::DefaultState, listView()->m_part->instance()) );
     setExpandable( false );
 
     TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
@@ -996,7 +996,7 @@ void FunctionDomBrowserItem::setup( )
     else
         iconName = "CVpublic_" + methodType;
 
-    setPixmap( 0, UserIcon(iconName, KIcon::DefaultState, listView()->m_part->instance()) );
+    setPixmap( 0, UserIcon(iconName, TDEIcon::DefaultState, listView()->m_part->instance()) );
 
     TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
     
@@ -1058,7 +1058,7 @@ void VariableDomBrowserItem::setup( )
     else
         iconName = "CVpublic_var";
 
-    setPixmap( 0, UserIcon(iconName, KIcon::DefaultState, listView()->m_part->instance()) );
+    setPixmap( 0, UserIcon(iconName, TDEIcon::DefaultState, listView()->m_part->instance()) );
 
     TQString txt = listView()->m_part->languageSupport()->formatModelItem(m_dom.data(), true);
     setText( 0, txt );
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index 389b1d6f..939dbdaf 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -94,7 +94,7 @@ public:
     virtual void setup()
     {
         FancyListViewItem::setup();
-        setPixmap( 0, UserIcon("CVpublic_meth", KIcon::DefaultState, m_part->instance()) );
+        setPixmap( 0, UserIcon("CVpublic_meth", TDEIcon::DefaultState, m_part->instance()) );
     }
     Type type() { return m_type; }
 
diff --git a/parts/classview/viewcombos.cpp b/parts/classview/viewcombos.cpp
index cf8b278e..52afd26f 100644
--- a/parts/classview/viewcombos.cpp
+++ b/parts/classview/viewcombos.cpp
@@ -49,7 +49,7 @@ NamespaceDom NamespaceItem::dom() const
 void NamespaceItem::setup()
 {
     TQListViewItem::setup();
-    setPixmap( 0, UserIcon("CVnamespace", KIcon::DefaultState, m_part->instance()) );
+    setPixmap( 0, UserIcon("CVnamespace", TDEIcon::DefaultState, m_part->instance()) );
 }
 
 
@@ -75,7 +75,7 @@ ClassDom ClassItem::dom() const
 void ClassItem::setup()
 {
     TQListViewItem::setup();
-    setPixmap( 0, UserIcon("CVclass", KIcon::DefaultState, m_part->instance()) );
+    setPixmap( 0, UserIcon("CVclass", TDEIcon::DefaultState, m_part->instance()) );
 }
 
 
@@ -108,7 +108,7 @@ void FunctionItem::setup()
         iconName = "CVprotected_meth";
     else
         iconName = "CVpublic_meth";
-    setPixmap( 0, UserIcon(iconName, KIcon::DefaultState, m_part->instance()) );
+    setPixmap( 0, UserIcon(iconName, TDEIcon::DefaultState, m_part->instance()) );
 }
 
 
@@ -120,7 +120,7 @@ void refreshNamespaces(ClassViewPart *part, KComboView *view)
 
     NamespaceItem *global_item = new NamespaceItem( part, view->listView(), i18n("(Global Namespace)"), part->codeModel()->globalNamespace() );
     view->addItem(global_item);
-    global_item->setPixmap( 0, UserIcon("CVnamespace", KIcon::DefaultState, part->instance()) );
+    global_item->setPixmap( 0, UserIcon("CVnamespace", TDEIcon::DefaultState, part->instance()) );
     NamespaceList namespaces = part->codeModel()->globalNamespace()->namespaceList();
     for (NamespaceList::const_iterator it = namespaces.begin(); it != namespaces.end(); ++it)
     {
diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui
index 9d97d82b..e456e146 100644
--- a/parts/filecreate/fctypeeditbase.ui
+++ b/parts/filecreate/fctypeeditbase.ui
@@ -121,7 +121,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="KIconButton" row="0" column="2" rowspan="2" colspan="1">
+        <widget class="TDEIconButton" row="0" column="2" rowspan="2" colspan="1">
             <property name="name">
                 <cstring>icon_url</cstring>
             </property>
diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp
index d792ab26..6dd1e35a 100644
--- a/parts/filecreate/filecreate_listitem.cpp
+++ b/parts/filecreate/filecreate_listitem.cpp
@@ -82,10 +82,10 @@ namespace FileCreate {
     setText(0, m_filetype->ext()!="" ? TQString("." + m_filetype->ext()) : TQString("") );
     setText(1, "<qt><b>"+m_filetype->name()+"</b>. " + m_filetype->descr() );
 
-    KIconLoader * loader = TDEGlobal::iconLoader();
-    TQPixmap iconPix = loader->loadIcon(m_filetype->icon(), KIcon::Desktop,
-                                       KIcon::SizeMedium,
-                                       KIcon::DefaultState, NULL,
+    TDEIconLoader * loader = TDEGlobal::iconLoader();
+    TQPixmap iconPix = loader->loadIcon(m_filetype->icon(), TDEIcon::Desktop,
+                                       TDEIcon::SizeMedium,
+                                       TDEIcon::DefaultState, NULL,
                                        true);
     if (!iconPix.isNull()) {
       setPixmap(0, iconPix);
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 50009952..9b99c83a 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -120,7 +120,7 @@ void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, TQWidget * pag
 
 void FileCreatePart::slotAboutToShowNewPopupMenu()
 {
-	KIconLoader * m_iconLoader = TDEGlobal::iconLoader();
+	TDEIconLoader * m_iconLoader = TDEGlobal::iconLoader();
 	m_newPopupMenu->clear();
 	delete m_subPopups;
 	m_subPopups = NULL;
@@ -133,8 +133,8 @@ void FileCreatePart::slotAboutToShowNewPopupMenu()
 			if (filetype->subtypes().count()==0)
 			{
 				TQPixmap iconPix = m_iconLoader->loadIcon(
-					filetype->icon(), KIcon::Desktop, KIcon::SizeSmall,
-					KIcon::DefaultState, NULL, true);
+					filetype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall,
+					TDEIcon::DefaultState, NULL, true);
 				m_newPopupMenu->insertItem(iconPix, filetype->name(), this,
 					TQT_SLOT(slotNewFilePopup(int)), 0, ++id );
 				m_newPopupMenu->setItemParameter( id, (long)filetype );
@@ -148,8 +148,8 @@ void FileCreatePart::slotAboutToShowNewPopupMenu()
 						if( !subMenu )
 							subMenu = new TDEPopupMenu(0,0);
 						TQPixmap iconPix = m_iconLoader->loadIcon(
-							subtype->icon(), KIcon::Desktop, KIcon::SizeSmall,
-							KIcon::DefaultState, NULL, true);
+							subtype->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall,
+							TDEIcon::DefaultState, NULL, true);
 						subMenu->insertItem(iconPix, subtype->name(), this,
 							TQT_SLOT(slotNewFilePopup(int)), 0, ++id );
 						subMenu->setItemParameter( id, (long)subtype );
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index 59ec1a33..57fbe8f3 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -130,8 +130,8 @@ namespace FileCreate {
     item(row,1)->setWordWrap(true);
     item(row,3)->setWordWrap(true);
     //setRowStretchable(row,true);
-    TQPixmap iconPix = m_iconLoader->loadIcon(filetype->icon(), KIcon::Desktop, KIcon::SizeMedium,
-					     KIcon::DefaultState, NULL,
+    TQPixmap iconPix = m_iconLoader->loadIcon(filetype->icon(), TDEIcon::Desktop, TDEIcon::SizeMedium,
+					     TDEIcon::DefaultState, NULL,
 					     true);
     if (!iconPix.isNull()) {
       setPixmap(row, 0, iconPix);
diff --git a/parts/filecreate/filecreate_widget2.h b/parts/filecreate/filecreate_widget2.h
index 027333c9..217d37ce 100644
--- a/parts/filecreate/filecreate_widget2.h
+++ b/parts/filecreate/filecreate_widget2.h
@@ -20,7 +20,7 @@
 
 #include "filecreate_typechooser.h"
 
-class KIconLoader;
+class TDEIconLoader;
 class KDevProject;
 class FileCreatePart;
 
@@ -79,7 +79,7 @@ namespace FileCreate {
 	/**
 	 * The default icon loader, here for convenience.
 	 */
-	KIconLoader * m_iconLoader;
+	TDEIconLoader * m_iconLoader;
 	/**
 	 * A mapping of each row number to a file type.
 	 */
diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp
index 9e6b1fdd..16ab77bd 100644
--- a/parts/filelist/filelist_item.cpp
+++ b/parts/filelist/filelist_item.cpp
@@ -26,7 +26,7 @@ FileListItem::FileListItem( TQListView * parent, KURL const & url, DocumentState
 
 {
 	KFileItem fileItem( KFileItem::Unknown, KFileItem::Unknown, _url );
-    _icon = fileItem.pixmap(KIcon::SizeSmall);
+    _icon = fileItem.pixmap(TDEIcon::SizeSmall);
     setState( state );
 }
 
@@ -64,7 +64,7 @@ void FileListItem::setState( DocumentState state )
 
 void FileListItem::setHeight( int )
 {
-	TQListViewItem::setHeight( KIcon::SizeSmall > listView()->fontMetrics().height() ? KIcon::SizeSmall : listView()->fontMetrics().height() );
+	TQListViewItem::setHeight( TDEIcon::SizeSmall > listView()->fontMetrics().height() ? TDEIcon::SizeSmall : listView()->fontMetrics().height() );
 }
 
 void FileListItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int align )
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index a98200ed..ca0f1265 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -82,7 +82,7 @@ void FileSelectorPart::slotProjectOpened()
 
 void FileSelectorPart::slotConfigWidget( KDialogBase * dlg )
 {
-	TQVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), KIcon::SizeMedium) );
+	TQVBox* vbox = dlg->addVBoxPage( i18n("File Selector"), i18n("File Selector"), BarIcon( info()->icon(), TDEIcon::SizeMedium) );
     KFSConfigPage* page = new KFSConfigPage( vbox, 0, m_filetree );
     connect( dlg, TQT_SIGNAL( okClicked( ) ), page, TQT_SLOT( apply( ) ) );
     // ### implement reload
diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp
index 598fe496..a4c75543 100644
--- a/parts/fileselector/tdeactionselector.cpp
+++ b/parts/fileselector/tdeactionselector.cpp
@@ -61,7 +61,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() );
diff --git a/parts/fileselector/tdeactionselector.h b/parts/fileselector/tdeactionselector.h
index a1c26394..c1d03486 100644
--- a/parts/fileselector/tdeactionselector.h
+++ b/parts/fileselector/tdeactionselector.h
@@ -113,7 +113,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
@@ -272,7 +272,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 );
   
diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp
index 06322e38..13c5080f 100644
--- a/parts/fileview/filetreewidget.cpp
+++ b/parts/fileview/filetreewidget.cpp
@@ -120,7 +120,7 @@ void FileTreeWidget::openDirectory( const TQString& dirName )
     addProjectFiles( m_part->project()->allFiles(), true );
 
     KURL url = KURL::fromPathOrURL( dirName );
-    const TQPixmap& pix = KMimeType::mimeType("inode/directory")->pixmap( KIcon::Small );
+    const TQPixmap& pix = KMimeType::mimeType("inode/directory")->pixmap( TDEIcon::Small );
 
     // this is a bit odd, but the order of these calls seems to be important
     //FileTreeBranch *b = new FileTreeBranch( this, url, url.prettyURL(), pix );
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index 9707f4e8..fe7bdc30 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -97,7 +97,7 @@ TDEAboutData* SnippetPart::aboutData()
  */
 void SnippetPart::slotConfigWidget( KDialogBase *dlg )
 {
-  TQVBox *vbox = dlg->addVBoxPage( i18n("Code Snippets"), i18n("Code Snippets"), BarIcon( info()->icon(), KIcon::SizeMedium ) );
+  TQVBox *vbox = dlg->addVBoxPage( i18n("Code Snippets"), i18n("Code Snippets"), BarIcon( info()->icon(), TDEIcon::SizeMedium ) );
 
   SnippetSettings * w = new SnippetSettings( m_widget, vbox );
 
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index 44859d6c..445130e2 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -54,7 +54,7 @@ void KDevIDEExtension::init()
 void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg)
 {
     TDEConfig* config = kapp->config();
-    TQVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("tdevelop", KIcon::SizeMedium) );
+    TQVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("tdevelop", TDEIcon::SizeMedium) );
     gsw = new SettingsWidget(vbox, "general settings widget");
 
     gsw->projectsURL->setMode((int)KFile::Directory);
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 70fff792..f28195e4 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -149,7 +149,7 @@ void ProjectManager::slotProjectOptions()
                   KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, TopLevel::getInstance()->main(),
                   "project options dialog");
 
-	TQVBox *box = dlg.addVBoxPage( i18n("General"), i18n("General"), BarIcon( "tdevelop", KIcon::SizeMedium ) );
+	TQVBox *box = dlg.addVBoxPage( i18n("General"), i18n("General"), BarIcon( "tdevelop", TDEIcon::SizeMedium ) );
     GeneralInfoWidget *g = new GeneralInfoWidget(*API::getInstance()->projectDom(), box, "general informations widget");
     connect (&dlg, TQT_SIGNAL(okClicked()), g, TQT_SLOT(accept()));
 
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index 936ec2cd..aaf197b0 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -129,7 +129,7 @@ void CvsServicePart::init()
     connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
         this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
 
-    m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", KIcon::DefaultState, CvsFactory::instance()) );
+    m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) );
     TQWhatsThis::add( m_impl->processWidget(), i18n("<b>CVS</b><p>Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") );
     m_impl->processWidget()->setCaption(i18n("CvsService Output"));
     mainWindow()->embedOutputView( m_impl->processWidget(), i18n("CvsService"), i18n("cvs output") );
@@ -276,7 +276,7 @@ void CvsServicePart::createNewProject( const TQString &dirName )
 
 void CvsServicePart::projectConfigWidget( KDialogBase *dlg )
 {
-	TQVBox *vbox = dlg->addVBoxPage( i18n("CvsService"), i18n("CvsService"), BarIcon( info()->icon(), KIcon::SizeMedium) );
+	TQVBox *vbox = dlg->addVBoxPage( i18n("CvsService"), i18n("CvsService"), BarIcon( info()->icon(), TDEIcon::SizeMedium) );
     CvsOptionsWidget *w = new CvsOptionsWidget( (TQWidget *)vbox, "cvs config widget" );
     connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }