9 files changed, 12 insertions, 12 deletions
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;