Rename a number of classes to enhance compatibility with KDE4

39 files changed, 119 insertions, 119 deletions

diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index bec4de7d..59cfefa5 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -46,7 +46,7 @@
 #include <widget/kexibrowseritem.h>
 #include <kexiutils/utils.h>
 
-typedef KListViewItemTemplate<TQString> ActionSelectorDialogListItemBase;
+typedef TDEListViewItemTemplate<TQString> ActionSelectorDialogListItemBase;
 
 class ActionSelectorDialogListItem : public ActionSelectorDialogListItemBase
 {
@@ -79,7 +79,7 @@ protected:
 //---------------------------------------
 
 ActionsListViewBase::ActionsListViewBase(TQWidget* parent)
- : KListView(parent)
+ : TDEListView(parent)
 {
 	setResizeMode(TQListView::AllColumns);
 	addColumn("");
@@ -115,27 +115,27 @@ void ActionsListViewBase::selectAction(const TQString& actionName)
 
 //---------------------------------------
 
-KActionsListViewBase::KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin)
+TDEActionsListViewBase::TDEActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin)
 	: ActionsListViewBase(parent)
 	, m_mainWin(mainWin)
 {
 }
 
-KActionsListViewBase::~KActionsListViewBase() {}
+TDEActionsListViewBase::~TDEActionsListViewBase() {}
 
-void KActionsListViewBase::init()
+void TDEActionsListViewBase::init()
 {
 	setSorting(0);
 	const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) );
-	KActionPtrList sharedActions( m_mainWin->allActions() );
+	TDEActionPtrList sharedActions( m_mainWin->allActions() );
 	const Kexi::ActionCategories *acat = Kexi::actionCategories();
-	foreach (KActionPtrList::ConstIterator, it, sharedActions) {
+	foreach (TDEActionPtrList::ConstIterator, it, sharedActions) {
 //			kdDebug() << (*it)->name() << " " << (*it)->text() << endl;
 		//! @todo group actions
-		//! @todo: store KAction* here?
+		//! @todo: store TDEAction* here?
 		const int actionCategories = acat->actionCategories((*it)->name());
 		if (actionCategories==-1) {
-			kexipluginswarn << "KActionsListViewBase(): no category declared for action \"" 
+			kexipluginswarn << "TDEActionsListViewBase(): no category declared for action \"" 
 				<< (*it)->name() << "\"! Fix this!" << endl;
 			continue;
 		}
@@ -152,15 +152,15 @@ void KActionsListViewBase::init()
 
 //---------------------------------------
 
-//! @internal Used to display KActions (in column 2)
-class KActionsListView : public KActionsListViewBase
+//! @internal Used to display TDEActions (in column 2)
+class TDEActionsListView : public TDEActionsListViewBase
 {
 public:
-	KActionsListView(TQWidget* parent, KexiMainWindow* mainWin)
-		: KActionsListViewBase(parent, mainWin)
+	TDEActionsListView(TQWidget* parent, KexiMainWindow* mainWin)
+		: TDEActionsListViewBase(parent, mainWin)
 	{
 	}
-	virtual ~KActionsListView() {}
+	virtual ~TDEActionsListView() {}
 
 	virtual bool isActionVisible(const char* actionName, int actionCategories) const {
 		Q_UNUSED(actionName);
@@ -168,12 +168,12 @@ public:
 	}
 };
 
-//! @internal Used to display KActions (in column 2)
-class CurrentFormActionsListView : public KActionsListViewBase
+//! @internal Used to display TDEActions (in column 2)
+class CurrentFormActionsListView : public TDEActionsListViewBase
 {
 public:
 	CurrentFormActionsListView(TQWidget* parent, KexiMainWindow* mainWin)
-		: KActionsListViewBase(parent, mainWin)
+		: TDEActionsListViewBase(parent, mainWin)
 	{
 	}
 	virtual ~CurrentFormActionsListView() {}
@@ -276,7 +276,7 @@ class ActionToExecuteListView : public ActionsListViewBase
 				ActionSelectorDialogListItem *printItem = new ActionSelectorDialogListItem(
 					"print", this, i18n("Print"));
 				printItem->setPixmap(0, SmallIcon("fileprint"));
-				KAction *a = KStdAction::printPreview(0, 0, 0);
+				TDEAction *a = KStdAction::printPreview(0, 0, 0);
 				item = new ActionSelectorDialogListItem("printPreview", printItem, 
 					a->text().replace("&", "").replace("...", ""));
 				item->setPixmap(0, SmallIcon(a->icon()));
@@ -377,7 +377,7 @@ public:
 	TQString actionWidgetName;
 	ActionCategoriesListView* actionCategoriesListView; //!< for column #1
 	TQWidget *kactionPageWidget;
-	KActionsListView* kactionListView;  //!< for column #2
+	TDEActionsListView* kactionListView;  //!< for column #2
 	KexiBrowser* objectsListView; //!< for column #2
 	TQWidget *currentFormActionsPageWidget; //!< for column #2
 	CurrentFormActionsListView* currentFormActionsListView; //!< for column #2
@@ -419,7 +419,7 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
    \______________________________________________/
                         glyr
   [a]- TQWidgetStack *secondAnd3rdColumnStack, 
-    - for displaying KActions, the stack contains d->kactionPageWidget TQWidget
+    - for displaying TDEActions, the stack contains d->kactionPageWidget TQWidget
     - for displaying objects, the stack contains secondAnd3rdColumnMainWidget TQWidget and TQGridLayout *secondAnd3rdColumnGrLyr
 	 - kactionPageWidget contains only a TQVBoxLayout and label+kactionListView
 */
@@ -530,12 +530,12 @@ KexiActionSelectionDialog::~KexiActionSelectionDialog()
 	delete d;
 }
 
-void KexiActionSelectionDialog::slotKActionItemExecuted(TQListViewItem*)
+void KexiActionSelectionDialog::slotTDEActionItemExecuted(TQListViewItem*)
 {
 	accept();
 }
 
-void KexiActionSelectionDialog::slotKActionItemSelected(TQListViewItem*)
+void KexiActionSelectionDialog::slotTDEActionItemSelected(TQListViewItem*)
 {
 	d->setActionToExecuteSectionVisible(false);
 	updateOKButtonStatus();
@@ -585,7 +585,7 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 				d->kactionPageWidget = new TQWidget();
 				d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 				TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint());
-				d->kactionListView = new KActionsListView(d->kactionPageWidget, d->mainWin);
+				d->kactionListView = new TDEActionsListView(d->kactionPageWidget, d->mainWin);
 				d->kactionListView->init();
 				TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName),
 					d->kactionPageWidget);
@@ -595,13 +595,13 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 				vlyr->addWidget(d->kactionListView);
 				d->secondAnd3rdColumnStack->addWidget(d->kactionPageWidget);
 				connect(d->kactionListView, TQT_SIGNAL(executed(TQListViewItem*)),
-					this, TQT_SLOT(slotKActionItemExecuted(TQListViewItem*)));
+					this, TQT_SLOT(slotTDEActionItemExecuted(TQListViewItem*)));
 				connect( d->kactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), 
-					this, TQT_SLOT(slotKActionItemSelected(TQListViewItem*)));
+					this, TQT_SLOT(slotTDEActionItemSelected(TQListViewItem*)));
 			}
 			d->setActionToExecuteSectionVisible(false);
 			d->raiseWidget(d->kactionPageWidget);
-			slotKActionItemSelected(d->kactionListView->selectedItem()); //to refresh column #3
+			slotTDEActionItemSelected(d->kactionListView->selectedItem()); //to refresh column #3
 		}
 		else if (simpleItem->data == "currentForm") {
 			if (!d->currentFormActionsPageWidget) {
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.h b/kexi/plugins/forms/kexiactionselectiondialog.h
index 8587287c..9d355562 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.h
+++ b/kexi/plugins/forms/kexiactionselectiondialog.h
@@ -24,14 +24,14 @@
 #include "kexiformeventhandler.h"
 
 class KexiMainWindow;
-class KListView;
+class TDEListView;
 namespace KexiPart {
 	class Item;
 }
 
 //! @short A dialog for selecting an action to be executed for a form's command button
 /*! Available actions are:
- - application's global actions like "edit->copy" (KAction-based)
+ - application's global actions like "edit->copy" (TDEAction-based)
  - opening/printing/executing of selected object (table/query/form/script/macrto, etc.)
 */
 class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase
@@ -54,8 +54,8 @@ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase
 
 	protected slots:
 		void slotActionCategorySelected(TQListViewItem* item);
-		void slotKActionItemExecuted(TQListViewItem*);
-		void slotKActionItemSelected(TQListViewItem*);
+		void slotTDEActionItemExecuted(TQListViewItem*);
+		void slotTDEActionItemSelected(TQListViewItem*);
 		void slotActionToExecuteItemExecuted(TQListViewItem* item);
 		void slotActionToExecuteItemSelected(TQListViewItem*);
 		void slotCurrentFormActionItemExecuted(TQListViewItem*);
diff --git a/kexi/plugins/forms/kexiactionselectiondialog_p.h b/kexi/plugins/forms/kexiactionselectiondialog_p.h
index 741bd230..f0527132 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog_p.h
+++ b/kexi/plugins/forms/kexiactionselectiondialog_p.h
@@ -23,7 +23,7 @@
 #include <klistview.h>
 
 //! @internal
-class ActionsListViewBase : public KListView
+class ActionsListViewBase : public TDEListView
 {
 	public:
 		ActionsListViewBase(TQWidget* parent);
@@ -34,14 +34,14 @@ class ActionsListViewBase : public KListView
 		void selectAction(const TQString& actionName);
 };
 
-//! @internal Used by KActionsListView and CurrentFormActionsListView (in column 2)
-class KActionsListViewBase : public ActionsListViewBase
+//! @internal Used by TDEActionsListView and CurrentFormActionsListView (in column 2)
+class TDEActionsListViewBase : public ActionsListViewBase
 {
 	Q_OBJECT
   
 	public:
-		KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin);
-		virtual ~KActionsListViewBase();
+		TDEActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin);
+		virtual ~TDEActionsListViewBase();
 		void init();
 		virtual bool isActionVisible(const char* actionName, int actionCategories) const = 0;
 
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index 5b7e46db..b89031a7 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -138,7 +138,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	separator->setFrameShadow(TQFrame::Sunken);
 	vlyr->addWidget(separator);*/
 /*
-	KPopupTitle *title = new KPopupTitle(this);
+	TDEPopupTitle *title = new TDEPopupTitle(this);
 	title->setTitle(i18n("Inserting fields"));
 	vlyr->addWidget(title);
 	vlyr->addSpacing(4);*/
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index bfc70226..8bb55bce 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -425,8 +425,8 @@ KexiDBFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQPopu
 	{
 		KexiDBImageBox *imageBox = static_cast<KexiDBImageBox*>(w);
 		imageBox->contextMenu()->updateActionsAvailability();
-		KActionCollection *ac = imageBox->contextMenu()->actionCollection();
-		KPopupMenu *subMenu = new KPopupMenu();
+		TDEActionCollection *ac = imageBox->contextMenu()->actionCollection();
+		TDEPopupMenu *subMenu = new TDEPopupMenu();
 //! @todo make these actions undoable/redoable
 		menu->insertItem(i18n("&Image"), subMenu);
 		ac->action("insert")->plug(subMenu);
@@ -445,10 +445,10 @@ KexiDBFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQPopu
 }
 
 void
-KexiDBFactory::createCustomActions(KActionCollection* col)
+KexiDBFactory::createCustomActions(TDEActionCollection* col)
 {
 	//this will create shared instance action for design mode (special collection is provided)
-	m_assignAction = new KAction( i18n("&Assign Action..."), SmallIconSet("form_action"),
+	m_assignAction = new TDEAction( i18n("&Assign Action..."), SmallIconSet("form_action"),
 		0, 0, 0, col, "widget_assign_action");
 }
 
diff --git a/kexi/plugins/forms/kexidbfactory.h b/kexi/plugins/forms/kexidbfactory.h
index a5830593..6be965d5 100644
--- a/kexi/plugins/forms/kexidbfactory.h
+++ b/kexi/plugins/forms/kexidbfactory.h
@@ -23,7 +23,7 @@
 
 #include <formeditor/widgetfactory.h>
 
-class KAction;
+class TDEAction;
 
 namespace KFormDesigner {
 	class Form;
@@ -43,7 +43,7 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory
 		virtual TQWidget *createWidget(const TQCString &classname, TQWidget *parent, const char *name, 
 			KFormDesigner::Container *container, int options = DefaultOptions );
 
-		virtual void createCustomActions(KActionCollection* col);
+		virtual void createCustomActions(TDEActionCollection* col);
 		virtual bool createMenuActions(const TQCString &classname, TQWidget *w, TQPopupMenu *menu,
 		   KFormDesigner::Container *container);
 		virtual bool startEditing(const TQCString &classname, TQWidget *w, KFormDesigner::Container *container);
@@ -69,7 +69,7 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory
 		virtual bool propertySetShouldBeReloadedAfterPropertyChange(const TQCString& classname, TQWidget *w, 
 			const TQCString& property);
 
-		KAction* m_assignAction;
+		TDEAction* m_assignAction;
 };
 
 #endif
diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp
index 55e999db..365f5cb4 100644
--- a/kexi/plugins/forms/kexiformeventhandler.cpp
+++ b/kexi/plugins/forms/kexiformeventhandler.cpp
@@ -70,7 +70,7 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString(
 
 KexiFormEventAction::KexiFormEventAction(KexiMainWindow *mainWin, TQObject* parent, 
 	const TQString& actionName, const TQString& objectName, const TQString& actionOption)
- : KAction(parent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName)
+ : TDEAction(parent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName)
  , m_actionOption(actionOption)
 {
 }
@@ -171,7 +171,7 @@ void KexiFormEventHandler::setMainWidgetForEventHandling(KexiMainWindow *mainWin
 		if (!ok)
 			continue;
 		if (actionType=="kaction" || actionType=="currentForm") {
-			KAction *action = mainWin->actionCollection()->action( actionArg.latin1() );
+			TDEAction *action = mainWin->actionCollection()->action( actionArg.latin1() );
 			if (!action)
 				continue;
 			TQObject::disconnect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); //safety
diff --git a/kexi/plugins/forms/kexiformeventhandler.h b/kexi/plugins/forms/kexiformeventhandler.h
index e882eeb8..69b9a20c 100644
--- a/kexi/plugins/forms/kexiformeventhandler.h
+++ b/kexi/plugins/forms/kexiformeventhandler.h
@@ -54,7 +54,7 @@ class KEXIFORMUTILS_EXPORT KexiFormEventHandler
 };
 
 //! @internal form-level action for handling "on click" actions
-class KEXIFORMUTILS_EXPORT KexiFormEventAction : public KAction
+class KEXIFORMUTILS_EXPORT KexiFormEventAction : public TDEAction
 {
 	public:
 		//! A structure used in currentActionName()
diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp
index 8c0c66e7..56d20376 100644
--- a/kexi/plugins/forms/kexiformmanager.cpp
+++ b/kexi/plugins/forms/kexiformmanager.cpp
@@ -51,13 +51,13 @@ KexiFormManager::~KexiFormManager()
 {
 }
 
-KAction* KexiFormManager::action( const char* name )
+TDEAction* KexiFormManager::action( const char* name )
 {
-	KActionCollection *col = m_part->actionCollectionForMode(Kexi::DesignViewMode);
+	TDEActionCollection *col = m_part->actionCollectionForMode(Kexi::DesignViewMode);
 	if (!col)
 		return 0;
 	TQCString n( translateName( name ).latin1() );
-	KAction *a = col->action(n.data());
+	TDEAction *a = col->action(n.data());
 	if (a)
 		return a;
 	KexiDBForm *dbform;
diff --git a/kexi/plugins/forms/kexiformmanager.h b/kexi/plugins/forms/kexiformmanager.h
index baeb74d9..1e1b767c 100644
--- a/kexi/plugins/forms/kexiformmanager.h
+++ b/kexi/plugins/forms/kexiformmanager.h
@@ -37,7 +37,7 @@ class KEXIFORMUTILS_EXPORT KexiFormManager : public KFormDesigner::FormManager
 		KexiFormManager(KexiPart::Part *parent, const char* name = 0);
 		virtual ~KexiFormManager();
 
-		virtual KAction* action( const char* name );
+		virtual TDEAction* action( const char* name );
 		virtual void enableAction( const char* name, bool enable );
 
 	public slots:
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 911c3374..b96e4814 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -127,7 +127,7 @@ KFormDesigner::WidgetLibrary* KexiFormPart::library()
 }
 
 #if 0
-void KexiFormPart::initPartActions(KActionCollection *collection)
+void KexiFormPart::initPartActions(TDEActionCollection *collection)
 {
 //this is automatic? -no
 //create child guicilent: guiClient()->setXMLFile("kexidatatableui.rc");
@@ -139,12 +139,12 @@ void KexiFormPart::initPartActions(KActionCollection *collection)
 //js	m_manager->createActions(collection, 0);
 }
 
-void KexiFormPart::initInstanceActions( int mode, KActionCollection *col )
+void KexiFormPart::initInstanceActions( int mode, TDEActionCollection *col )
 {
 	if (mode==Kexi::DesignViewMode) {
 		KFormDesigner::FormManager::self()->createActions(col, 0);
-		new KAction(i18n("Edit Tab Order..."), "tab_order", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder");
-		new KAction(i18n("Adjust Size"), "viewmagfit", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust");
+		new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder");
+		new TDEAction(i18n("Adjust Size"), "viewmagfit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust");
 	}
 	//TODO
 }
@@ -152,7 +152,7 @@ void KexiFormPart::initInstanceActions( int mode, KActionCollection *col )
 
 void KexiFormPart::initPartActions()
 {
-//	new KAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQT_SLOT(showFormUICode()),
+//	new TDEAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQT_SLOT(showFormUICode()),
 //		guiClient()->actionCollection(), "show_form_ui");
 }
 
@@ -161,13 +161,13 @@ void KexiFormPart::initInstanceActions()
 #ifdef KEXI_DEBUG_GUI
 	kapp->config()->setGroup("General");
 	if (kapp->config()->readBoolEntry("showInternalDebugger", false)) {
-		new KAction(i18n("Show Form UI Code"), "compfile", 
+		new TDEAction(i18n("Show Form UI Code"), "compfile", 
 			CTRL+Key_U, KFormDesigner::FormManager::self(), TQT_SLOT(showFormUICode()),
 			actionCollectionForMode(Kexi::DesignViewMode), "show_form_ui");
 	}
 #endif
 
-	KActionCollection *col = actionCollectionForMode(Kexi::DesignViewMode);
+	TDEActionCollection *col = actionCollectionForMode(Kexi::DesignViewMode);
 	KFormDesigner::FormManager::self()->createActions( library(), col, (KXMLGUIClient*)col->parentGUIClient() ); //guiClient() );
 
 	//connect actions provided by widget factories
@@ -180,8 +180,8 @@ void KexiFormPart::initInstanceActions()
 
 //	KFormDesigner::CreateLayoutCommand
 
-	KAction *action = createSharedAction(Kexi::DesignViewMode, i18n("Layout Widgets"), "", 0, "formpart_layout_menu", "KActionMenu");
-	KActionMenu *menu = static_cast<KActionMenu*>(action);
+	TDEAction *action = createSharedAction(Kexi::DesignViewMode, i18n("Layout Widgets"), "", 0, "formpart_layout_menu", "TDEActionMenu");
+	TDEActionMenu *menu = static_cast<TDEActionMenu*>(action);
 
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("&Horizontally"),
 		TQString(), 0, "formpart_layout_hbox"));
@@ -206,19 +206,19 @@ void KexiFormPart::initInstanceActions()
 	createSharedAction(Kexi::DesignViewMode, i18n("Send Widget to Back"), "lower", 0, "formpart_format_lower");
 
 #ifndef KEXI_NO_UNFINISHED
-	action = createSharedAction(Kexi::DesignViewMode, i18n("Other Widgets"), "", 0, "other_widgets_menu", "KActionMenu");
+	action = createSharedAction(Kexi::DesignViewMode, i18n("Other Widgets"), "", 0, "other_widgets_menu", "TDEActionMenu");
 #endif
 
-	action = createSharedAction(Kexi::DesignViewMode, i18n("Align Widgets Position"), "aoleft", 0, "formpart_align_menu", "KActionMenu");
-	menu = static_cast<KActionMenu*>(action);
+	action = createSharedAction(Kexi::DesignViewMode, i18n("Align Widgets Position"), "aoleft", 0, "formpart_align_menu", "TDEActionMenu");
+	menu = static_cast<TDEActionMenu*>(action);
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Left"), "aoleft", 0, "formpart_align_to_left") );
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Right"), "aoright", 0, "formpart_align_to_right") );
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Top"), "aotop", 0, "formpart_align_to_top") );
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Bottom"), "aobottom", 0, "formpart_align_to_bottom") );
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Grid"), "aopos2grid", 0, "formpart_align_to_grid") );
 
-	action = createSharedAction(Kexi::DesignViewMode, i18n("Adjust Widgets Size"), "aogrid", 0, "formpart_adjust_size_menu", "KActionMenu");
-	menu = static_cast<KActionMenu*>(action);
+	action = createSharedAction(Kexi::DesignViewMode, i18n("Adjust Widgets Size"), "aogrid", 0, "formpart_adjust_size_menu", "TDEActionMenu");
+	menu = static_cast<TDEActionMenu*>(action);
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Fit"), "aofit", 0, "formpart_adjust_to_fit") );
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Grid"), "aogrid", 0, "formpart_adjust_size_grid") );
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("To Shortest"), "aoshortest", 0, "formpart_adjust_height_small") );
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index b4b58f70..b73cf8ea 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -51,7 +51,7 @@ KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview)
 
 	connect(this, TQT_SIGNAL(resizingStarted()), this, TQT_SLOT(slotResizingStarted()));
 
-	m_popupMenu = new KPopupMenu(this, "contextMenu");
+	m_popupMenu = new TDEPopupMenu(this, "contextMenu");
 
 //	setFocusPolicy(NoFocus);
 }
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index daff9ef9..cf8c1d70 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -52,7 +52,7 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 	m_dte_date = 0;
 #endif
 
-	m_datePickerPopupMenu = new KPopupMenu(0, "date_popup");
+	m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup");
 	connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker()));
 	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0);
 
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.h b/kexi/plugins/forms/widgets/kexidbdateedit.h
index a9ddd6a3..638b985a 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.h
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.h
@@ -24,7 +24,7 @@
 #include "kexiformdataiteminterface.h"
 #include <tqdatetimeedit.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 class KDatePicker;
 class TQDateTimeEditor;
 
@@ -109,7 +109,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateEdit : public TQWidget, public KexiFormData
 	private:
 		KDatePicker *m_datePicker;
 		TQDateEdit *m_edit;
-		KPopupMenu *m_datePickerPopupMenu;
+		TDEPopupMenu *m_datePickerPopupMenu;
 		TQDateTimeEditor *m_dte_date;
 		bool m_invalidState : 1;
 		bool m_cleared : 1;
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index 627e1172..763bdf02 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -59,7 +59,7 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 	m_dte_date = 0;
 #endif
 
-	m_datePickerPopupMenu = new KPopupMenu(0, "date_popup");
+	m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup");
 	connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker()));
 	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0);
 
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h
index c7080a1e..a56bb30e 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h
@@ -26,7 +26,7 @@
 
 class KDatePicker;
 class TQDateTimeEditor;
-class KPopupMenu;
+class TDEPopupMenu;
 
 //! @short A db-aware datetime editor
 class KEXIFORMUTILS_EXPORT KexiDBDateTimeEdit : public TQWidget, public KexiFormDataItemInterface
@@ -98,7 +98,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateTimeEdit : public TQWidget, public KexiForm
 		TQDateEdit* m_dateEdit;
 		TQTimeEdit* m_timeEdit;
 		TQDateTimeEditor *m_dte_date, *m_dte_time;
-		KPopupMenu *m_datePickerPopupMenu;
+		TDEPopupMenu *m_datePickerPopupMenu;
 		bool m_invalidState : 1;
 		bool m_cleared : 1;
 		bool m_readOnly : 1;
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 97d36055..eaf91044 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -779,7 +779,7 @@ bool KexiDBImageBox::keyPressed(TQKeyEvent *ke)
 			return true;
 		}
 	}
-//	else if (ke->state() == TQt::ControlButton && KStdAccel::shortcut(KStdAccel::Copy).keyCodeTQt() == (ke->key()|TQt::CTRL)) {
+//	else if (ke->state() == TQt::ControlButton && TDEStdAccel::shortcut(TDEStdAccel::Copy).keyCodeTQt() == (ke->key()|TQt::CTRL)) {
 //	}
 	return false;
 }
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h
index 93e7e244..e7a46329 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.h
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.h
@@ -254,8 +254,8 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 //		TQString m_originalFileName;
 		KexiDropDownButton *m_chooser;
 		KexiImageContextMenu *m_popupMenu;
-//moved		KActionCollection m_actionCollection;
-//moved		KAction *m_insertFromFileAction, *m_saveAsAction, *m_cutAction, *m_copyAction, *m_pasteAction,
+//moved		TDEActionCollection m_actionCollection;
+//moved		TDEAction *m_insertFromFileAction, *m_saveAsAction, *m_cutAction, *m_copyAction, *m_pasteAction,
 //			*m_deleteAction, *m_propertiesAction;
 //		TQTimer m_clickTimer;
 		int m_alignment;
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index b6ab6b03..de928e37 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -199,7 +199,7 @@ void KexiDBTextEdit::selectAll()
 void KexiDBTextEdit::keyPressEvent( TQKeyEvent *ke )
 {
 	// for instance, Windows uses Ctrl+Tab for moving between tabs, so do not steal this shortcut
-	if (KStdAccel::tabNext().contains( KKey(ke) ) || KStdAccel::tabPrev().contains( KKey(ke) )) {
+	if (TDEStdAccel::tabNext().contains( KKey(ke) ) || TDEStdAccel::tabPrev().contains( KKey(ke) )) {
 		ke->ignore();
 		return;
 	}
diff --git a/kexi/plugins/forms/widgets/kexidbutils.cpp b/kexi/plugins/forms/widgets/kexidbutils.cpp
index 3f12b3dd..863b5d80 100644
--- a/kexi/plugins/forms/widgets/kexidbutils.cpp
+++ b/kexi/plugins/forms/widgets/kexidbutils.cpp
@@ -53,7 +53,7 @@ void KexiDBWidgetContextMenuExtender::createTitle(TQPopupMenu *menu)
 	if (!menu)
 		return;
 	m_contextMenu = menu;
-	KPopupTitle *titleItem = new KPopupTitle();
+	TDEPopupTitle *titleItem = new TDEPopupTitle();
 	const int id = m_contextMenu->insertItem(titleItem, -1, 0);
 	m_contextMenu->setItemEnabled(id, false);
 	TQString icon;
diff --git a/kexi/plugins/forms/widgets/kexidbutils.h b/kexi/plugins/forms/widgets/kexidbutils.h
index f4100c73..ceac5975 100644
--- a/kexi/plugins/forms/widgets/kexidbutils.h
+++ b/kexi/plugins/forms/widgets/kexidbutils.h
@@ -50,7 +50,7 @@ class KexiDBWidgetContextMenuExtender : public TQObject
 	protected:
 		KexiDataItemInterface* m_iface;
 		TQGuardedPtr<TQPopupMenu> m_contextMenu;
-		bool m_contextMenuHasTitle; //!< true if KPopupTitle has been added to the context menu.
+		bool m_contextMenuHasTitle; //!< true if TDEPopupTitle has been added to the context menu.
 };
 
 class KexiDBAutoField;
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 941f8eda..20fba8fe 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -318,7 +318,7 @@ if ( m_mode == Clipboard )
 			KURL url;
 			url.setPath( m_fname );
 			if (url.isLocalFile())
-				KRecentDirs::add(":CSVImportExport", url.directory());
+				TDERecentDirs::add(":CSVImportExport", url.directory());
 		}
 #else
 		m_fname = KFileDialog::getOpenFileName(":CSVImportExport", mimetypes.join(" "), 
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp
index 6c35e8d7..a512994d 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp
@@ -59,7 +59,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Co
 	KoMacro::MacroItem::List items = context->macro()->items();
 	for (KoMacro::MacroItem::List::ConstIterator mit = items.begin(); mit != items.end(); mit++)
 	{
-		KListViewItem* listviewitem = new KListViewItem(errorlist);
+		TDEListViewItem* listviewitem = new TDEListViewItem(errorlist);
 		listviewitem->setText(0,TQString("%1").arg(i++));
 		listviewitem->setText(1,i18n("Action"));
 		TDESharedPtr<KoMacro::MacroItem> macroitem = *mit;
@@ -80,7 +80,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Co
 		KoMacro::Variable::Map variables = macroitem->variables();
 		KoMacro::Variable::Map::ConstIterator vit;
 		for ( vit = variables.begin(); vit != variables.end(); ++vit ) {
-			KListViewItem* child = new KListViewItem(listviewitem);
+			TDEListViewItem* child = new TDEListViewItem(listviewitem);
 			child->setText(1,vit.key());
 			child->setText(2,vit.data()->toString());
 		}
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index 05d7ba72..707b2cb3 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -93,7 +93,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string>No</string>
diff --git a/kexi/plugins/macros/kexipart/keximacropart.h b/kexi/plugins/macros/kexipart/keximacropart.h
index f8109364..197676e9 100644
--- a/kexi/plugins/macros/kexipart/keximacropart.h
+++ b/kexi/plugins/macros/kexipart/keximacropart.h
@@ -50,7 +50,7 @@ class KexiMacroPart : public KexiPart::Part
 
 		/**
 		* Implementation of the KexiPart::Part::action method used to
-		* provide scripts as KAction's to the outside world.
+		* provide scripts as TDEAction's to the outside world.
 		*/
 		virtual bool execute(KexiPart::Item* item, TQObject* sender = 0);
 
diff --git a/kexi/plugins/macros/lib/action.h b/kexi/plugins/macros/lib/action.h
index c779f21a..0b19ef46 100644
--- a/kexi/plugins/macros/lib/action.h
+++ b/kexi/plugins/macros/lib/action.h
@@ -32,8 +32,8 @@
 namespace KoMacro {
 
 	/**
-	 * The Action class extendes KAction to implement some additional
-	 * functionality KAction doesn't provide.
+	 * The Action class extendes TDEAction to implement some additional
+	 * functionality TDEAction doesn't provide.
 	 */
 	class KOMACRO_EXPORT Action
 		: public TQObject // TQt functionality like signals and slots
diff --git a/kexi/plugins/macros/lib/manager.h b/kexi/plugins/macros/lib/manager.h
index 5e3ce084..5abddeae 100644
--- a/kexi/plugins/macros/lib/manager.h
+++ b/kexi/plugins/macros/lib/manager.h
@@ -48,8 +48,8 @@ namespace KoMacro {
 	* // got published.
 	* class PublishedObject : public TQObject {};
 	*
-	* // Somewhere we have our KMainWindow.
-	* KMainWindow* mainwindow = new KMainWindow();
+	* // Somewhere we have our TDEMainWindow.
+	* TDEMainWindow* mainwindow = new TDEMainWindow();
 	*
 	* // Create a new KoMacro::Manager instance to access the
 	* // Macro-framework.
diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui
index 26b7d0f2..7741073f 100644
--- a/kexi/plugins/queries/kexiparameterlisteditor.ui
+++ b/kexi/plugins/queries/kexiparameterlisteditor.ui
@@ -24,7 +24,7 @@
                 <string>Parameters:</string>
             </property>
         </widget>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <column>
                 <property name="text">
                     <string>Name</string>
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 5de13fe2..650e90a6 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -79,7 +79,7 @@ class KexiQueryDesignerSQLView::Private
 		KexiSectionHeader *head, *historyHead;
 		TQPixmap statusPixmapOk, statusPixmapErr, statusPixmapInfo;
 		TQSplitter *splitter;
-		KToggleAction *action_toggle_history;
+		TDEToggleAction *action_toggle_history;
 		//! For internal use, this pointer is usually copied to TempData structure, 
 		//! when switching out of this view (then it's cleared).
 		KexiDB::QuerySchema *parsedQuery;
@@ -138,7 +138,7 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
 
 	plugSharedAction("querypart_check_query", TQT_TQOBJECT(this), TQT_SLOT(slotCheckQuery())); 
 	plugSharedAction("querypart_view_toggle_history", TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMode()));
-	d->action_toggle_history = static_cast<KToggleAction*>( sharedAction( "querypart_view_toggle_history" ) );
+	d->action_toggle_history = static_cast<TDEToggleAction*>( sharedAction( "querypart_view_toggle_history" ) );
 
 	d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),Qt::Vertical, d->history_section);
 	d->historyHead->installEventFilter(this);
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 81bb22bc..da27f890 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -40,7 +40,7 @@ KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const
 	m_history = new History();
 	m_history->setAutoDelete(true);
 
-	m_popup = new KPopupMenu(this);
+	m_popup = new TDEPopupMenu(this);
 	m_popup->insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard()));
 }
 
@@ -161,7 +161,7 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
 /*void
 KexiQueryDesignerSQLHistory::contextMenu(const TQPoint &pos, HistoryEntry *)
 {
-	KPopupMenu p(this);
+	TDEPopupMenu p(this);
 	p.insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard()));
 	
 
@@ -209,7 +209,7 @@ void KexiQueryDesignerSQLHistory::clear()
 	updateContents();
 }
 
-KPopupMenu* KexiQueryDesignerSQLHistory::popupMenu() const
+TDEPopupMenu* KexiQueryDesignerSQLHistory::popupMenu() const
 {
 	return m_popup;
 }
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
index 9183764f..516a6dbf 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
@@ -28,7 +28,7 @@
 #include <tqsimplerichtext.h>
 
 class TQSimpleRichText;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class HistoryEntry
 {
@@ -68,7 +68,7 @@ class KexiQueryDesignerSQLHistory : public TQScrollView
 		KexiQueryDesignerSQLHistory(TQWidget *parent, const char *name=0);
 		virtual ~KexiQueryDesignerSQLHistory();
 
-		KPopupMenu* popupMenu() const;
+		TDEPopupMenu* popupMenu() const;
 
 //		void		contextMenu(const TQPoint &pos, HistoryEntry *e);
 
@@ -99,7 +99,7 @@ class KexiQueryDesignerSQLHistory : public TQScrollView
 	private:
 		History *m_history;
 		HistoryEntry *m_selected;
-		KPopupMenu *m_popup;
+		TDEPopupMenu *m_popup;
 };
 
 #endif
diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp
index d0c71eae..02c4ab94 100644
--- a/kexi/plugins/queries/kexiquerypart.cpp
+++ b/kexi/plugins/queries/kexiquerypart.cpp
@@ -117,20 +117,20 @@ KexiQueryPart::dataSource()
 	return new KexiQueryDataSource(this);
 }
 
-void KexiQueryPart::initPartActions( KActionCollection *col )
+void KexiQueryPart::initPartActions( TDEActionCollection *col )
 {
 }
 
-void KexiQueryPart::initInstanceActions( int mode, KActionCollection *col )
+void KexiQueryPart::initInstanceActions( int mode, TDEActionCollection *col )
 {
 	if (mode==Kexi::DataViewMode) {
 	}
 	else if (mode==Kexi::DesignViewMode) {
 	}
 	else if (mode==Kexi::TextViewMode) {
-//		new KAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), col, "querypart_check_query");
+//		new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), col, "querypart_check_query");
 
-//TODO		new KAction(i18n("Execute Query"), "?????", 0, this, TQT_SLOT(checkQuery()), col, "querypart_execute_query");
+//TODO		new TDEAction(i18n("Execute Query"), "?????", 0, this, TQT_SLOT(checkQuery()), col, "querypart_execute_query");
 	}
 }
 #endif
@@ -141,10 +141,10 @@ void KexiQueryPart::initPartActions()
 
 void KexiQueryPart::initInstanceActions()
 {
-//	new KAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), 
+//	new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), 
 //		m_instanceGuiClients[Kexi::DesignViewMode]->actionCollection(), "querypart_check_query");
 
-	KAction *a = createSharedAction(Kexi::TextViewMode, i18n("Check Query"), "test_it", 
+	TDEAction *a = createSharedAction(Kexi::TextViewMode, i18n("Check Query"), "test_it", 
 		Key_F9, "querypart_check_query");
 	a->setToolTip(i18n("Check Query"));
 	a->setWhatsThis(i18n("Checks query for validity."));
diff --git a/kexi/plugins/queries/kexiquerypart.h b/kexi/plugins/queries/kexiquerypart.h
index 33399c56..3587388c 100644
--- a/kexi/plugins/queries/kexiquerypart.h
+++ b/kexi/plugins/queries/kexiquerypart.h
@@ -105,8 +105,8 @@ class KexiQueryPart : public KexiPart::Part
 		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
-//		virtual void initPartActions( KActionCollection *col );
-//		virtual void initInstanceActions( int mode, KActionCollection *col );
+//		virtual void initPartActions( TDEActionCollection *col );
+//		virtual void initInstanceActions( int mode, TDEActionCollection *col );
 
 		virtual void initPartActions();
 		virtual void initInstanceActions();
diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index 7cf7dae9..cf54b254 100644
--- a/kexi/plugins/reports/kexireportfactory.cpp
+++ b/kexi/plugins/reports/kexireportfactory.cpp
@@ -120,7 +120,7 @@ KexiReportFactory::createMenuActions(const TQCString &classname, TQWidget *w,
 	Q_UNUSED(w);
 	Q_UNUSED(container);
 	if(classname == "Label") {
-		/*! @todo use KAction */
+		/*! @todo use TDEAction */
 		menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText()));
 		return true;
 	}
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
index 0b096b82..1c24db1b 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
@@ -126,25 +126,25 @@ void KexiScriptPart::initPartActions()
 		if(! Kross::Api::Manager::scriptManager()->hasChild("KexiMainWindow")) {
 			Kross::Api::Manager::scriptManager()->addTQObject(TQT_TQOBJECT(m_mainWin), "KexiMainWindow");
 
-			// Add the KAction's provided by the ScriptGUIClient to the
+			// Add the TDEAction's provided by the ScriptGUIClient to the
 			// KexiMainWindow.
 			//FIXME: fix+use createSharedPartAction() whyever it doesn't work as expected right now...
 			TQPopupMenu* popup = m_mainWin->findPopupMenu("tools");
 			if(popup) {
-				KAction* execscriptaction = d->scriptguiclient->action("executescriptfile");
+				TDEAction* execscriptaction = d->scriptguiclient->action("executescriptfile");
 				if(execscriptaction)
 					execscriptaction->plug( popup );
-				KAction* configscriptaction = d->scriptguiclient->action("configurescripts");
+				TDEAction* configscriptaction = d->scriptguiclient->action("configurescripts");
 				if(configscriptaction)
 					configscriptaction->plug( popup );
-				KAction* scriptmenuaction = d->scriptguiclient->action("installedscripts");
+				TDEAction* scriptmenuaction = d->scriptguiclient->action("installedscripts");
 				if(scriptmenuaction)
 					scriptmenuaction->plug( popup );
 				/*
-				KAction* execscriptmenuaction = d->scriptguiclient->action("executedscripts");
+				TDEAction* execscriptmenuaction = d->scriptguiclient->action("executedscripts");
 				if(execscriptmenuaction)
 				    execscriptmenuaction->plug( popup );
-				KAction* loadedscriptmenuaction = d->scriptguiclient->action("loadedscripts");
+				TDEAction* loadedscriptmenuaction = d->scriptguiclient->action("loadedscripts");
 				if(loadedscriptmenuaction)
 				    loadedscriptmenuaction->plug( popup );
 				*/
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 6130a93f..62ab4cbf 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -175,12 +175,12 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare
 	connect(d->sets, TQT_SIGNAL(rowDeleted()), TQT_TQOBJECT(this), TQT_SLOT(updateActions()));
 	connect(d->sets, TQT_SIGNAL(rowInserted()), TQT_TQOBJECT(this), TQT_SLOT(slotRowInserted()));
 
-	d->contextMenuTitle = new KPopupTitle(d->view->contextMenu());
+	d->contextMenuTitle = new TDEPopupTitle(d->view->contextMenu());
 	d->view->contextMenu()->insertItem(d->contextMenuTitle, -1, 0);
 	connect(d->view->contextMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowContextMenu()));
 
 	plugSharedAction("tablepart_toggle_pkey", TQT_TQOBJECT(this), TQT_SLOT(slotTogglePrimaryKey()));
-	d->action_toggle_pkey = static_cast<KToggleAction*>( sharedAction("tablepart_toggle_pkey") );
+	d->action_toggle_pkey = static_cast<TDEToggleAction*>( sharedAction("tablepart_toggle_pkey") );
 	d->action_toggle_pkey->plug(d->view->contextMenu(), 1); //add at the beginning
 	d->view->contextMenu()->insertSeparator(2);
 	setAvailable("tablepart_toggle_pkey", !conn->isReadOnly());
diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index c546327b..a9254ba4 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -53,7 +53,7 @@ using namespace KexiTableDesignerCommands;
 
 //----------------------------------------------
 
-CommandHistory::CommandHistory(KActionCollection *actionCollection, bool withMenus)
+CommandHistory::CommandHistory(TDEActionCollection *actionCollection, bool withMenus)
  : KCommandHistory(actionCollection, withMenus)
 {
 	// We need ALL the commands because we'll collect reuse their 
@@ -109,7 +109,7 @@ KexiTableDesignerViewPrivate::KexiTableDesignerViewPrivate(KexiTableDesignerView
  , slotBeforeCellChanged_enabled(true)
  , tempStoreDataUsingRealAlterTable(false)
 {
-	historyActionCollection = new KActionCollection((TQWidget*)0,"");
+	historyActionCollection = new TDEActionCollection((TQWidget*)0,"");
 	history = new CommandHistory(historyActionCollection, true);
 
 	internalPropertyNames.insert("subType",(char*)1);
diff --git a/kexi/plugins/tables/kexitabledesignerview_p.h b/kexi/plugins/tables/kexitabledesignerview_p.h
index 206c295c..0b689d64 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.h
+++ b/kexi/plugins/tables/kexitabledesignerview_p.h
@@ -52,7 +52,7 @@ class CommandHistory : public KCommandHistory
 	Q_OBJECT
   
 	public:
-		CommandHistory(KActionCollection *actionCollection, bool withMenus = true);
+		CommandHistory(TDEActionCollection *actionCollection, bool withMenus = true);
 
 		const TQPtrList<KCommand>& commands() const { return m_commandsToUndo; }
 
@@ -141,9 +141,9 @@ class KexiTableDesignerViewPrivate
 
 		int row; //!< used to know if a new row is selected in slotCellSelected()
 
-		KToggleAction *action_toggle_pkey;
+		TDEToggleAction *action_toggle_pkey;
 
-		KPopupTitle *contextMenuTitle;
+		TDEPopupTitle *contextMenuTitle;
 
 		int uniqueIdCounter;
 
@@ -181,7 +181,7 @@ class KexiTableDesignerViewPrivate
 		 to know what return value should be. */
 		tristate recentResultOfStoreData;
 
-		KActionCollection* historyActionCollection;
+		TDEActionCollection* historyActionCollection;
 		CommandHistory* history;
 
 		//! A cache used in KexiTableDesignerView::buildField() to quickly identify 
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index 55c8be5d..07541f4d 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -85,7 +85,7 @@ void KexiTablePart::initInstanceActions()
 {
 //moved to main window	createSharedAction(Kexi::DataViewMode, i18n("Filter"), "filter", 0, "tablepart_filter");
 
-	KAction *a = createSharedToggleAction(
+	TDEAction *a = createSharedToggleAction(
 		Kexi::DesignViewMode, i18n("Primary Key"), "key", 0, "tablepart_toggle_pkey");
 //		Kexi::DesignViewMode, i18n("Toggle Primary Key"), "key", 0, "tablepart_toggle_pkey");
 	a->setWhatsThis(i18n("Sets or removes primary key for currently selected field."));