Rename a number of classes to enhance compatibility with KDE4

5 files changed, 13 insertions, 13 deletions

diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h
index 0fed82b6..5d87ad88 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.h
+++ b/kexi/widget/tableview/kexidataawareobjectiface.h
@@ -36,7 +36,7 @@
 
 class TQObject;
 class TQScrollBar;
-class KPopupMenu;
+class TDEPopupMenu;
 class KexiTableItem;
 class KexiTableViewData;
 class KexiRecordMarker;
@@ -419,7 +419,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		virtual void dataSet( KexiTableViewData *data ) = 0;
 
 		/*! \return a pointer to context menu. This can be used to plug some actions there. */
-		KPopupMenu* contextMenu() const { return m_popupMenu; }
+		TDEPopupMenu* contextMenu() const { return m_popupMenu; }
 
 		/*! \return true if the context menu is enabled (visible) for the view.
 		  True by default. */
@@ -818,7 +818,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
 		int m_dragIndicatorLine;
 
 		/*! Context menu widget. */
-		KPopupMenu *m_popupMenu;
+		TDEPopupMenu *m_popupMenu;
 
 		bool m_contextMenuEnabled : 1;
 
diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp
index a132e829..e4a6288e 100644
--- a/kexi/widget/tableview/kexidatatableview.cpp
+++ b/kexi/widget/tableview/kexidatatableview.cpp
@@ -63,10 +63,10 @@ KexiDataTableView::init()
 //	connect(verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotMoving(int)));
 }
 
-/*void KexiDataTableView::initActions(KActionCollection *col)
+/*void KexiDataTableView::initActions(TDEActionCollection *col)
 {
 	KexiTableView::initActions(col);
-	new KAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter");
+	new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter");
 }*/
 
 bool KexiDataTableView::setData(KexiDB::Cursor *cursor)
diff --git a/kexi/widget/tableview/kexidatatableview.h b/kexi/widget/tableview/kexidatatableview.h
index 8592e1b8..120c9817 100644
--- a/kexi/widget/tableview/kexidatatableview.h
+++ b/kexi/widget/tableview/kexidatatableview.h
@@ -56,7 +56,7 @@ class KEXIDATATABLE_EXPORT KexiDataTableView : public KexiTableView
 
 		~KexiDataTableView();
 
-//		virtual void initActions(KActionCollection *col);
+//		virtual void initActions(TDEActionCollection *col);
 
 		/*! Fills table view with data using \a cursor. \return true on success.
 		 Cursor \a cursor will not be owned by this object. */
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 4303e551..b975fcdf 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -217,7 +217,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	verticalScrollBar()->raise();
 
 	//context menu
-	m_popupMenu = new KPopupMenu(this, "contextMenu");
+	m_popupMenu = new TDEPopupMenu(this, "contextMenu");
 #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(
@@ -322,7 +322,7 @@ void KexiTableView::clearVariables()
 	d->clearVariables();
 }
 
-/*void KexiTableView::initActions(KActionCollection *ac)
+/*void KexiTableView::initActions(TDEActionCollection *ac)
 {
 	emit reloadActions(ac);
 }*/
@@ -1224,11 +1224,11 @@ static bool overrideEditorShortcutNeeded(TQKeyEvent *e)
 bool KexiTableView::shortCutPressed( TQKeyEvent *e, const TQCString &action_name )
 {
 	const int k = e->key();
-	KAction *action = m_sharedActions[action_name];
+	TDEAction *action = m_sharedActions[action_name];
 	if (action) {
 		if (!action->isEnabled())//this action is disabled - don't process it!
 			return false; 
-		if (action->shortcut() == KShortcut( KKey(e) )) {
+		if (action->shortcut() == TDEShortcut( KKey(e) )) {
 			//special cases when we need to override editor's shortcut
 			if (overrideEditorShortcutNeeded(e)) {
 				return true;
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index f4364eb8..2e1d83fd 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -42,16 +42,16 @@
 #include <widget/utils/kexisharedactionclient.h>
 #include "kexidataawareobjectiface.h"
 
-class KPopupMenu;
+class TDEPopupMenu;
 class KPrinter;
-class KAction;
+class TDEAction;
 
 class KexiTableHeader;
 class KexiTableItem;
 class KexiTableView;
 class KexiTableEdit;
 class KexiTableViewPrivate;
-class KActionCollection;
+class TDEActionCollection;
 
 namespace KexiDB {
 	class RowEditBuffer;