Rename KIcon to enhance compatibility with KDE4

33 files changed, 98 insertions, 98 deletions

diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js
index 6584f5fff..31c32980e 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 5bbbde380..0e59a08f1 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 5146576c6..e668aa482 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 125e47838..052f149a1 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 8b8320610..acb3cf075 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 2dd9ebe15..417efd050 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 0388eebe2..56675be85 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 2558b4e7d..870d6f243 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 e7f613e68..29b4c2ca6 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 eeb46da68..b3ee1ce7f 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 21eb3edf3..7d06dd2e0 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 5db58c82c..d99ad4aed 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 74591986a..58d128831 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 ff2981f79..a37201b25 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 4ba3b8592..dde61c8aa 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 c98ca67aa..6910bda95 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 aaa969088..c0608072d 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 a512994d0..8b676fb09 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 1ed65ddc2..143a03921 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 7fa1c3b3c..514be26a6 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 3da16500d..e351508ee 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 404bc746c..1c1f929b9 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 fe81b9eb0..f688fa648 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 aea9b22f4..1a0363047 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 e2a5ac310..bf5c64912 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 8852f81cc..27f893959 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 ef94b5d23..6adfc94a8 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 7f9008666..28629be13 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 cba194833..b9420f67e 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 91523cb77..4982fffae 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 4d17b3b92..fb7f60494 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 9cfcfe273..11664e54f 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 b975fcdf9..8fdac6801 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