Rename KIcon to enhance compatibility with KDE4

83 files changed, 251 insertions, 251 deletions

diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc
index 1314e0e6..7d1f5faa 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cc
@@ -728,22 +728,22 @@ PreferencesDialog::PreferencesDialog( TQWidget* parent, const char* name )
 {
     TQVBox *vbox;
 
-    vbox = addVBoxPage( i18n( "General"), i18n( "General"), BarIcon( "misc", KIcon::SizeMedium ));
+    vbox = addVBoxPage( i18n( "General"), i18n( "General"), BarIcon( "misc", TDEIcon::SizeMedium ));
     m_general = new GeneralTab( vbox );
 #ifdef HAVE_GL
-    vbox = addVBoxPage ( i18n( "Display" ), i18n( "Display" ), BarIcon( "tdescreensaver", KIcon::SizeMedium ));
+    vbox = addVBoxPage ( i18n( "Display" ), i18n( "Display" ), BarIcon( "tdescreensaver", TDEIcon::SizeMedium ));
     m_displaySettings = new DisplaySettingsTab( vbox );
 #endif
-    vbox = addVBoxPage( i18n( "Color Management"), i18n( "Color"), BarIcon( "colorize", KIcon::SizeMedium ));
+    vbox = addVBoxPage( i18n( "Color Management"), i18n( "Color"), BarIcon( "colorize", TDEIcon::SizeMedium ));
     m_colorSettings = new ColorSettingsTab( vbox );
 
-    vbox = addVBoxPage( i18n( "Performance"), i18n( "Performance"), BarIcon( "fork", KIcon::SizeMedium ));
+    vbox = addVBoxPage( i18n( "Performance"), i18n( "Performance"), BarIcon( "fork", TDEIcon::SizeMedium ));
     m_performanceSettings = new PerformanceTab ( vbox );
 
-    vbox = addVBoxPage ( i18n( "Tablet" ), i18n( "Tablet" ), BarIcon( "tablet", KIcon::SizeMedium ));
+    vbox = addVBoxPage ( i18n( "Tablet" ), i18n( "Tablet" ), BarIcon( "tablet", TDEIcon::SizeMedium ));
     m_tabletSettings = new TabletSettingsTab( vbox );
 
-    vbox = addVBoxPage ( i18n( "Grid" ), i18n( "Grid" ), BarIcon( "grid", KIcon::SizeMedium ));
+    vbox = addVBoxPage ( i18n( "Grid" ), i18n( "Grid" ), BarIcon( "grid", TDEIcon::SizeMedium ));
     m_gridSettings = new GridSettingsTab( vbox );
 
 }
diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc
index 0112ceb0..c6343f39 100644
--- a/chalk/ui/kis_filters_listview.cc
+++ b/chalk/ui/kis_filters_listview.cc
@@ -107,7 +107,7 @@ KisFiltersIconViewItem::~KisFiltersIconViewItem()
 // ------------------------------------------------
 
 KisFiltersListView::KisFiltersListView(TQWidget* parent, bool filterForAdjustmentLayers, const char* name)
-    : KIconView(parent, name)
+    : TDEIconView(parent, name)
     , m_original(0)
     , m_profile(0)
     , m_filterForAdjustmentLayers(filterForAdjustmentLayers)
@@ -116,7 +116,7 @@ KisFiltersListView::KisFiltersListView(TQWidget* parent, bool filterForAdjustmen
 }
 
 KisFiltersListView::KisFiltersListView(TQWidget * parent, const char * name, WFlags f, bool filterForAdjustmentLayers)
-    : KIconView(parent, name, f)
+    : TDEIconView(parent, name, f)
     , m_original(0)
     , m_profile(0)
     , m_filterForAdjustmentLayers(filterForAdjustmentLayers)
@@ -125,7 +125,7 @@ KisFiltersListView::KisFiltersListView(TQWidget * parent, const char * name, WFl
 }
 
 KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* parent, bool filterForAdjustmentLayers, const char * name)
-    : KIconView(parent, name)
+    : TDEIconView(parent, name)
     , m_original(0)
     , m_profile(0)
     , m_filterForAdjustmentLayers(filterForAdjustmentLayers)
@@ -140,7 +140,7 @@ KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* parent, bool
 }
 
 KisFiltersListView::KisFiltersListView(KisPaintDeviceSP device, TQWidget* parent, bool filterForAdjustmentLayers, const char * name)
-    : KIconView(parent, name)
+    : TDEIconView(parent, name)
     , m_original(device)
     , m_profile(0)
     , m_filterForAdjustmentLayers(filterForAdjustmentLayers)
diff --git a/chalk/ui/kis_filters_listview.h b/chalk/ui/kis_filters_listview.h
index 3b7fa77b..8d57bc87 100644
--- a/chalk/ui/kis_filters_listview.h
+++ b/chalk/ui/kis_filters_listview.h
@@ -102,7 +102,7 @@ private:
     KisFiltersThumbnailThread * m_thread;
 };
 
-class KisFiltersListView : public KIconView {
+class KisFiltersListView : public TDEIconView {
 
 public:
     explicit KisFiltersListView(TQWidget * parent = 0, const char * name = 0, WFlags f = 0, bool filterForAdjustmentLayers = false);
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index e5b8dea4..7e14dcf0 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -82,17 +82,17 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char
 
     TQToolTip::add(m_lst->bnProperties, i18n("Properties for layer"));
 
-    KIconLoader il( "chalk" );
+    TDEIconLoader il( "chalk" );
 
     list()->setPreviewsShown(true);
 
     list()->setFoldersCanBeActive(true);
 
-    list()->addProperty("visible", i18n("Visible"), loadPixmap("visible.png", il, KIcon::SizeSmallMedium),
-                                                      loadPixmap("novisible.png", il, KIcon::SizeSmallMedium), true);
+    list()->addProperty("visible", i18n("Visible"), loadPixmap("visible.png", il, TDEIcon::SizeSmallMedium),
+                                                      loadPixmap("novisible.png", il, TDEIcon::SizeSmallMedium), true);
 
-    list()->addProperty("locked", i18n("Locked"), loadPixmap("locked.png", il, KIcon::SizeSmallMedium),
-                                                    loadPixmap("unlocked.png", il, KIcon::SizeSmallMedium));
+    list()->addProperty("locked", i18n("Locked"), loadPixmap("locked.png", il, TDEIcon::SizeSmallMedium),
+                                                    loadPixmap("unlocked.png", il, TDEIcon::SizeSmallMedium));
 
 
     connect(list()->contextMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
@@ -588,10 +588,10 @@ void KisLayerBox::setUpdatesAndSignalsEnabled(bool enable)
 }
 
 
-TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const KIconLoader&
+TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const TDEIconLoader&
                                     il, int size)
 {
-    TQPixmap pixmap = il.loadIcon(filename, KIcon::NoGroup, size);
+    TQPixmap pixmap = il.loadIcon(filename, TDEIcon::NoGroup, size);
 
     if (pixmap.isNull())
         KMessageBox::error(0, i18n("Cannot find %1").arg(filename),
diff --git a/chalk/ui/kis_layerbox.h b/chalk/ui/kis_layerbox.h
index 9d05601f..fb93bb0f 100644
--- a/chalk/ui/kis_layerbox.h
+++ b/chalk/ui/kis_layerbox.h
@@ -33,7 +33,7 @@ class WdgLayerBox;
 class TQButton;
 class TQPainter;
 class TQWidget;
-class KIconLoader;
+class TDEIconLoader;
 class TDEPopupMenu;
 class KoDocumentEntry;
 class KisCompositeOp;
@@ -106,7 +106,7 @@ private slots:
 
 private:
     void updateUI();
-    TQPixmap loadPixmap(const TQString& filename, const KIconLoader& il, int size);
+    TQPixmap loadPixmap(const TQString& filename, const TDEIconLoader& il, int size);
     KisLayerList* list() const;
     void markModified(KisLayer *layer);
 
diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc
index daed3a14..b7045f16 100644
--- a/chalk/ui/kis_previewwidget.cc
+++ b/chalk/ui/kis_previewwidget.cc
@@ -85,17 +85,17 @@ KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name )
     , m_firstFilter(true)
     , m_firstZoom(true)
 {
-    btnZoomIn->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", KIcon::MainToolbar, 16 ));
+    btnZoomIn->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag+", TDEIcon::MainToolbar, 16 ));
     connect(btnZoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomIn()));
-    btnZoomOut->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", KIcon::MainToolbar, 16 ));
+    btnZoomOut->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag-", TDEIcon::MainToolbar, 16 ));
     connect(btnZoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOut()));
-    btnUpdate->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "reload", KIcon::MainToolbar, 16 ));
+    btnUpdate->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "reload", TDEIcon::MainToolbar, 16 ));
     connect(btnUpdate, TQT_SIGNAL(clicked()), this, TQT_SLOT(forceUpdate()));
 
     connect(radioBtnPreview, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setPreviewDisplayed(bool)));
 
     connect(checkBoxAutoUpdate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetAutoUpdate(bool)));
-    btnZoomOneToOne->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", KIcon::MainToolbar, 16 ));
+    btnZoomOneToOne->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "viewmag1", TDEIcon::MainToolbar, 16 ));
     connect(btnZoomOneToOne, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomOneToOne()));
 
     m_progress = new KisLabelProgress(frmProgress);
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc
index ca81d1b1..3e353484 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cc
@@ -51,19 +51,19 @@ VConfigureDlg::VConfigureDlg( KarbonView* parent )
 {
 	TQVBox * page = addVBoxPage(
 					   i18n( "Interface" ), i18n( "Interface" ),
-					   BarIcon( "misc", KIcon::SizeMedium ) );
+					   BarIcon( "misc", TDEIcon::SizeMedium ) );
 
 	m_interfacePage = new VConfigInterfacePage( parent, page );
 
 	page = addVBoxPage(
 			   i18n( "Misc" ), i18n( "Misc" ),
-			   BarIcon( "misc", KIcon::SizeMedium ) );
+			   BarIcon( "misc", TDEIcon::SizeMedium ) );
 
 	m_miscPage = new VConfigMiscPage( parent, page );
 
 	page = addVBoxPage(
 			   i18n( "Grid" ), i18n( "Grid" ),
-			   BarIcon( "grid", KIcon::SizeMedium ) );
+			   BarIcon( "grid", TDEIcon::SizeMedium ) );
 
 	m_gridPage = new VConfigGridPage( parent, page );
 
@@ -71,7 +71,7 @@ VConfigureDlg::VConfigureDlg( KarbonView* parent )
 
 	page = addVBoxPage(
 			   i18n( "Document" ), i18n( "Document Settings" ),
-			   BarIcon( "document", KIcon::SizeMedium ) );
+			   BarIcon( "document", TDEIcon::SizeMedium ) );
 
 	m_defaultDocPage = new VConfigDefaultPage( parent, page );
 	connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) );
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 56857f04..6272cc2b 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -357,9 +357,9 @@ VObjectListViewItem::update()
 	// set thumb preview, lock and visible pixmaps
 	setPixmap( 0, preview );
 	TQString s = ( m_object->state() == VObject::normal_locked || m_object->state() == VObject::hidden_locked ) ? "locked" : "unlocked";
-	setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) );
+	setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
 	s = ( m_object->state() == VObject::hidden || m_object->state() == VObject::hidden_locked ) ? "14_layer_novisible" : "14_layer_visible";
-	setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) );
+	setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
 }
 
 int 
@@ -414,9 +414,9 @@ VLayerListViewItem::update()
 	// set thumb preview, lock and visible pixmaps
 	setPixmap( 0, preview );
 	TQString s = ( m_layer->state() == VObject::normal_locked || m_layer->state() == VObject::hidden_locked ) ? "locked" : "unlocked";
-	setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) );
+	setPixmap( 1, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
 	s = ( m_layer->state() == VObject::normal || m_layer->state() == VObject::normal_locked ) ? "14_layer_visible" : "14_layer_novisible";
-	setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, KIcon::Small ) );
+	setPixmap( 2, *KarbonFactory::rServer()->cachePixmap( s, TDEIcon::Small ) );
 } // VLayerListViewItem::update
 
 void
@@ -1164,7 +1164,7 @@ VHistoryItem::init()
 	char buffer[70];
 	sprintf( buffer, "%064ld", ++g_lastKey );
 	m_key = buffer;
-	setPixmap( 0, TQPixmap( TDEGlobal::iconLoader()->iconPath( m_command->icon(), KIcon::Small ) ) );
+	setPixmap( 0, TQPixmap( TDEGlobal::iconLoader()->iconPath( m_command->icon(), TDEIcon::Small ) ) );
 	setText( 0, m_command->name() );
 } // VHistoryITem::init
 
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc
index ff17fdfd..5bf60993 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cc
@@ -126,7 +126,7 @@ VStyleDocker::mouseReleaseEvent( TQMouseEvent * )
 ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* parent )
 	: TQWidget( parent ), m_part( part )
 {
-	KIconLoader il;
+	TDEIconLoader il;
 
 	TQVBoxLayout* layout = new TQVBoxLayout( this );
 	layout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) );
diff --git a/karbon/render/vkopainter.cc b/karbon/render/vkopainter.cc
index 342fd031..503b2e57 100644
--- a/karbon/render/vkopainter.cc
+++ b/karbon/render/vkopainter.cc
@@ -625,7 +625,7 @@ VKoPainter::applyPattern( ArtSVP *svp, bool fill )
 
 	VPattern pat = fill ? m_fill->pattern() : m_stroke->pattern();
 	if( !pat.isValid() ) {
-		pat.load( TDEGlobal::iconLoader()->iconPath( "karbon.png", -KIcon::SizeMedium ) ); }
+		pat.load( TDEGlobal::iconLoader()->iconPath( "karbon.png", -TDEIcon::SizeMedium ) ); }
 		if( !pat.isValid() ) {
 			pat = *(dynamic_cast<VPattern *>(KarbonFactory::rServer()->patterns().getFirst() )) ;}
 
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index 50a81e15..13e037a1 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -116,8 +116,8 @@ ShadowPreview::paintEvent( TQPaintEvent* )
 	VColor color( VColor::rgb );
 
 	VFill fill;
-	KIconLoader il;
-	fill.pattern() = VPattern( il.iconPath( "karbon.png", KIcon::Small ) );
+	TDEIconLoader il;
+	fill.pattern() = VPattern( il.iconPath( "karbon.png", TDEIcon::Small ) );
 	fill.setType( VFill::patt );
 
 	p.newPath();
diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc
index 8f0c4fc3..d24e6956 100644
--- a/karbon/widgets/vgradienttabwidget.cc
+++ b/karbon/widgets/vgradienttabwidget.cc
@@ -130,8 +130,8 @@ void VGradientPreview::paintEvent( TQPaintEvent* )
 		gradient.setVector( KoPoint( 2 * ( width() / 3 ), height() / 3 ) );
 	}
 	VFill fill;
-	KIconLoader il;
-	fill.pattern() = VPattern( il.iconPath( "karbon.png", KIcon::Small ) );
+	TDEIconLoader il;
+	fill.pattern() = VPattern( il.iconPath( "karbon.png", TDEIcon::Small ) );
 	fill.setType( VFill::patt );
 	gp.setBrush( fill );
 	gp.fillPath();
diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc
index 7e9ecd75..d4ea8e75 100644
--- a/karbon/widgets/vgradientwidget.cc
+++ b/karbon/widgets/vgradientwidget.cc
@@ -104,8 +104,8 @@ void VGradientWidget::paintEvent( TQPaintEvent* )
 	gradient.setFocalPoint( KoPoint( 2, 2 ) );
 	gradient.setVector( KoPoint( 2 + w, 2 ) );
 	VFill fill;
-	KIconLoader il;
-	fill.pattern() = VPattern( il.iconPath( "karbon.png", KIcon::Small ) );
+	TDEIconLoader il;
+	fill.pattern() = VPattern( il.iconPath( "karbon.png", TDEIcon::Small ) );
 	fill.setType( VFill::patt );
 	gp.setBrush( fill );
 	gp.drawRect( KoRect( 2, 2, w, gh ) );
diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc
index 9c5de4f9..2bd0230d 100644
--- a/kchart/kchartDataEditor.cc
+++ b/kchart/kchartDataEditor.cc
@@ -204,10 +204,10 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
     // Buttons for Inserting / Removing rows & columns 
     // The icon images are taken from the standard 
     m_insertRowButton = new TQPushButton( page);
-    // In 2.0; this is supposed to be just KIcon("name").pixmap(32).
+    // In 2.0; this is supposed to be just TDEIcon("name").pixmap(32).
     m_insertRowButton->setPixmap( BarIcon( TQString("insert_table_row"),
-					   KIcon::SizeMedium,
-					   KIcon::DefaultState,
+					   TDEIcon::SizeMedium,
+					   TDEIcon::DefaultState,
 					   KChartFactory::global() ) );
     //m_insertRowButton = new TQPushButton( i18n("Insert Row") , page);
     connect( m_insertRowButton, TQT_SIGNAL( clicked() ),
@@ -215,8 +215,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
     
     m_removeRowButton = new TQPushButton( page );
     m_removeRowButton->setPixmap( BarIcon( TQString("delete_table_row"),
-					   KIcon::SizeMedium,
-					   KIcon::DefaultState,
+					   TDEIcon::SizeMedium,
+					   TDEIcon::DefaultState,
 					   KChartFactory::global() ) );
     //m_removeRowButton = new TQPushButton( i18n("Remove Row") , page);
     connect( m_removeRowButton, TQT_SIGNAL( clicked() ),
@@ -224,8 +224,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
     
     m_insertColButton = new TQPushButton( page );
     m_insertColButton->setPixmap( BarIcon( TQString("insert_table_col"),
-					   KIcon::SizeMedium,
-					   KIcon::DefaultState,
+					   TDEIcon::SizeMedium,
+					   TDEIcon::DefaultState,
 					   KChartFactory::global() ) );
     //m_insertColButton = new TQPushButton( i18n("Insert Column") , page);
     connect( m_insertColButton, TQT_SIGNAL( clicked() ),
@@ -233,8 +233,8 @@ kchartDataEditor::kchartDataEditor(TQWidget* parent) :
     
     m_removeColButton = new TQPushButton( page );
     m_removeColButton->setPixmap( BarIcon( TQString("delete_table_col"),
-					   KIcon::SizeMedium,
-					   KIcon::DefaultState,
+					   TDEIcon::SizeMedium,
+					   TDEIcon::DefaultState,
 					   KChartFactory::global() ) );
     //m_removeColButton = new TQPushButton( i18n("Remove Column") , page);
     connect( m_removeColButton, TQT_SIGNAL( clicked() ),
diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc
index b469ab9b..7f516542 100644
--- a/kchart/kchartLegendConfigPage.cc
+++ b/kchart/kchartLegendConfigPage.cc
@@ -374,8 +374,8 @@ TQPushButton* KChartLegendConfigPage::addButton( TQGridLayout* layout,
   TQPushButton* button = new TQPushButton( gb );
   button->setToggleButton( true );
   button->setPixmap( BarIcon( icon,
-                              KIcon::SizeMedium,
-                              KIcon::DefaultState,
+                              TDEIcon::SizeMedium,
+                              TDEIcon::DefaultState,
                               KChartFactory::global() ) );
   TQToolTip::add( button, toolTipText );
   layout->addWidget( button, posY, posX );
diff --git a/kchart/kchartWizardSelectChartTypePage.cc b/kchart/kchartWizardSelectChartTypePage.cc
index dc4cbf8a..b0365ddd 100644
--- a/kchart/kchartWizardSelectChartTypePage.cc
+++ b/kchart/kchartWizardSelectChartTypePage.cc
@@ -93,8 +93,8 @@ void KChartWizardSelectChartTypePage::addButton(const TQString &name,
 {
     KChartButton *button = new KChartButton( this, name, 
 					     BarIcon( icon_name, 
-						      KIcon::SizeMedium,
-						      KIcon::DefaultState,
+						      TDEIcon::SizeMedium,
+						      TDEIcon::DefaultState,
 						      KChartFactory::global()) );
     m_layout->addWidget(button, m_rowPos, m_colPos);
     m_typeBG->insert( button->button(), type );
diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js
index 6584f5ff..31c32980 100755
--- a/kexi/doc/dev/CHANGELOG-Kexi-js
+++ b/kexi/doc/dev/CHANGELOG-Kexi-js
@@ -3504,7 +3504,7 @@ KexiBrowser
 KexiTableView
 - "start edit" action (for F2/Enter key) is now shared 
   as "edit_edititem" action
-- KexiKIconTableEdit introduced: Cell editor for displaying kde icon 
+- KexiTDEIconTableEdit introduced: Cell editor for displaying kde icon 
   (using icon name provided as string).
 - TableViewHeader (inherits QHeader) introduced: supports tooltips 
   when needed (for column description of if column is not wide enough)
@@ -3515,7 +3515,7 @@ Table Designer
 - "tablepart_toggle_pkey" shared action added for design view
 - "Not empty" field's property is now called "Allow Zero Size" 
   (and has opposite meaning)
-- 1st column with "key" icon (for pkey) added (using KexiKIconTableEdit)
+- 1st column with "key" icon (for pkey) added (using KexiTDEIconTableEdit)
 KexiDB
 - QString Field::subType() added
 - QuerySchema::autoIncrementFields() fixed (caused crash sometimes)
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index 5bbbde38..0e59a08f 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -59,7 +59,7 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
 	setDetails(true);
 
 	m_pixmapLabel = new TQLabel(details);
-	m_pixmapLabel->setFixedWidth( int(IconSize(KIcon::Desktop) * 1.5) );
+	m_pixmapLabel->setFixedWidth( int(IconSize(TDEIcon::Desktop) * 1.5) );
 	m_pixmapLabel->setAlignment(AlignHCenter | AlignTop);
 
 	m_textLabel = new TQLabel(details);
@@ -102,7 +102,7 @@ void
 ConnectionDialog::initTable()
 {
 	KexiTableViewColumn *col0 = new KexiTableViewColumn(i18n("OK?"), KexiDB::Field::Text);
-	col0->field()->setSubType("KIcon");
+	col0->field()->setSubType("TDEIcon");
 	col0->setReadOnly(true);
 	col0->field()->setDescription(i18n("Connection correctness"));
 	m_data->addColumn(col0);
diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp
index 5146576c..e668aa48 100644
--- a/kexi/formeditor/objecttreeview.cpp
+++ b/kexi/formeditor/objecttreeview.cpp
@@ -91,9 +91,9 @@ ObjectTreeViewItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column,
 		{
 			TQString iconName 
 				= ((ObjectTreeView*)listView())->iconNameForClass(m_item->widget()->className());
-			p->drawPixmap(margin, (height() - IconSize(KIcon::Small))/2 , SmallIcon(iconName));
+			p->drawPixmap(margin, (height() - IconSize(TDEIcon::Small))/2 , SmallIcon(iconName));
 			p->drawText(
-				TQRect(2*margin + IconSize(KIcon::Small),0,width, height()-1), 
+				TQRect(2*margin + IconSize(TDEIcon::Small),0,width, height()-1), 
 				TQt::AlignVCenter, m_item->name());
 		}
 		else
@@ -136,7 +136,7 @@ ObjectTreeViewItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, i
 		TQString iconName 
 			= ((ObjectTreeView*)listView())->iconNameForClass(item->m_item->widget()->className());
 		p->drawPixmap(
-			(w - IconSize(KIcon::Small))/2, (item->height() - IconSize(KIcon::Small))/2 , 
+			(w - IconSize(TDEIcon::Small))/2, (item->height() - IconSize(TDEIcon::Small))/2 , 
 			SmallIcon(iconName));
 
 		p->translate(0, item->totalHeight());
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index 125e4783..052f149a 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -177,14 +177,14 @@ TQColor KexiUtils::bleachedColor(const TQColor& c, int factor)
 TQIconSet KexiUtils::colorizeIconToTextColor(const TQPixmap& icon, const TQPalette& palette)
 {
 	TQPixmap pm(
-		KIconEffect().apply( icon, KIconEffect::Colorize, 1.0f, palette.active().buttonText(), false ) );
+		TDEIconEffect().apply( icon, TDEIconEffect::Colorize, 1.0f, palette.active().buttonText(), false ) );
 
 	KPixmap kpm(pm);
 	return TQIconSet(
 		KPixmapEffect::fade( kpm, 0.33, palette.active().button() ) );
 }
 
-TQPixmap KexiUtils::emptyIcon(KIcon::Group iconGroup)
+TQPixmap KexiUtils::emptyIcon(TDEIcon::Group iconGroup)
 {
 	TQPixmap noIcon( IconSize( iconGroup ), IconSize( iconGroup ) );
 	TQBitmap bmpNoIcon(noIcon.size());
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index 8b832061..acb3cf07 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -162,7 +162,7 @@ namespace KexiUtils
 	KEXIUTILS_EXPORT TQIconSet colorizeIconToTextColor(const TQPixmap& icon, const TQPalette& palette);
 
 	/*! \return empty (fully transparent) pixmap that can be used as a place for icon of size \a iconGroup */
-	KEXIUTILS_EXPORT TQPixmap emptyIcon(KIcon::Group iconGroup);
+	KEXIUTILS_EXPORT TQPixmap emptyIcon(TDEIcon::Group iconGroup);
 
 	/*! Serializes \a map to \a array.
 	 KexiUtils::deserializeMap() can be used to deserialize this array back to map. */
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 2dd9ebe1..417efd05 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -3100,7 +3100,7 @@ tristate KexiMainWindowImpl::getNewObjectInfo(
 	d->nameDialog->widget()->setCaptionText(partItem->caption());
 	d->nameDialog->widget()->setNameText(partItem->name());
 	d->nameDialog->setCaption(i18n("Save Object As"));
-	d->nameDialog->setDialogIcon( DesktopIcon( info->itemIcon(), KIcon::SizeMedium ) );
+	d->nameDialog->setDialogIcon( DesktopIcon( info->itemIcon(), TDEIcon::SizeMedium ) );
 	allowOverwriting = false;
 	bool found;
 	do {
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 0388eebe..56675be8 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -335,7 +335,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
 //	setFocusPolicy(WheelFocus);
 	m_contents->setFocusProxy(m_contents->headerTitleLineEdit);
 
-	m_contents->printButton->setIconSet( KStdGuiItem::print().iconSet(KIcon::Small) );
+	m_contents->printButton->setIconSet( KStdGuiItem::print().iconSet(TDEIcon::Small) );
 	m_contents->printButton->setText( KStdGuiItem::print().text() );
 	connect(m_contents->printButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(print()));
 
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index 2558b4e7..870d6f24 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -108,7 +108,7 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set,
 	d->conn_set = &conn_set;
 	d->startDirOrVariable = startDirOrVariable;
 	TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
-	const TQPixmap &icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
+	const TQPixmap &icon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
 	setIcon( icon );
 
 	TQVBoxLayout* globalLyr = new TQVBoxLayout( this );
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index e7f613e6..29b4c2ca 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -108,7 +108,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	d->lvi_file = new TDEListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") );
 	d->lvi_file->setPixmap(0, 
 		TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType( 
-			KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop 
+			KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), TDEIcon::Desktop 
 		)
 	);
 	d->lvi_file->setMultiLinesEnabled( true );
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index eeb46da6..b3ee1ce7 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -105,7 +105,7 @@ KexiProjectSelectorWidget::KexiProjectSelectorWidget(
 	d->showProjectNameColumn = showProjectNameColumn;
 	d->showConnectionColumns = showConnectionColumns;
 	TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
-	d->fileicon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
+	d->fileicon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
 	setIcon( d->fileicon );
 	d->dbicon = SmallIcon("database");
 //	list->setHScrollBarMode( TQScrollView::AlwaysOn );
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 21eb3edf..7d06dd2e 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -69,9 +69,9 @@ public:
 		result = 0;
 		TQString none, iconname;
 		iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0);
-		kexi_sqlite_icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
+		kexi_sqlite_icon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
 		iconname = KMimeType::mimeType("application/x-kexiproject-shortcut")->icon(none,0);
-		kexi_shortcut_icon = TDEGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop );
+		kexi_shortcut_icon = TDEGlobal::iconLoader()->loadIcon( iconname, TDEIcon::Desktop );
 		prj_selector = 0;
 		chkDoNotShow = 0;
 		openExistingConnWidget = 0;
@@ -398,7 +398,7 @@ void KexiStartupDialog::setupPageTemplates()
 void KexiStartupDialog::slotPageShown(TQWidget *page)
 {
 	int idx = d->templatesWidget->pageIndex(page);
-//	KIconView *templ = 0;
+//	TDEIconView *templ = 0;
 	if (idx==d->templatesSectionID_blank) {//blank
 //		kdDebug() << "blank" << endl;
 	}
@@ -408,7 +408,7 @@ void KexiStartupDialog::slotPageShown(TQWidget *page)
 	else if (idx==d->templatesSectionID_templates) {
 		d->viewTemplates->populate();
 	}
-/*later?		KIconView *templ = d->viewTemplates->templates;
+/*later?		TDEIconView *templ = d->viewTemplates->templates;
 		if (templ->count()==0) {
 			//add items (on demand):
 			d->viewTemplates->addItem("cd_catalog", i18n("CD Catalog"),
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index 5db58c82..d99ad4ae 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
@@ -98,7 +98,7 @@ void KexiStartupDialogTemplatesPage::populate()
 	if (firstChild())
 		setSelected(firstChild(), true);
 
-//	templates = new KIconView(this, "templates");
+//	templates = new TDEIconView(this, "templates");
 //	templates->setItemsMovable(false);
 //	templates->setShowToolTips(false);
 //	info = new KTextBrowser(this,"info");
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
index 74591986..58d12883 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
@@ -51,7 +51,7 @@ class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public TDEListView
 	
 	private:
 		bool m_popuplated : 1;
-//		KIconView *templates;
+//		TDEIconView *templates;
 //		KTextBrowser *info;
 };
 
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index ff2981f7..a37201b2 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -84,7 +84,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 //TODO    d->keepLocation = false;
 //TODO    d->operationMode = Opening;
     setMode(KFile::File | KFile::ExistingOnly); //(js) default: open action
-    setIcon( TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::Desktop) );
+    setIcon( TDEGlobal::iconLoader()->loadIcon("fileopen", TDEIcon::Desktop) );
 		setDir(TQDir(startDir));
 //TODO    d->hasDefaultFilter = false;
 //TODO    d->hasView = false;
@@ -122,12 +122,12 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     u.setPath( TQDir::rootDirPath() );
     TQString text = i18n("Root Directory: %1").arg( u.path() );
     d->pathCombo->addDefaultURL( u,
-                                 KMimeType::pixmapForURL( u, 0, KIcon::Small ),
+                                 KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
                                  text );
 
     u.setPath( TQDir::homeDirPath() );
     text = i18n("Home Directory: %1").arg( u.path( +1 ) );
-    d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ),
+    d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
                                  text );
 
     KURL docPath;
@@ -135,14 +135,14 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     if ( u.path(+1) != docPath.path(+1) ) {
         text = i18n("Documents: %1").arg( docPath.path( +1 ) );
         d->pathCombo->addDefaultURL( u,
-                                     KMimeType::pixmapForURL( u, 0, KIcon::Small ),
+                                     KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
                                      text );
     }
 
     u.setPath( TDEGlobalSettings::desktopPath() );
     text = i18n("Desktop: %1").arg( u.path( +1 ) );
     d->pathCombo->addDefaultURL( u,
-                                 KMimeType::pixmapForURL( u, 0, KIcon::Small ),
+                                 KMimeType::pixmapForURL( u, 0, TDEIcon::Small ),
                                  text );
 
     u.setPath( "/tmp" );
@@ -387,7 +387,7 @@ void KexiStartupFileDialogBase::setOperationMode( KFileDialog::OperationMode mod
   //  d->keepLocation = (mode == Saving);
     if (mode == KFileDialog::Saving) {
       setMode( KFile::File );
-      setIcon( TDEGlobal::iconLoader()->loadIcon("filesave", KIcon::Desktop) );
+      setIcon( TDEGlobal::iconLoader()->loadIcon("filesave", TDEIcon::Desktop) );
     }
 //(js)    filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving );
 //(js)    d->okButton->setGuiItem( (mode == Saving) ? KStdGuiItem::save() : KStdGuiItem::ok() );
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index 4ba3b859..dde61c8a 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -126,7 +126,7 @@ TDEActionsListViewBase::~TDEActionsListViewBase() {}
 void TDEActionsListViewBase::init()
 {
 	setSorting(0);
-	const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) );
+	const TQPixmap noIcon( KexiUtils::emptyIcon(TDEIcon::Small) );
 	TDEActionPtrList sharedActions( m_mainWin->allActions() );
 	const Kexi::ActionCategories *acat = Kexi::actionCategories();
 	foreach (TDEActionPtrList::ConstIterator, it, sharedActions) {
@@ -144,7 +144,7 @@ void TDEActionsListViewBase::init()
 		ActionSelectorDialogListItem *pitem = new ActionSelectorDialogListItem((*it)->name(), 
 			this, (*it)->toolTip().isEmpty() ? (*it)->text().replace("&", "") : (*it)->toolTip() );
 		pitem->fifoSorting = false; //alpha sort
-		pitem->setPixmap( 0, (*it)->iconSet( KIcon::Small, 16 ).pixmap( TQIconSet::Small, TQIconSet::Active ) );
+		pitem->setPixmap( 0, (*it)->iconSet( TDEIcon::Small, 16 ).pixmap( TQIconSet::Small, TQIconSet::Active ) );
 		if (!pitem->pixmap(0) || pitem->pixmap(0)->isNull())
 			pitem->setPixmap( 0, noIcon );
 	}
@@ -192,7 +192,7 @@ public:
 	 : ActionsListViewBase(parent)
 	{
 		TQListViewItem *item = new ActionSelectorDialogListItem("noaction", this, i18n("No action") );
-		const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) );
+		const TQPixmap noIcon( KexiUtils::emptyIcon(TDEIcon::Small) );
 		item->setPixmap(0, noIcon);
 		item = new ActionSelectorDialogListItem("tdeaction", this, i18n("Application actions") );
 		item->setPixmap(0, SmallIcon("form_action"));
@@ -263,7 +263,7 @@ class ActionToExecuteListView : public ActionsListViewBase
 				return;
 			int supportedViewModes = part->supportedViewModes();
 			ActionSelectorDialogListItem *item;
-			const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) );
+			const TQPixmap noIcon( KexiUtils::emptyIcon(TDEIcon::Small) );
 			if (supportedViewModes & Kexi::DataViewMode) {
 				item = new ActionSelectorDialogListItem("open", this, i18n("Open in Data View"));
 				item->setPixmap(0, SmallIcon("fileopen"));
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index c98ca67a..6910bda9 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -80,7 +80,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 #endif
 	m_widgetDSLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	m_widgetDSLabel->setMargin(2);
-	m_widgetDSLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
+	m_widgetDSLabel->setMinimumHeight(IconSize(TDEIcon::Small)+4);
 	m_widgetDSLabel->setAlignment(AlignLeft|AlignBottom);
 	hlyr->addWidget(m_widgetDSLabel);
 
@@ -106,7 +106,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	m_dataSourceLabel = new TQLabel(i18n("Form's data source:"), contents);
 	m_dataSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	m_dataSourceLabel->setMargin(2);
-	m_dataSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
+	m_dataSourceLabel->setMinimumHeight(IconSize(TDEIcon::Small)+4);
 	m_dataSourceLabel->setAlignment(AlignLeft|AlignBottom);
 	hlyr->addWidget(m_dataSourceLabel);
 
@@ -169,7 +169,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	m_availableFieldsLabel = new TQLabel(i18n("Available fields:"), contents);
 	m_availableFieldsLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	m_availableFieldsLabel->setMargin(2);
-	m_availableFieldsLabel->setMinimumHeight(IconSize(KIcon::Small));
+	m_availableFieldsLabel->setMinimumHeight(IconSize(TDEIcon::Small));
 	hlyr->addWidget(m_availableFieldsLabel);
 
 	m_addField = new KexiSmallToolButton(contents, i18n("Insert selected field into form", "Insert"), 
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
index aaa96908..c0608072 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
@@ -199,7 +199,7 @@ void KexiCSVInfoLabel::setFileName( const TQString& fileName )
 	m_fnameLbl->setText( TQDir::convertSeparators(fileName) );
 	if (!fileName.isEmpty()) {
 		m_iconLbl->setPixmap( 
-			KMimeType::pixmapForURL(KURL::fromPathOrURL(fileName), 0, KIcon::Desktop) );
+			KMimeType::pixmapForURL(KURL::fromPathOrURL(fileName), 0, TDEIcon::Desktop) );
 	}
 }
 
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp
index a512994d..8b676fb0 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp
@@ -52,7 +52,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Co
 	
 	KoMacro::Exception* exception = context->exception();
 
-	iconlbl->setPixmap(TDEGlobal::instance()->iconLoader()->loadIcon("messagebox_critical", KIcon::Small, 32));
+	iconlbl->setPixmap(TDEGlobal::instance()->iconLoader()->loadIcon("messagebox_critical", TDEIcon::Small, 32));
 	errorlbl->setText(i18n("<qt>Failed to execute the macro \"%1\".<br>%2</qt>").arg( context->macro()->name() ).arg( exception->errorMessage() ));
 
 	int i = 1;
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index 1ed65ddc..143a0392 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -144,7 +144,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	d->rowSourceLabel = new TQLabel(i18n("Row source:"), contents);
 	d->rowSourceLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	d->rowSourceLabel->setMargin(2);
-	d->rowSourceLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
+	d->rowSourceLabel->setMinimumHeight(IconSize(TDEIcon::Small)+4);
 	d->rowSourceLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
 	hlyr->addWidget(d->rowSourceLabel);
 
@@ -172,7 +172,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	d->boundColumnLabel = new TQLabel(i18n("Bound column:"), contents);
 	d->boundColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	d->boundColumnLabel->setMargin(2);
-	d->boundColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
+	d->boundColumnLabel->setMinimumHeight(IconSize(TDEIcon::Small)+4);
 	d->boundColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
 	hlyr->addWidget(d->boundColumnLabel);
 
@@ -194,7 +194,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	d->visibleColumnLabel = new TQLabel(i18n("Visible column:"), contents);
 	d->visibleColumnLabel->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
 	d->visibleColumnLabel->setMargin(2);
-	d->visibleColumnLabel->setMinimumHeight(IconSize(KIcon::Small)+4);
+	d->visibleColumnLabel->setMinimumHeight(IconSize(TDEIcon::Small)+4);
 	d->visibleColumnLabel->setAlignment(TQt::AlignLeft|TQt::AlignBottom);
 	hlyr->addWidget(d->visibleColumnLabel);
 
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 7fa1c3b3..514be26a 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -124,7 +124,7 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare
 		i18n("Additional information about the field"));
 	col->setIcon( KexiUtils::colorizeIconToTextColor( SmallIcon("info"), d->view->palette() ) );
 	col->setHeaderTextVisible(false);
-	col->field()->setSubType("KIcon");
+	col->field()->setSubType("TDEIcon");
 	col->setReadOnly(true);
 	d->data->addColumn( col );
 
@@ -268,7 +268,7 @@ void KexiTableDesignerView::initData()
 	}
 
 	//column widths
-	d->view->setColumnWidth(COLUMN_ID_ICON, IconSize( KIcon::Small ) + 10);
+	d->view->setColumnWidth(COLUMN_ID_ICON, IconSize( TDEIcon::Small ) + 10);
 	d->view->adjustColumnWidthToContents(COLUMN_ID_CAPTION); //adjust column width
 	d->view->setColumnWidth(COLUMN_ID_TYPE, d->maxTypeNameTextWidth + 2 * d->view->rowHeight());
 	d->view->setColumnStretchEnabled( true, COLUMN_ID_DESC ); //last column occupies the rest of the area
diff --git a/kexi/widget/kexibrowser.h b/kexi/widget/kexibrowser.h
index 3da16500..e351508e 100644
--- a/kexi/widget/kexibrowser.h
+++ b/kexi/widget/kexibrowser.h
@@ -26,7 +26,7 @@
 #include <tqintdict.h>
 
 class TQListViewItem;
-class KIconLoader;
+class TDEIconLoader;
 class TDEPopupMenu;
 class TDEAction;
 class TDEActionMenu;
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index 404bc746..1c1f929b 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -51,7 +51,7 @@ class KexiFieldComboBox::Private
 		Private()
 //		 : schema(0)
 		 : keyIcon( SmallIcon("key") )
-		 , noIcon( KexiUtils::emptyIcon(KIcon::Small) )
+		 , noIcon( KexiUtils::emptyIcon(TDEIcon::Small) )
 		 , table(true)
 		{
 		}
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index fe81b9eb..f688fa64 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -46,7 +46,7 @@ KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int opt
  : TDEListView(parent, name)
  , m_schema(0)
  , m_keyIcon(SmallIcon("key"))
- , m_noIcon(KexiUtils::emptyIcon(KIcon::Small))
+ , m_noIcon(KexiUtils::emptyIcon(TDEIcon::Small))
  , m_options(options)
  , m_allColumnsItem(0)
 {
diff --git a/kexi/widget/kexiprjtypeselector.cpp b/kexi/widget/kexiprjtypeselector.cpp
index aea9b22f..1a036304 100644
--- a/kexi/widget/kexiprjtypeselector.cpp
+++ b/kexi/widget/kexiprjtypeselector.cpp
@@ -29,7 +29,7 @@ KexiPrjTypeSelector::KexiPrjTypeSelector( TQWidget* parent )
 	TQString none;
 	icon_file->setPixmap( 
 		TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType( 
-			KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop, 48
+			KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), TDEIcon::Desktop, 48
 		)
 	);
 	icon_file->setFixedSize(icon_file->pixmap()->size()/2);
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index e2a5ac31..bf5c6491 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -36,7 +36,7 @@ KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name)
 	TQHBoxLayout *hlyr = new TQHBoxLayout(this);
 	m_objectIconLabel = new TQLabel(this);
 	m_objectIconLabel->setMargin(2);
-	setFixedHeight( IconSize(KIcon::Small) + 2 + 2 );
+	setFixedHeight( IconSize(TDEIcon::Small) + 2 + 2 );
 	hlyr->addWidget(m_objectIconLabel);
 	m_objectNameLabel = new TQLabel(this);
 	m_objectNameLabel->setMargin(2);
@@ -54,7 +54,7 @@ void KexiObjectInfoLabel::setObjectClassIcon(const TQString& name)
 	if (m_classIcon.isEmpty())
 		m_objectIconLabel->setFixedWidth( 0 );
 	else
-		m_objectIconLabel->setFixedWidth( IconSize(KIcon::Small) + 2 + 2 );
+		m_objectIconLabel->setFixedWidth( IconSize(TDEIcon::Small) + 2 + 2 );
 	m_objectIconLabel->setPixmap( SmallIcon(name) );
 }
 
@@ -121,7 +121,7 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget
 	TQHBoxLayout *vlyr = new TQHBoxLayout(lyr);
 	d->objectIcon = new TQLabel(this);
 	d->objectIcon->setMargin(2);
-	d->objectIcon->setFixedHeight( IconSize(KIcon::Small) + 2 + 2 );
+	d->objectIcon->setFixedHeight( IconSize(TDEIcon::Small) + 2 + 2 );
 	vlyr->addWidget(d->objectIcon);
 	d->objectClassName = new TQLabel(this);
 	d->objectClassName->setMargin(2);
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index 8852f81c..27f89395 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -62,7 +62,7 @@ void KexiSmallToolButton::updateAction()
 {
 	if (!m_action)
 		return;
-	update(m_action->text(), m_action->iconSet(KIcon::Small));
+	update(m_action->text(), m_action->iconSet(TDEIcon::Small));
 	setAccel(m_action->shortcut());
 	TQToolTip::add(this, m_action->toolTip());
 	TQWhatsThis::add(this, m_action->whatsThis());
@@ -92,7 +92,7 @@ void KexiSmallToolButton::update(const TQString& text, const TQIconSet& iconSet,
 		TQToolButton::setTextLabel(text, tipToo);
 	}
 	if (!iconSet.isNull()) {
-		width += IconSize(KIcon::Small);
+		width += IconSize(TDEIcon::Small);
 		TQToolButton::setIconSet(iconSet);
 	}
 	setFixedWidth( width );
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index ef94b5d2..6adfc94a 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -99,7 +99,7 @@ PixmapCollection::getPixmap(const TQString &name)
 
 	if(m_pixmaps[name].second != 0)
 	{
-		return kapp->iconLoader()->loadIcon(m_pixmaps[name].first, KIcon::NoGroup, m_pixmaps[name].second);
+		return kapp->iconLoader()->loadIcon(m_pixmaps[name].first, TDEIcon::NoGroup, m_pixmaps[name].second);
 	}
 	else
 		return TQPixmap(m_pixmaps[name].first);
@@ -180,9 +180,9 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
 
 
 	// Icon chooser button
-	m_button = new KIconButton(frame);
+	m_button = new TDEIconButton(frame);
 	m_button->setIcon("kexi");
-	m_button->setIconSize(KIcon::SizeMedium);
+	m_button->setIconSize(TDEIcon::SizeMedium);
 	l->addMultiCellWidget(m_button, 0, 1, 2, 2);
 	connect(m_button, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(updateIconName(TQString)));
 	connect(m_nameInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(setIcon(const TQString &)));
@@ -203,15 +203,15 @@ LoadIconDialog::setIcon(const TQString &icon)
 void
 LoadIconDialog::changeIconSize(int index)
 {
-	int size = KIcon::SizeMedium;
+	int size = TDEIcon::SizeMedium;
 	switch(index)
 	{
-		case 0: size = KIcon::SizeSmall; break;
-		//case 1: size = KIcon::SizeSmallMedium; break;
-		case 1: size = KIcon::SizeMedium; break;
-		case 2: size = KIcon::SizeLarge; break;
+		case 0: size = TDEIcon::SizeSmall; break;
+		//case 1: size = TDEIcon::SizeSmallMedium; break;
+		case 1: size = TDEIcon::SizeMedium; break;
+		case 2: size = TDEIcon::SizeLarge; break;
 #if !defined(TQ_WS_WIN) && KDE_IS_VERSION(3,1,9)
-		case 3: size = KIcon::SizeHuge; break;
+		case 3: size = TDEIcon::SizeHuge; break;
 #endif
 		default:;
 	}
@@ -264,11 +264,11 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
 	vlayout->addStretch();
 
 	// Setup the iconView
-	m_iconView = new KIconView(frame, "pixcollection_iconView");
+	m_iconView = new TDEIconView(frame, "pixcollection_iconView");
 	m_iconView->resize(100,100);
 	m_iconView->setArrangement(TQIconView::LeftToRight);
 	m_iconView->setAutoArrange(true);
-	m_iconView->setMode(KIconView::Select);
+	m_iconView->setMode(TDEIconView::Select);
 	l->addWidget(m_iconView);
 	connect(m_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(displayMenu(TQIconViewItem*, const TQPoint&)));
 	connect(m_iconView, TQT_SIGNAL(itemRenamed(TQIconViewItem*, const TQString &)), this, TQT_SLOT(renameCollectionItem(TQIconViewItem*, const TQString&)));
@@ -379,11 +379,11 @@ PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, c
 	m_collection = collection;
 	setInitialSize(TQSize(400, 200), true);
 
-	m_iconView = new KIconView(this, "pixchooser_iconView");
+	m_iconView = new TDEIconView(this, "pixchooser_iconView");
 	setMainWidget(m_iconView);
 	m_iconView->setArrangement(TQIconView::LeftToRight);
 	m_iconView->setAutoArrange(true);
-	m_iconView->setMode(KIconView::Select);
+	m_iconView->setMode(TDEIconView::Select);
 
 	PixmapMap::ConstIterator it;
 	PixmapMap::ConstIterator endIt = collection->m_pixmaps.constEnd();
diff --git a/kexi/widget/pixmapcollection.h b/kexi/widget/pixmapcollection.h
index 7f900866..28629be1 100644
--- a/kexi/widget/pixmapcollection.h
+++ b/kexi/widget/pixmapcollection.h
@@ -32,8 +32,8 @@
 #include <kurl.h>
 
 class TQPixmap;
-class KIconView;
-class KIconButton;
+class TDEIconView;
+class TDEIconButton;
 class KLineEdit;
 class TQDomNode;
 
@@ -50,7 +50,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollection : public TQObject
 		~PixmapCollection() {;}
 
 		TQString addPixmapPath(const KURL &url);
-		TQString addPixmapName(const TQString &name, int size = KIcon::SizeMedium);
+		TQString addPixmapName(const TQString &name, int size = TDEIcon::SizeMedium);
 		void removePixmap(const TQString &name);
 
 		bool   contains(const TQString &name);
@@ -97,7 +97,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionEditor : public KDialogBase
 
 	private:
 		enum { BNewItemPath = 101, BNewItemName, BDelItem};
-		KIconView  *m_iconView;
+		TDEIconView  *m_iconView;
 		TQIntDict<TQToolButton>  m_buttons;
 		PixmapCollection  *m_collection;
 };
@@ -122,7 +122,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionChooser : public KDialogBase
 
 	private:
 		PixmapCollection  *m_collection;
-		KIconView  *m_iconView;
+		TDEIconView  *m_iconView;
 };
 
 //! A simple dialog to choose a KDE icon
@@ -145,15 +145,15 @@ class KEXIEXTWIDGETS_EXPORT LoadIconDialog : public KDialogBase
 
 	private:
 		KLineEdit *m_nameInput;
-		KIconButton *m_button;
+		TDEIconButton *m_button;
 };
 
-//! A Special KIconViewItem that holds the name of its associated pixmap (to allow renaming)
-class KEXIEXTWIDGETS_EXPORT PixmapIconViewItem : public KIconViewItem
+//! A Special TDEIconViewItem that holds the name of its associated pixmap (to allow renaming)
+class KEXIEXTWIDGETS_EXPORT PixmapIconViewItem : public TDEIconViewItem
 {
 	public:
-		PixmapIconViewItem(KIconView *parent, const TQString &text, const TQPixmap &icon)
-		: KIconViewItem(parent, text, icon)  { m_name = text; }
+		PixmapIconViewItem(TDEIconView *parent, const TQString &text, const TQPixmap &icon)
+		: TDEIconViewItem(parent, text, icon)  { m_name = text; }
 		~PixmapIconViewItem() {;}
 
 		void setName(const TQString &name) { m_name = name; }
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index cba19483..b9420f67 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -315,7 +315,7 @@ TQSize KexiRelationViewTable::sizeHint() const
 //		<< ", " << fm.width(schema()->name()+"  ") << endl; 
 
 	int maxWidth = -1;
-	const int iconWidth = IconSize(KIcon::Small) + fm.width("i")+20;
+	const int iconWidth = IconSize(TDEIcon::Small) + fm.width("i")+20;
 	for (TQListViewItem *item = firstChild(); item; item	= item->nextSibling())
 		maxWidth = TQMAX(maxWidth, iconWidth + fm.width(item->text(0)));
 
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 91523cb7..4982fffa 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -474,10 +474,10 @@ bool KexiBlobTableEdit::eventFilter( TQObject *o, TQEvent *e )
 KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiBlobEditorFactoryItem, KexiBlobTableEdit)
 
 //=======================
-// KexiKIconTableEdit class is temporarily here:
+// KexiTDEIconTableEdit class is temporarily here:
 
 //! @internal
-class KexiKIconTableEdit::Private
+class KexiTDEIconTableEdit::Private
 {
 public:
 	Private()
@@ -490,61 +490,61 @@ public:
 	TQCache<TQPixmap> pixmapCache;
 };
 
-KexiKIconTableEdit::KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+KexiTDEIconTableEdit::KexiTDEIconTableEdit(KexiTableViewColumn &column, TQWidget *parent)
  : KexiTableEdit(column, parent)
  , d( new Private() )
 {
-	setName("KexiKIconTableEdit");
+	setName("KexiTDEIconTableEdit");
 	init();
 }
 
-KexiKIconTableEdit::~KexiKIconTableEdit()
+KexiTDEIconTableEdit::~KexiTDEIconTableEdit()
 {
 	delete d;
 }
 
-void KexiKIconTableEdit::init()
+void KexiTDEIconTableEdit::init()
 {
 	m_hasFocusableWidget = false;
 	d->pixmapCache.setAutoDelete(true);
 }
 	
-void KexiKIconTableEdit::setValueInternal(const TQVariant& /*add*/, bool /*removeOld*/)
+void KexiTDEIconTableEdit::setValueInternal(const TQVariant& /*add*/, bool /*removeOld*/)
 {
 	d->currentValue = m_origValue;
 }
 
-bool KexiKIconTableEdit::valueIsNull()
+bool KexiTDEIconTableEdit::valueIsNull()
 {
 	return d->currentValue.isNull();
 }
 
-bool KexiKIconTableEdit::valueIsEmpty()
+bool KexiTDEIconTableEdit::valueIsEmpty()
 {
 	return d->currentValue.isNull();
 }
 
-TQVariant KexiKIconTableEdit::value()
+TQVariant KexiTDEIconTableEdit::value()
 {
 	return d->currentValue;
 }
 
-void KexiKIconTableEdit::clear()
+void KexiTDEIconTableEdit::clear()
 {
 	d->currentValue = TQVariant();
 }
 
-bool KexiKIconTableEdit::cursorAtStart()
+bool KexiTDEIconTableEdit::cursorAtStart()
 {
 	return true;
 }
 
-bool KexiKIconTableEdit::cursorAtEnd()
+bool KexiTDEIconTableEdit::cursorAtEnd()
 {
 	return true;
 }
 
-void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQVariant& val, 
+void KexiTDEIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQVariant& val, 
 	TQString &/*txt*/, int &/*align*/, int &/*x*/, int &y_offset, int &w, int &h  )
 {
 	Q_UNUSED( y_offset );
@@ -571,8 +571,8 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
 	TQPixmap *pix = 0;
 	if (!key.isEmpty() && !(pix = d->pixmapCache[ key ])) {
 		//cache pixmap
-		TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( key, KIcon::Small, 
-			0, KIcon::DefaultState, 0L, true/*canReturnNull*/ );
+		TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( key, TDEIcon::Small, 
+			0, TDEIcon::DefaultState, 0L, true/*canReturnNull*/ );
 		if (!pm.isNull()) {
 			pix = new TQPixmap(pm);
 			d->pixmapCache.insert(key, pix);
@@ -584,12 +584,12 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
 	}
 }
 
-void KexiKIconTableEdit::handleCopyAction(const TQVariant& value, const TQVariant& visibleValue)
+void KexiTDEIconTableEdit::handleCopyAction(const TQVariant& value, const TQVariant& visibleValue)
 {
 	Q_UNUSED(value);
 	Q_UNUSED(visibleValue);
 }
 
-KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiKIconTableEditorFactoryItem, KexiKIconTableEdit)
+KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiTDEIconTableEditorFactoryItem, KexiTDEIconTableEdit)
 
 #include "kexiblobtableedit.moc"
diff --git a/kexi/widget/tableview/kexiblobtableedit.h b/kexi/widget/tableview/kexiblobtableedit.h
index 4d17b3b9..fb7f6049 100644
--- a/kexi/widget/tableview/kexiblobtableedit.h
+++ b/kexi/widget/tableview/kexiblobtableedit.h
@@ -126,12 +126,12 @@ KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiBlobEditorFactoryItem)
 /*! @short Cell editor for displaying kde icon (using icon name provided as string).
  Read only.
 */
-class KexiKIconTableEdit : public KexiTableEdit
+class KexiTDEIconTableEdit : public KexiTableEdit
 {
 	public:
-		KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
+		KexiTDEIconTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 
-		virtual ~KexiKIconTableEdit();
+		virtual ~KexiTDEIconTableEdit();
 
 		//! \return true if editor's value is null (not empty)
 		virtual bool valueIsNull();
@@ -166,6 +166,6 @@ class KexiKIconTableEdit : public KexiTableEdit
 		Private *d;
 };
 
-KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiKIconTableEditorFactoryItem)
+KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiTDEIconTableEditorFactoryItem)
 
 #endif
diff --git a/kexi/widget/tableview/kexicelleditorfactory.cpp b/kexi/widget/tableview/kexicelleditorfactory.cpp
index 9cfcfe27..11664e54 100644
--- a/kexi/widget/tableview/kexicelleditorfactory.cpp
+++ b/kexi/widget/tableview/kexicelleditorfactory.cpp
@@ -119,7 +119,7 @@ void KexiCellEditorFactory::init()
 	KexiCellEditorFactory_static->registerItem( *new KexiDateTimeEditorFactoryItem(), KexiDB::Field::DateTime );
 	KexiCellEditorFactory_static->registerItem( *new KexiComboBoxEditorFactoryItem(), KexiDB::Field::Enum );
 	KexiCellEditorFactory_static->registerItem( *new KexiBoolEditorFactoryItem(), KexiDB::Field::Boolean );
-	KexiCellEditorFactory_static->registerItem( *new KexiKIconTableEditorFactoryItem(), KexiDB::Field::Text, "KIcon" );
+	KexiCellEditorFactory_static->registerItem( *new KexiTDEIconTableEditorFactoryItem(), KexiDB::Field::Text, "TDEIcon" );
 	//default type
 	KexiCellEditorFactory_static->registerItem( *new KexiInputEditorFactoryItem(), KexiDB::Field::InvalidType );
 }
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index b975fcdf..8fdac680 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -221,7 +221,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 #if 0 //moved to mainwindow's actions
 	d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
 	d->menu_id_removeRecord = m_popupMenu->insertItem(
-		kapp->iconLoader()->loadIcon("button_cancel", KIcon::Small),
+		kapp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small),
 		i18n("Remove Record"), this, TQT_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
 #endif
 
diff --git a/kformula/kfconfig.cc b/kformula/kfconfig.cc
index e461223c..d6ee6d79 100644
--- a/kformula/kfconfig.cc
+++ b/kformula/kfconfig.cc
@@ -36,12 +36,12 @@ KFConfig::KFConfig( KFormulaPartView* parent )
 {
     //kdDebug( 40000 ) << "KFConfig::KFConfig" << endl;
     TQVBox* page1 = addVBoxPage( i18n( "Formula" ), i18n( "Formula Settings" ),
-                               BarIcon( "kformula", KIcon::SizeMedium ) );
+                               BarIcon( "kformula", TDEIcon::SizeMedium ) );
     _page = new KFormula::ConfigurePage( parent->document()->getDocument(), this,
                                          KFormulaFactory::global()->config(),
                                          page1 );
 //     TQVBox* page2 = addVBoxPage( i18n( "Math Fonts" ), i18n( "Math Fonts Settings" ),
-//                                BarIcon( "kformula", KIcon::SizeMedium ) );
+//                                BarIcon( "kformula", TDEIcon::SizeMedium ) );
 //     _mathFontPage = new KFormula::MathFontsConfigurePage( parent->document()->getDocument(), this,
 //                                          KFormulaFactory::global()->config(),
 //                                          page2 );
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index eb053c94..9d84d94f 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -93,7 +93,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
     if ( hasIconSet() )
       id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
     else
-      id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), KIcon::Small),
+      id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
         text(), popupMenu(), -1, index );
 
     if ( !isEnabled() )
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index 35a332ce..534d6992 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -106,7 +106,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
     if ( hasIconSet() )
       id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
     else
-      id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), KIcon::Small),
+      id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
         text(), popupMenu(), -1, index );
 
     if ( !isEnabled() )
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index c9b5d39b..7c1bffd6 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -98,7 +98,7 @@ KivioOptionsDialog::KivioOptionsDialog(KivioView* parent, const char* name)
 void KivioOptionsDialog::initPage()
 {
   TQFrame* page = addPage(i18n("Page"), i18n("Page Settings"),
-    kapp->iconLoader()->loadIcon("empty", KIcon::Toolbar, 32));
+    kapp->iconLoader()->loadIcon("empty", TDEIcon::Toolbar, 32));
   m_pageIndex = pageIndex(page);
 
   KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent()));
@@ -155,7 +155,7 @@ void KivioOptionsDialog::initPage()
 
 void KivioOptionsDialog::initGrid()
 {
-  TQFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", KIcon::SizeMedium ));
+  TQFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", TDEIcon::SizeMedium ));
   m_gridIndex = pageIndex(page);
 
   KoUnit::Unit unit = static_cast<KivioView*>(TQT_TQWIDGET(parent()))->doc()->unit();
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp
index 003762c2..61b890be 100644
--- a/koshell/iconsidepane.cpp
+++ b/koshell/iconsidepane.cpp
@@ -69,7 +69,7 @@ void EntryItem::reloadPixmap()
 {
   int size = (int)navigator()->viewMode();
   if ( size != 0 )
-    mPixmap = TDEGlobal::iconLoader()->loadIcon( mPixmapName, KIcon::Desktop, size );
+    mPixmap = TDEGlobal::iconLoader()->loadIcon( mPixmapName, TDEIcon::Desktop, size );
   else
     mPixmap = TQPixmap();
 }
diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc
index 991a2a09..772b8f37 100644
--- a/koshell/koshell_shell.cc
+++ b/koshell/koshell_shell.cc
@@ -345,7 +345,7 @@ void KoShellWindow::setRootDocument( KoDocument * doc )
     
     v->setGeometry( 0, 0, m_pFrame->width(), m_pFrame->height() );
     v->setPartManager( partManager() );
-    m_pFrame->addTab( v, TDEGlobal::iconLoader()->loadIcon( m_documentEntry.service()->icon(), KIcon::Small ), i18n("Untitled") );
+    m_pFrame->addTab( v, TDEGlobal::iconLoader()->loadIcon( m_documentEntry.service()->icon(), TDEIcon::Small ), i18n("Untitled") );
     
     // Create a new page for this doc
     Page page;
@@ -670,9 +670,9 @@ TQString KoShellWindow::configFile() const
 void KoShellWindow::tab_contextMenu(TQWidget * w,const TQPoint &p)
 {
   TDEPopupMenu menu;
-  KIconLoader il;
-  int const mnuSave = menu.insertItem( il.loadIconSet( "filesave", KIcon::Small ), i18n("Save") );
-  int const mnuClose = menu.insertItem( il.loadIcon( "fileclose", KIcon::Small ), i18n("Close") );
+  TDEIconLoader il;
+  int const mnuSave = menu.insertItem( il.loadIconSet( "filesave", TDEIcon::Small ), i18n("Save") );
+  int const mnuClose = menu.insertItem( il.loadIcon( "fileclose", TDEIcon::Small ), i18n("Close") );
   
   int tabnr = m_pFrame->indexOf( w );
   Page page = m_lstPages[tabnr];
diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc
index 187a2101..2062fda3 100644
--- a/kplato/kptconfigdialog.cc
+++ b/kplato/kptconfigdialog.cc
@@ -41,7 +41,7 @@ namespace KPlato
 // little helper stolen from kmail/kword
 static inline TQPixmap loadIcon( const char * name ) {
   return TDEGlobal::instance()->iconLoader()
-    ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
+    ->loadIcon( TQString::fromLatin1(name), TDEIcon::NoGroup, TDEIcon::SizeMedium );
 }
 
 
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index 5274c357..a8f6ff82 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -87,27 +87,27 @@ KPrConfig::KPrConfig( KPrView* parent )
 {
     m_doc = parent->kPresenterDoc();
     TQVBox *page = addVBoxPage( i18n("Interface"), i18n("Interface"),
-                               BarIcon("misc", KIcon::SizeMedium) );
+                               BarIcon("misc", TDEIcon::SizeMedium) );
     _interfacePage=new KPrConfigureInterfacePage( parent, page );
     page = addVBoxPage( i18n("Color"), i18n("Color"),
-                        BarIcon("colorize", KIcon::SizeMedium) );
+                        BarIcon("colorize", TDEIcon::SizeMedium) );
     _colorBackground = new KPrConfigureColorBackground( parent, page );
 
     page = addVBoxPage( i18n("Spelling"), i18n("Spellchecker Behavior"),
-                        BarIcon("spellcheck", KIcon::SizeMedium) );
+                        BarIcon("spellcheck", TDEIcon::SizeMedium) );
     _spellPage=new KPrConfigureSpellPage(parent, page);
 
     page = addVBoxPage( i18n("Misc"), i18n("Misc"),
-                        BarIcon("misc", KIcon::SizeMedium) );
+                        BarIcon("misc", TDEIcon::SizeMedium) );
     _miscPage=new KPrConfigureMiscPage(parent, page);
 
     page = addVBoxPage( i18n("Document"), i18n("Document Settings"),
-                        BarIcon("kpresenter_kpr", KIcon::SizeMedium) );
+                        BarIcon("kpresenter_kpr", TDEIcon::SizeMedium) );
 
     _defaultDocPage=new KPrConfigureDefaultDocPage(parent, page);
 
     page = addVBoxPage( i18n("Tools"), i18n("Default Tools Settings"),
-                        BarIcon("configure", KIcon::SizeMedium) );
+                        BarIcon("configure", TDEIcon::SizeMedium) );
 
     _toolsPage=new KPrConfigureToolsPage(parent, page);
 
@@ -118,7 +118,7 @@ KPrConfig::KPrConfig( KPrView* parent )
 
     if (KoSpeaker::isKttsdInstalled()) {
         page = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"), i18n("Text-to-Speech Settings"),
-                            BarIcon("access", KIcon::SizeMedium) );
+                            BarIcon("access", TDEIcon::SizeMedium) );
         m_ttsPage=new KPrConfigureTTSPage(parent, page);
     } else m_ttsPage = 0;
 
diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp
index 4f2d59ca..3e28c748 100644
--- a/kpresenter/KPrRotationDialogImpl.cpp
+++ b/kpresenter/KPrRotationDialogImpl.cpp
@@ -117,9 +117,9 @@ void KPrRotationDialogImpl::angleMode( int angle )
 KPrCircleToggle::KPrCircleToggle( TQWidget *parent, const TQString &image, int id )
     : TQLabel( parent )
 {
-    KIconLoader il("kpresenter");
-    m_off = il.loadIcon("rotate/" + image, KIcon::NoGroup, 28);
-    m_on = il.loadIcon("rotate/" + image + "dn", KIcon::NoGroup, 28);
+    TDEIconLoader il("kpresenter");
+    m_off = il.loadIcon("rotate/" + image, TDEIcon::NoGroup, 28);
+    m_on = il.loadIcon("rotate/" + image + "dn", TDEIcon::NoGroup, 28);
 
     m_selected = false;
     m_id = id;
diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp
index 29d56561..00ee8139 100644
--- a/kpresenter/KPrSideBar.cpp
+++ b/kpresenter/KPrSideBar.cpp
@@ -234,7 +234,7 @@ void KPrSideBarBase::setViewMasterPage( bool _b )
 }
 
 KPrThumbBar::KPrThumbBar(TQWidget *parent, KPrDocument *d, KPrView *v)
-    :KIconView(parent), KPrSideBarBase( d,v)
+    :TDEIconView(parent), KPrSideBarBase( d,v)
 {
     uptodate = false;
     m_offsetX = 0;
diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h
index a1190bdb..1888cacb 100644
--- a/kpresenter/KPrSideBar.h
+++ b/kpresenter/KPrSideBar.h
@@ -63,7 +63,7 @@ protected:
     bool m_viewMasterPage;
 };
 
-class KPrThumbBar : public KIconView, public KPrSideBarBase
+class KPrThumbBar : public TDEIconView, public KPrSideBarBase
 {
     Q_OBJECT
   
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index f1306594..b4f9d144 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -290,13 +290,13 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
              this, TQT_SLOT( slotSoundFileChanged( const TQString& ) ) );
 
     buttonTestPlaySoundEffect = new TQPushButton( soundgrp );
-    buttonTestPlaySoundEffect->setPixmap( BarIcon("1rightarrow", KIcon::SizeSmall) );
+    buttonTestPlaySoundEffect->setPixmap( BarIcon("1rightarrow", TDEIcon::SizeSmall) );
     TQToolTip::add( buttonTestPlaySoundEffect, i18n("Play") );
 
     connect( buttonTestPlaySoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( playSound() ) );
 
     buttonTestStopSoundEffect = new TQPushButton( soundgrp );
-    buttonTestStopSoundEffect->setPixmap( BarIcon("player_stop", KIcon::SizeSmall) );
+    buttonTestStopSoundEffect->setPixmap( BarIcon("player_stop", TDEIcon::SizeSmall) );
     TQToolTip::add( buttonTestStopSoundEffect, i18n("Stop") );
 
     connect( buttonTestStopSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSound() ) );
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index f96b095d..90e8537e 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -6463,7 +6463,7 @@ void KPrView::documentModified( bool b )
         return;
 
     if ( b )
-        m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", KIcon::Small ) );
+        m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", TDEIcon::Small ) );
     else
         m_sbModifiedLabel->setText( "   " );
 }
diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp
index 5914a621..9c4e2e5e 100644
--- a/kpresenter/autoformEdit/AFChoose.cpp
+++ b/kpresenter/autoformEdit/AFChoose.cpp
@@ -87,8 +87,8 @@ void AFChoose::setupTabs()
         {
             grpPtr->tab = new TQVBox(this);
             TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined shape by clicking on it then clicking the OK button (or just double-click on the shape). You can then insert the shape onto your slide by drawing the area with the mouse pointer." ) );
-            grpPtr->loadWid = new KIconCanvas(grpPtr->tab);
-            // Changes for the new KIconCanvas (Werner)
+            grpPtr->loadWid = new TDEIconCanvas(grpPtr->tab);
+            // Changes for the new TDEIconCanvas (Werner)
             TQDir d( grpPtr->dir.absFilePath() );
             d.setNameFilter( "*.desktop" );
             if( d.exists() ) {
@@ -111,7 +111,7 @@ void AFChoose::setupTabs()
                         }
                         grpPtr->entries.insert(text, filename);
                         // now load the icon and create the item
-                        // This code is shamelessly borrowed from KIconCanvas::slotLoadFiles
+                        // This code is shamelessly borrowed from TDEIconCanvas::slotLoadFiles
                         TQImage img;
                         img.load(icon);
                         if (img.isNull()) {
diff --git a/kpresenter/autoformEdit/AFChoose.h b/kpresenter/autoformEdit/AFChoose.h
index 883da064..06575fed 100644
--- a/kpresenter/autoformEdit/AFChoose.h
+++ b/kpresenter/autoformEdit/AFChoose.h
@@ -27,7 +27,7 @@
 #include <tqfileinfo.h>
 
 class TQLabel;
-class KIconCanvas;
+class TDEIconCanvas;
 
 class AFChoose : public TQTabDialog
 {
@@ -48,7 +48,7 @@ private:
         TQFileInfo dir;
         TQString name;
         TQWidget *tab;
-        KIconCanvas *loadWid;
+        TDEIconCanvas *loadWid;
         TQLabel *label;
         TQMap<TQString, TQString> entries;
     };
diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc
index 3c654bb6..91cec3e4 100644
--- a/kspread/dialogs/kspread_dlg_formula.cc
+++ b/kspread/dialogs/kspread_dlg_formula.cc
@@ -104,7 +104,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for
 
     selectFunction = new TQPushButton( page );
     TQToolTip::add(selectFunction, i18n("Insert function") );
-    selectFunction->setPixmap( BarIcon( "down", KIcon::SizeSmall ) );
+    selectFunction->setPixmap( BarIcon( "down", TDEIcon::SizeSmall ) );
     grid1->addWidget( selectFunction, 3, 0 );
 
     result = new TQLineEdit( page );
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index a14312d2..0a15da25 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -65,28 +65,28 @@ PreferenceDialog::PreferenceDialog( View* parent, const char* /*name*/)
 
   connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply()));
 
-  TQVBox *page2=addVBoxPage(i18n("Locale Settings"), TQString(),BarIcon("gohome",KIcon::SizeMedium));
+  TQVBox *page2=addVBoxPage(i18n("Locale Settings"), TQString(),BarIcon("gohome",TDEIcon::SizeMedium));
  _localePage=new parameterLocale(parent,page2 );
 
-  TQVBox *page3=addVBoxPage(i18n("Interface"), TQString(),BarIcon("signature", KIcon::SizeMedium) );
+  TQVBox *page3=addVBoxPage(i18n("Interface"), TQString(),BarIcon("signature", TDEIcon::SizeMedium) );
   _configure = new  configure(parent,page3 );
 
-  TQVBox * page4=addVBoxPage(i18n("Misc"), TQString(),BarIcon("misc",KIcon::SizeMedium) );
+  TQVBox * page4=addVBoxPage(i18n("Misc"), TQString(),BarIcon("misc",TDEIcon::SizeMedium) );
   _miscParameter = new  miscParameters(parent,page4 );
 
-  TQVBox *page5=addVBoxPage(i18n("Color"), TQString(),BarIcon("colorize",KIcon::SizeMedium) );
+  TQVBox *page5=addVBoxPage(i18n("Color"), TQString(),BarIcon("colorize",TDEIcon::SizeMedium) );
   _colorParameter=new colorParameters(parent,page5 );
 
-  TQVBox *page6=addVBoxPage(i18n("Page Layout"), TQString(),BarIcon("edit",KIcon::SizeMedium) );
+  TQVBox *page6=addVBoxPage(i18n("Page Layout"), TQString(),BarIcon("edit",TDEIcon::SizeMedium) );
   _layoutPage=new configureLayoutPage(parent,page6 );
 
   TQVBox *page7 = addVBoxPage( i18n("Spelling"), i18n("Spell Checker Behavior"),
-                          BarIcon("spellcheck", KIcon::SizeMedium) );
+                          BarIcon("spellcheck", TDEIcon::SizeMedium) );
   _spellPage=new configureSpellPage(parent,page7);
 
   if (KoSpeaker::isKttsdInstalled()) {
       TQVBox *page8 = addVBoxPage( i18n("Abbreviation for Text-to-Speech", "TTS"),
-          i18n("Text-to-Speech Settings"), BarIcon("access", KIcon::SizeMedium) );
+          i18n("Text-to-Speech Settings"), BarIcon("access", TDEIcon::SizeMedium) );
       _ttsPage=new configureTTSPage(parent, page8);
   } else _ttsPage = 0;
 
diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc
index eb1dfe87..dfa7c385 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cc
@@ -67,7 +67,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* )
     
     // link for web or ftp
     d->internetPage = addPage( i18n( "Internet" ), TQString(), 
-        BarIcon( "html",KIcon::SizeMedium ) );
+        BarIcon( "html",TDEIcon::SizeMedium ) );
     TQVBoxLayout* iLayout = new TQVBoxLayout( d->internetPage, marginHint(), spacingHint() );
     iLayout->add( new TQLabel( i18n("Text to display:" ), d->internetPage ) );
     d->internetText = new KLineEdit( d->internetPage );
@@ -81,7 +81,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* )
     
     // link for e-mail
     d->mailPage = addPage( i18n( "Mail" ), TQString(), 
-        BarIcon( "mail_generic",KIcon::SizeMedium ) );
+        BarIcon( "mail_generic",TDEIcon::SizeMedium ) );
     TQVBoxLayout* mLayout = new TQVBoxLayout( d->mailPage, marginHint(), spacingHint() );
     mLayout->add( new TQLabel( i18n("Text to display:" ), d->mailPage ) );
     d->mailText = new KLineEdit( d->mailPage );
@@ -95,7 +95,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* )
     
     // link for external file
     d->filePage = addPage( i18n( "File" ), TQString(), 
-        BarIcon( "filenew",KIcon::SizeMedium ) );
+        BarIcon( "filenew",TDEIcon::SizeMedium ) );
     TQVBoxLayout* fLayout = new TQVBoxLayout( d->filePage, marginHint(), spacingHint() );
     fLayout->add( new TQLabel( i18n("Text to display:" ), d->filePage ) );
     d->fileText = new KLineEdit( d->filePage );
@@ -130,7 +130,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* )
     
     // link to another cell
     d->cellPage =  addPage( i18n( "Cell" ), TQString(), 
-        BarIcon( "misc",KIcon::SizeMedium ) );
+        BarIcon( "misc",TDEIcon::SizeMedium ) );
     TQVBoxLayout* cLayout = new TQVBoxLayout( d->cellPage, marginHint(), spacingHint() );
     cLayout->add( new TQLabel( i18n("Text to display:" ), d->cellPage ) );
     d->cellText = new KLineEdit( d->cellPage );
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index 3a9cd15e..6853f2c7 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -75,7 +75,7 @@ using namespace KSpell2;
 // (Note: KDialogBase should have version of the methods that take a TQString for the icon name)
 static inline TQPixmap loadIcon( const char * name ) {
   return TDEGlobal::instance()->iconLoader()
-    ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
+    ->loadIcon( TQString::fromLatin1(name), TDEIcon::NoGroup, TDEIcon::SizeMedium );
 }
 
 KWConfig::KWConfig( KWView* parent )
diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp
index 9e032e81..e39947dc 100644
--- a/kword/KWDocStruct.cpp
+++ b/kword/KWDocStruct.cpp
@@ -721,22 +721,22 @@ KWDocStructRootItem::KWDocStructRootItem(TQListView* parent, const TQString& tex
 {
     switch ( type ) {
         case Arrangement: {
-            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tree_arrange", KIcon::Small ) );
+            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "tree_arrange", TDEIcon::Small ) );
         } break;
         case TextFrames: {
-            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_text", KIcon::Small ) );
+            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_text", TDEIcon::Small ) );
         } break;
         case FormulaFrames: {
-            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_formula", KIcon::Small ) );
+            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_formula", TDEIcon::Small ) );
         }break;
         case Tables: {
-            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "inline_table", KIcon::Small ) );
+            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "inline_table", TDEIcon::Small ) );
         } break;
         case Pictures: {
-            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_image", KIcon::Small ) );
+            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_image", TDEIcon::Small ) );
         } break;
         case Embedded: {
-            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_query", KIcon::Small ) );
+            setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "frame_query", TDEIcon::Small ) );
         } break;
     }
 }
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 227f75a5..4e3822a8 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -6006,7 +6006,7 @@ void KWView::documentModified( bool b )
         return;
 
     if ( b )
-        m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", KIcon::Small ) );
+        m_sbModifiedLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "action-modified", TDEIcon::Small ) );
     else
         m_sbModifiedLabel->setText( "   " );
 }
diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp
index 93236c2b..61bbe0d4 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.cpp
+++ b/lib/kofficecore/KoDocumentInfoDlg.cpp
@@ -202,9 +202,9 @@ void KoDocumentInfoDlg::addAuthorPage( KoDocumentInfoAuthor *authorInfo )
 {
   TQVBox *page = d->m_dialog->addVBoxPage( i18n( "Author" ) );
   d->m_authorWidget = new KoDocumentInfoAuthorWidget( page );
-  d->m_authorWidget->labelAuthor->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 48 ) );
-  d->m_authorWidget->pbLoadKABC->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ) ) );
-  d->m_authorWidget->pbDelete->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "eraser", KIcon::Small ) ) );
+  d->m_authorWidget->labelAuthor->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Desktop, 48 ) );
+  d->m_authorWidget->pbLoadKABC->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", TDEIcon::Small ) ) );
+  d->m_authorWidget->pbDelete->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "eraser", TDEIcon::Small ) ) );
 
   d->m_authorWidget->leFullName->setText( authorInfo->fullName() );
   d->m_authorWidget->leInitial->setText( authorInfo->initial() );
@@ -256,13 +256,13 @@ void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo )
 {
   TQVBox *page = d->m_dialog->addVBoxPage( i18n( "General" ) );
   d->m_aboutWidget = new KoDocumentInfoAboutWidget( page );
-  d->m_aboutWidget->pbReset->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) ) );
+  d->m_aboutWidget->pbReset->setIconSet( TQIconSet( TDEGlobal::iconLoader()->loadIcon( "reload", TDEIcon::Small ) ) );
   KoDocument* doc = dynamic_cast< KoDocument* >( d->m_info->parent() );
   if ( doc )
   {
     d->m_aboutWidget->leDocFile->setText( doc->file() );
     d->m_aboutWidget->labelType->setText( KMimeType::mimeType( doc->mimeType() )->comment() );
-    d->m_aboutWidget->pixmapLabel->setPixmap( KMimeType::mimeType( doc->mimeType() )->pixmap( KIcon::Desktop, 48 ) );
+    d->m_aboutWidget->pixmapLabel->setPixmap( KMimeType::mimeType( doc->mimeType() )->pixmap( TDEIcon::Desktop, 48 ) );
   }
   if ( aboutInfo->creationDate() != TQString() )
     d->m_aboutWidget->labelCreated->setText( aboutInfo->creationDate() + ", " + aboutInfo->initialCreator() );
@@ -302,7 +302,7 @@ void KoDocumentInfoDlg::addUserMetadataPage( KoDocumentInfoUserMetadata *userMet
         TQString name = it.key();
         TQString value = it.data();
         TDEListViewItem* it = new TDEListViewItem( d->m_metaWidget->metaListView, name, value );
-        it->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ) );
+        it->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "text", TDEIcon::Small ) );
     }
 }
 
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 6459171a..16608406 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -258,7 +258,7 @@ void KoOpenPane::setCustomDocumentWidget(TQWidget *widget) {
 
 TQListViewItem* KoOpenPane::addPane(const TQString& title, const TQString& icon, TQWidget* widget, int sortWeight)
 {
-  return addPane(title, SmallIcon(icon, KIcon::SizeLarge, KIcon::DefaultState, d->m_instance),
+  return addPane(title, SmallIcon(icon, TDEIcon::SizeLarge, TDEIcon::DefaultState, d->m_instance),
                  widget, sortWeight);
 }
 
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index 68daddb0..dd8410e3 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -66,7 +66,7 @@ const TQPixmap &KoTemplate::loadPicture( TDEInstance* instance ) {
         m_pixmap.convertFromImage(img);
         return m_pixmap;
     } else { // relative path
-        m_pixmap = instance->iconLoader()->loadIcon( m_picture, KIcon::Desktop, 128 );
+        m_pixmap = instance->iconLoader()->loadIcon( m_picture, TDEIcon::Desktop, 128 );
         return m_pixmap;
     }
 }
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index 1f1d2f4c..1329f8a9 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -42,21 +42,21 @@ KoInsertLinkDia::KoInsertLinkDia( TQWidget *parent, const char *name, bool displ
 		   KDialogBase::Ok, parent, name )
 {
   bookmarkLink = 0L;
-  TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("html",KIcon::SizeMedium));
+  TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("html",TDEIcon::SizeMedium));
   internetLink = new  internetLinkPage(page );
   connect(internetLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged (  )));
 
-  page=addVBoxPage(i18n("Mail & News"), TQString(),BarIcon("mail_generic",KIcon::SizeMedium));
+  page=addVBoxPage(i18n("Mail & News"), TQString(),BarIcon("mail_generic",TDEIcon::SizeMedium));
   mailLink = new  mailLinkPage(page );
   connect(mailLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
 
-  page=addVBoxPage(i18n("File"), TQString(),BarIcon("filenew",KIcon::SizeMedium));
+  page=addVBoxPage(i18n("File"), TQString(),BarIcon("filenew",TDEIcon::SizeMedium));
   fileLink = new  fileLinkPage(page );
   connect(fileLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
 
   if ( displayBookmarkLink)
   {
-      page=addVBoxPage(i18n("Bookmark"), TQString(),BarIcon("bookmark",KIcon::SizeMedium));
+      page=addVBoxPage(i18n("Bookmark"), TQString(),BarIcon("bookmark",TDEIcon::SizeMedium));
       bookmarkLink = new  bookmarkLinkPage(page );
       connect(bookmarkLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ()));
   }
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index a5b057bc..0c6abfaa 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -98,7 +98,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
     if ( hasIconSet() )
       id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
     else
-      id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), KIcon::Small),
+      id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
         text(), popupMenu(), -1, index );
 
     if ( !isEnabled() )
diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h
index ba6f17e1..6797a69c 100644
--- a/lib/kofficeui/KoTemplateChooseDia.h
+++ b/lib/kofficeui/KoTemplateChooseDia.h
@@ -37,16 +37,16 @@ class KoTemplateGroup;
 class TQGridLayout;
 
 /**
- * Our reimplementation of KIconCanvas used within the template-chooser dialog.
+ * Our reimplementation of TDEIconCanvas used within the template-chooser dialog.
  * @internal
  */
-class KoTCDIconCanvas : public KIconCanvas
+class KoTCDIconCanvas : public TDEIconCanvas
 {
     Q_OBJECT
   
     public:
 	KoTCDIconCanvas( TQWidget *parent = 0, const char *name = 0L )
-	    : KIconCanvas( parent, name ) {}
+	    : TDEIconCanvas( parent, name ) {}
 
 	bool isCurrentValid() { return currentItem(); }
 	TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, TDEInstance* instance);
@@ -56,21 +56,21 @@ class KoTCDIconCanvas : public KIconCanvas
 	    if ( e->key() == Key_Return || e->key() == Key_Enter )
 		e->ignore();
 	    else
-		KIconCanvas::keyPressEvent( e );
+		TDEIconCanvas::keyPressEvent( e );
 	}
 };
 
 /// @internal
-class KoTCDIconViewItem : public KIconViewItem
+class KoTCDIconViewItem : public TDEIconViewItem
 {
     public:
 	KoTCDIconViewItem(TQIconView *parent=0)
-	    : KIconViewItem ( parent )
+	    : TDEIconViewItem ( parent )
 	    {}
 
 	KoTCDIconViewItem(TQIconView *parent=0, const TQString &text=0, const TQPixmap &icon=0,
                       const TQString &descr=0, const TQString &fullname=0)
-	    : KIconViewItem(parent, text, icon)
+	    : TDEIconViewItem(parent, text, icon)
 	    {
             m_descr = descr;
             m_full = fullname;
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 9b1f213c..09e7833e 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -367,7 +367,7 @@ void KoTemplateCreateDia::slotSelect() {
     d->m_default->setChecked(false);
     d->m_custom->setChecked(true);
 
-    TQString name = KIconDialog::getIcon();
+    TQString name = TDEIconDialog::getIcon();
     if( name.isEmpty() ) {
         if(d->m_customFile.isEmpty()) {
             d->m_default->setChecked(true);
@@ -376,7 +376,7 @@ void KoTemplateCreateDia::slotSelect() {
         return;
     }
     // ### TODO: do a better remote loading without having to have d->m_tempFile
-    TQString path = TDEGlobal::iconLoader()->iconPath(name, KIcon::Desktop);
+    TQString path = TDEGlobal::iconLoader()->iconPath(name, TDEIcon::Desktop);
     d->m_customFile = path;
     d->m_customPixmap=TQPixmap();
     updatePixmap();
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index 2f9a41e2..0bbf4ff8 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -251,7 +251,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
             else
                 instance = TDEGlobal::instance();
             */
-            id = menu->insertItem( iconSet( KIcon::Small, 0 ), text(), this,//dsweet
+            id = menu->insertItem( iconSet( TDEIcon::Small, 0 ), text(), this,//dsweet
                                    TQT_SLOT( slotActivated() ), 0, -1, index );
         }
         else
@@ -289,7 +289,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
 
         if ( icon().isEmpty() ) // old code using TQIconSet directly
         {
-            bar->insertButton( iconSet( KIcon::Small ).pixmap(), id_, TQT_SIGNAL( clicked() ), this,
+            bar->insertButton( iconSet( TDEIcon::Small ).pixmap(), id_, TQT_SIGNAL( clicked() ), this,
                                TQT_SLOT( slotActivated() ),
                                isEnabled(), plainText(), index );
         }
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index eb190613..89574bcf 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -166,7 +166,7 @@ void TTDESelectColorAction::updatePixmap()
       }
     }
     else if(w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) {
-        TQPixmap pix =iconSet(KIcon::Small).pixmap(TQIconSet::Automatic,TQIconSet::Active);
+        TQPixmap pix =iconSet(TDEIcon::Small).pixmap(TQIconSet::Automatic,TQIconSet::Active);
   if ( pix.isNull() )
       return;
         TQPainter p(&pix);
diff --git a/lib/kofficeui/ttdeaction.cpp b/lib/kofficeui/ttdeaction.cpp
index bfdc6c11..6725812a 100644
--- a/lib/kofficeui/ttdeaction.cpp
+++ b/lib/kofficeui/ttdeaction.cpp
@@ -155,7 +155,7 @@ void TTDEAction::updateLayout(TQWidget* base)
 
   TQPixmap pix;
   if (hasIcon())
-    pix = iconSet(KIcon::Small).pixmap();
+    pix = iconSet(TDEIcon::Small).pixmap();
 
   if (!icon().isEmpty())
     pix = BarIcon(icon());
diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp
index 51d82500..72956275 100644
--- a/lib/kofficeui/ttdetoolbarbutton.cpp
+++ b/lib/kofficeui/ttdetoolbarbutton.cpp
@@ -190,23 +190,23 @@ void TTDEToolBarButton::setIcon( const TQString& icon )
   d->m_iconName = icon;
   int iconSize = 16;
 
-  setPixmap( BarIcon(icon, iconSize, KIcon::ActiveState, d->m_instance), false );
-  setDisabledPixmap( BarIcon(icon, iconSize, KIcon::DisabledState, d->m_instance) );
-  setDefaultPixmap( BarIcon(icon, iconSize, KIcon::DefaultState, d->m_instance) );
+  setPixmap( BarIcon(icon, iconSize, TDEIcon::ActiveState, d->m_instance), false );
+  setDisabledPixmap( BarIcon(icon, iconSize, TDEIcon::DisabledState, d->m_instance) );
+  setDefaultPixmap( BarIcon(icon, iconSize, TDEIcon::DefaultState, d->m_instance) );
 }
 
 void TTDEToolBarButton::setDisabledIcon( const TQString &icon )
 {
   d->m_disabledIconName = icon;
   int iconSize = 16;
-  setDisabledPixmap( BarIcon(icon, iconSize, KIcon::DisabledState, d->m_instance) );
+  setDisabledPixmap( BarIcon(icon, iconSize, TDEIcon::DisabledState, d->m_instance) );
 }
 
 void TTDEToolBarButton::setDefaultIcon( const TQString &icon )
 {
   d->m_defaultIconName = icon;
   int iconSize = 16;
-  setDefaultPixmap( BarIcon(icon, iconSize, KIcon::DefaultState, d->m_instance) );
+  setDefaultPixmap( BarIcon(icon, iconSize, TDEIcon::DefaultState, d->m_instance) );
 }
 
 TQPixmap TTDEToolBarButton::getActivePixmap() const
@@ -417,8 +417,8 @@ void TTDEToolBarButton::makeDefaultPixmap()
   if (activePixmap.isNull())
     return;
 
-  KIconEffect effect;
-  defaultPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DefaultState);
+  TDEIconEffect effect;
+  defaultPixmap = effect.apply(activePixmap, TDEIcon::Toolbar, TDEIcon::DefaultState);
 }
 
 void TTDEToolBarButton::makeDisabledPixmap()
@@ -426,8 +426,8 @@ void TTDEToolBarButton::makeDisabledPixmap()
   if (activePixmap.isNull())
     return;
 
-  KIconEffect effect;
-  disabledPixmap = effect.apply(activePixmap, KIcon::Toolbar, KIcon::DisabledState);
+  TDEIconEffect effect;
+  disabledPixmap = effect.apply(activePixmap, TDEIcon::Toolbar, TDEIcon::DisabledState);
 }
 
 TQSize TTDEToolBarButton::sizeHint() const
diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp
index 7791730c..839d6d52 100644
--- a/lib/koproperty/editors/booledit.cpp
+++ b/lib/koproperty/editors/booledit.cpp
@@ -86,17 +86,17 @@ static void drawViewerInternal(TQPainter *p, const TQRect &r, const TQVariant &v
 {
     p->eraseRect(r);
     TQRect r2(r);
-    r2.moveLeft(KIcon::SizeSmall + 6);
+    r2.moveLeft(TDEIcon::SizeSmall + 6);
 
     if(value.isNull() && !nullText.isEmpty()) {
         p->drawText(r2, TQt::AlignVCenter | TQt::AlignLeft, nullText);
     }
     else if(value.toBool()) {
-        p->drawPixmap(3, (r.height()-1-KIcon::SizeSmall)/2, yesIcon);
+        p->drawPixmap(3, (r.height()-1-TDEIcon::SizeSmall)/2, yesIcon);
         p->drawText(r2, TQt::AlignVCenter | TQt::AlignLeft, i18n("Yes"));
     }
     else {
-        p->drawPixmap(3, (r.height()-1-KIcon::SizeSmall)/2, noIcon);
+        p->drawPixmap(3, (r.height()-1-TDEIcon::SizeSmall)/2, noIcon);
         p->drawText(r2, TQt::AlignVCenter | TQt::AlignLeft, i18n("No"));
     }
 }
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 4cbae081..a29c9676 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -137,18 +137,18 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
     slotSelectionChanged(0);
     connect(scriptsList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
 
-    btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "exec", KIcon::MainToolbar, 16 ));
+    btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "exec", TDEIcon::MainToolbar, 16 ));
     connect(btnExec, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript()));
-    btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileopen", KIcon::MainToolbar, 16 ));
+    btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileopen", TDEIcon::MainToolbar, 16 ));
     connect(btnLoad, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript()));
-    btnUnload->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", KIcon::MainToolbar, 16 ));
+    btnUnload->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", TDEIcon::MainToolbar, 16 ));
     connect(btnUnload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript()));
-    btnInstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileimport", KIcon::MainToolbar, 16 ));
+    btnInstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileimport", TDEIcon::MainToolbar, 16 ));
     connect(btnInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript()));
-    btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", KIcon::MainToolbar, 16 ));
+    btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", TDEIcon::MainToolbar, 16 ));
     connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript()));
 #ifdef KROSS_SUPPORT_NEWSTUFF
-    btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", KIcon::MainToolbar, 16 ));
+    btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", TDEIcon::MainToolbar, 16 ));
     connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript()));
 #endif
 /*
@@ -218,11 +218,11 @@ TQListViewItem* WdgScriptsManager::addItem(ScriptAction::Ptr action, TQListViewI
 
     TQPixmap pm;
     if(action->hasIcon()) {
-        KIconLoader* icons = TDEGlobal::iconLoader();
-        pm = icons->loadIconSet(action->icon(), KIcon::Small).pixmap(TQIconSet::Small, TQIconSet::Active);
+        TDEIconLoader* icons = TDEGlobal::iconLoader();
+        pm = icons->loadIconSet(action->icon(), TDEIcon::Small).pixmap(TQIconSet::Small, TQIconSet::Active);
     }
     else {
-        pm = action->iconSet(KIcon::Small, 16).pixmap(TQIconSet::Small, TQIconSet::Active);
+        pm = action->iconSet(TDEIcon::Small, 16).pixmap(TQIconSet::Small, TQIconSet::Active);
     }
     if(! pm.isNull())
         i->setPixmap(0, pm); // display the icon