Rename many classes and header files to avoid conflicts with KDE4

24 files changed, 69 insertions, 69 deletions

diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index 59cfefa52..4ba3b8592 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -27,8 +27,8 @@
 #include <kexipart.h>
 #include <kexiactioncategories.h>
 
-#include <klistview.h>
-#include <kaction.h>
+#include <tdelistview.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
@@ -41,7 +41,7 @@
 #include <tqtooltip.h>
 #include <tqwidgetstack.h>
 
-#include <widget/utils/klistviewitemtemplate.h>
+#include <widget/utils/tdelistviewitemtemplate.h>
 #include <widget/kexibrowser.h>
 #include <widget/kexibrowseritem.h>
 #include <kexiutils/utils.h>
@@ -194,7 +194,7 @@ public:
 		TQListViewItem *item = new ActionSelectorDialogListItem("noaction", this, i18n("No action") );
 		const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) );
 		item->setPixmap(0, noIcon);
-		item = new ActionSelectorDialogListItem("kaction", this, i18n("Application actions") );
+		item = new ActionSelectorDialogListItem("tdeaction", this, i18n("Application actions") );
 		item->setPixmap(0, SmallIcon("form_action"));
 
 		KexiPart::PartInfoList *pl = Kexi::partManager().partInfoList();
@@ -331,7 +331,7 @@ class KexiActionSelectionDialog::KexiActionSelectionDialogPrivate
 {
 public:
 	KexiActionSelectionDialogPrivate() 
-		: kactionPageWidget(0), kactionListView(0), objectsListView(0)
+		: tdeactionPageWidget(0), tdeactionListView(0), objectsListView(0)
 		, currentFormActionsPageWidget(0)
 		, currentFormActionsListView(0)
 		, secondAnd3rdColumnMainWidget(0)
@@ -376,8 +376,8 @@ public:
 	KexiMainWindow* mainWin;
 	TQString actionWidgetName;
 	ActionCategoriesListView* actionCategoriesListView; //!< for column #1
-	TQWidget *kactionPageWidget;
-	TDEActionsListView* kactionListView;  //!< for column #2
+	TQWidget *tdeactionPageWidget;
+	TDEActionsListView* tdeactionListView;  //!< for column #2
 	KexiBrowser* objectsListView; //!< for column #2
 	TQWidget *currentFormActionsPageWidget; //!< for column #2
 	CurrentFormActionsListView* currentFormActionsListView; //!< for column #2
@@ -419,9 +419,9 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
    \______________________________________________/
                         glyr
   [a]- TQWidgetStack *secondAnd3rdColumnStack, 
-    - for displaying TDEActions, the stack contains d->kactionPageWidget TQWidget
+    - for displaying TDEActions, the stack contains d->tdeactionPageWidget TQWidget
     - for displaying objects, the stack contains secondAnd3rdColumnMainWidget TQWidget and TQGridLayout *secondAnd3rdColumnGrLyr
-	 - kactionPageWidget contains only a TQVBoxLayout and label+kactionListView
+	 - tdeactionPageWidget contains only a TQVBoxLayout and label+tdeactionListView
 */
 	d->glyr = new TQGridLayout(mainWidget, 2, 2, KDialog::marginHint(), KDialog::spacingHint());
 	d->glyr->setRowStretch(1, 1);
@@ -495,9 +495,9 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	KexiPart::Info* partInfo = action.decodeString(actionType, actionArg, ok);
 	if (ok) {
 		d->actionCategoriesListView->selectAction(actionType);
-		if (actionType=="kaction") {
-			d->kactionListView->selectAction(actionArg);
-			d->kactionListView->setFocus();
+		if (actionType=="tdeaction") {
+			d->tdeactionListView->selectAction(actionArg);
+			d->tdeactionListView->setFocus();
 		}
 		else if (actionType=="currentForm") {
 			d->currentFormActionsListView->selectAction(actionArg);
@@ -574,34 +574,34 @@ void KexiActionSelectionDialog::slotActionToExecuteItemSelected(TQListViewItem*)
 void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 {
 	ActionSelectorDialogListItem *simpleItem = dynamic_cast<ActionSelectorDialogListItem*>(item);
-	// simple case: part-less item, e.g. kaction:
+	// simple case: part-less item, e.g. tdeaction:
 	if (simpleItem) {
 		d->updateSelectActionToBeExecutedMessage(simpleItem->data);
 		TQString selectActionToBeExecutedMsg(
 			i18n("&Select action to be executed after clicking \"%1\" button:")); // msg for a label
-		if (simpleItem->data == "kaction") {
-			if (!d->kactionPageWidget) {
+		if (simpleItem->data == "tdeaction") {
+			if (!d->tdeactionPageWidget) {
 				//create lbl+list view with a vlayout
-				d->kactionPageWidget = new TQWidget();
-				d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
-				TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint());
-				d->kactionListView = new TDEActionsListView(d->kactionPageWidget, d->mainWin);
-				d->kactionListView->init();
-				TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName),
-					d->kactionPageWidget);
+				d->tdeactionPageWidget = new TQWidget();
+				d->tdeactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+				TQVBoxLayout *vlyr = new TQVBoxLayout(d->tdeactionPageWidget, 0, KDialog::spacingHint());
+				d->tdeactionListView = new TDEActionsListView(d->tdeactionPageWidget, d->mainWin);
+				d->tdeactionListView->init();
+				TQLabel *lbl = new TQLabel(d->tdeactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName),
+					d->tdeactionPageWidget);
 				lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak);
 				lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
 				vlyr->addWidget(lbl);
-				vlyr->addWidget(d->kactionListView);
-				d->secondAnd3rdColumnStack->addWidget(d->kactionPageWidget);
-				connect(d->kactionListView, TQT_SIGNAL(executed(TQListViewItem*)),
+				vlyr->addWidget(d->tdeactionListView);
+				d->secondAnd3rdColumnStack->addWidget(d->tdeactionPageWidget);
+				connect(d->tdeactionListView, TQT_SIGNAL(executed(TQListViewItem*)),
 					this, TQT_SLOT(slotTDEActionItemExecuted(TQListViewItem*)));
-				connect( d->kactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), 
+				connect( d->tdeactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), 
 					this, TQT_SLOT(slotTDEActionItemSelected(TQListViewItem*)));
 			}
 			d->setActionToExecuteSectionVisible(false);
-			d->raiseWidget(d->kactionPageWidget);
-			slotTDEActionItemSelected(d->kactionListView->selectedItem()); //to refresh column #3
+			d->raiseWidget(d->tdeactionPageWidget);
+			slotTDEActionItemSelected(d->tdeactionListView->selectedItem()); //to refresh column #3
 		}
 		else if (simpleItem->data == "currentForm") {
 			if (!d->currentFormActionsPageWidget) {
@@ -669,12 +669,12 @@ KexiFormEventAction::ActionData KexiActionSelectionDialog::currentAction() const
 	KexiFormEventAction::ActionData data;
 	ActionSelectorDialogListItem *simpleItem = dynamic_cast<ActionSelectorDialogListItem*>(
 		d->actionCategoriesListView->selectedItem());
-	// simple case: part-less item, e.g. kaction:
+	// simple case: part-less item, e.g. tdeaction:
 	if (simpleItem) {
-		if (simpleItem->data == "kaction") {
-			if (d->kactionListView->selectedItem()) {
-				data.string = TQString("kaction:")
-					+ dynamic_cast<ActionSelectorDialogListItem*>( d->kactionListView->selectedItem() )->data;
+		if (simpleItem->data == "tdeaction") {
+			if (d->tdeactionListView->selectedItem()) {
+				data.string = TQString("tdeaction:")
+					+ dynamic_cast<ActionSelectorDialogListItem*>( d->tdeactionListView->selectedItem() )->data;
 				return data;
 			}
 		}
diff --git a/kexi/plugins/forms/kexiactionselectiondialog_p.h b/kexi/plugins/forms/kexiactionselectiondialog_p.h
index f0527132b..670ede5a0 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog_p.h
+++ b/kexi/plugins/forms/kexiactionselectiondialog_p.h
@@ -20,7 +20,7 @@
 #ifndef KEXIACTIONSELECTIONDIALOG_P_H
 #define KEXIACTIONSELECTIONDIALOG_P_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 //! @internal
 class ActionsListViewBase : public TDEListView
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index b89031a75..c98ca67aa 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -26,9 +26,9 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <widget/kexipropertyeditorview.h>
 #include <widget/kexidatasourcecombobox.h>
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 8bb55bce9..9f63c09ca 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kstdaction.h>
 
 #include <formeditor/container.h>
diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp
index 365f5cb4c..4d1f0ec76 100644
--- a/kexi/plugins/forms/kexiformeventhandler.cpp
+++ b/kexi/plugins/forms/kexiformeventhandler.cpp
@@ -55,7 +55,7 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString(
 	if (_actionType.isEmpty() || _actionArg.isEmpty())
 		return 0;
 	KexiPart::Info *info = 0;
-	if (_actionType!="kaction" && _actionType!="currentForm") {
+	if (_actionType!="tdeaction" && _actionType!="currentForm") {
 		info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").arg(_actionType) );
 		if (!info)
 			return 0;
@@ -170,7 +170,7 @@ void KexiFormEventHandler::setMainWidgetForEventHandling(KexiMainWindow *mainWin
 		KexiPart::Info* partInfo = data.decodeString(actionType, actionArg, ok);
 		if (!ok)
 			continue;
-		if (actionType=="kaction" || actionType=="currentForm") {
+		if (actionType=="tdeaction" || actionType=="currentForm") {
 			TDEAction *action = mainWin->actionCollection()->action( actionArg.latin1() );
 			if (!action)
 				continue;
diff --git a/kexi/plugins/forms/kexiformeventhandler.h b/kexi/plugins/forms/kexiformeventhandler.h
index 69b9a20cf..d7063b19b 100644
--- a/kexi/plugins/forms/kexiformeventhandler.h
+++ b/kexi/plugins/forms/kexiformeventhandler.h
@@ -21,7 +21,7 @@
 #define KEXIFORMEVENTHANDLER_H
 
 #include <tqwidget.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KexiMainWindow;
 namespace KexiPart {
@@ -65,19 +65,19 @@ class KEXIFORMUTILS_EXPORT KexiFormEventAction : public TDEAction
 
 				/*! Decodes action string into action type/action argument parts.
 				 Action string has to be in a form of "actiontype:actionarg"
-				 - Action type is passed to \a actionType on success. Action type can be "kaction"
+				 - Action type is passed to \a actionType on success. Action type can be "tdeaction"
 					or any of the part names (see KexiPart::Info::objectName()), e.g. "table", "query", etc.
-				 - Action argument can be an action name in case of "kaction" type or object name 
+				 - Action argument can be an action name in case of "tdeaction" type or object name 
 					in case of action of type "table", "query", etc.
 				 \a ok is set to true on success and to false on failure. On failure no other
 				 values are passed. 
-				 \return part info if action type is "table", "query", etc., or 0 for "kaction" type. */
+				 \return part info if action type is "table", "query", etc., or 0 for "tdeaction" type. */
 				KexiPart::Info* decodeString(TQString& actionType, TQString& actionArg, bool& ok) const;
 
 				//! \return true if the action is empty
 				bool isEmpty() const;
 
-				TQString string; //!< action string with prefix, like "kaction:edit_copy" or "table:<tableName>"
+				TQString string; //!< action string with prefix, like "tdeaction:edit_copy" or "table:<tableName>"
 
 				TQString option; //!< option used when name is "table/query/etc.:\<objectName\>" is set;
 				                //!< can be set to "open", "design", "editText", etc. 
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index b96e4814f..d0db5f941 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ktabwidget.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index b73cf8ea6..4e0677f89 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -27,7 +27,7 @@
 #include <formeditor/commands.h>
 #include <widget/utils/kexirecordmarker.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview)
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index cf8c1d70e..2b72fc53e 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -21,7 +21,7 @@
 #include "kexidbdateedit.h"
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index 763bdf02d..65edd28af 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -22,7 +22,7 @@
 
 #include <tqtoolbutton.h>
 #include <tqlayout.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <kexiutils/utils.h>
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index eaf910447..ed441d4fd 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -31,7 +31,7 @@
 #include <tqpainter.h>
 
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
@@ -39,7 +39,7 @@
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kimageeffect.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kmessagebox.h>
 #include <kguiitem.h>
 
@@ -53,7 +53,7 @@
 
 #ifdef TQ_WS_WIN
 #include <win32_utils.h>
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #endif
 
 #include "kexidbutils.h"
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index de928e377..8967258ba 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -23,7 +23,7 @@
 #include <kexidb/queryschema.h>
 
 #include <kapplication.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kdebug.h>
 
 #include <tqpainter.h>
diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
index b136fa0d8..5473a9cba 100644
--- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 #include <tqpainter.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <kexiutils/utils.h>
diff --git a/kexi/plugins/forms/widgets/kexidbutils.cpp b/kexi/plugins/forms/widgets/kexidbutils.cpp
index 863b5d807..0f6f993ac 100644
--- a/kexi/plugins/forms/widgets/kexidbutils.cpp
+++ b/kexi/plugins/forms/widgets/kexidbutils.cpp
@@ -19,7 +19,7 @@
 
 #include "kexidbutils.h"
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include <kexidb/queryschema.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 20fba8fef..3c96cd09d 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -72,7 +72,7 @@
 #include "kexicsvwidgets.h"
 
 #ifdef TQ_WS_WIN
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #include <windows.h>
 #endif
 
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h
index b3bfcad83..6a9d2964b 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.h
+++ b/kexi/plugins/macros/kexipart/keximacroerror.h
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kglobal.h>
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index 707b2cb30..f03c6aca3 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -208,6 +208,6 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui
index 7741073fa..d00771207 100644
--- a/kexi/plugins/queries/kexiparameterlisteditor.ui
+++ b/kexi/plugins/queries/kexiparameterlisteditor.ui
@@ -81,7 +81,7 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index da27f8909..85ee5ce67 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -22,7 +22,7 @@
 #include <tqclipboard.h>
 #include <tqregexp.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
index 110000aa0..8e4db059a 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp
@@ -28,8 +28,8 @@
 //#include <tdeparts/factory.h>
 //#include <klibloader.h>
 //#include <tdemdimainfrm.h>
-//#include <kmainwindow.h>
-#include <kpopupmenu.h>
+//#include <tdemainwindow.h>
+#include <tdepopupmenu.h>
 
 #include <kexidialogbase.h>
 
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index 4bd08e5b1..1ed65ddc2 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -26,9 +26,9 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <widget/kexipropertyeditorview.h>
 #include <widget/kexidatasourcecombobox.h>
diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp
index c5368b26f..4f6c9ff9b 100644
--- a/kexi/plugins/tables/kexitabledesignercommands.cpp
+++ b/kexi/plugins/tables/kexitabledesignercommands.cpp
@@ -25,9 +25,9 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 #include <koproperty/property.h>
 
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 62ab4cbf0..7fa1c3b3c 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -29,8 +29,8 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kiconeffect.h>
 
diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index a9254ba4e..761107c24 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -27,8 +27,8 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 
 #include <koproperty/set.h>