Rename a number of classes to enhance compatibility with KDE4

4 files changed, 9 insertions, 9 deletions

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."));