Rename a number of classes to enhance compatibility with KDE4

1 files changed, 18 insertions, 18 deletions

diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index 49f1aeab..e1ed78fe 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -126,11 +126,11 @@ void Part::createGUIClients(KexiMainWindow *win)
 		m_guiClient = new GUIClient(m_mainWin, this, false, "part");
 
 		//default actions for part's gui client:
-		KAction *act = new KAction(m_names["instanceCaption"]+"...", info()->createItemIcon(), 0, this, 
+		TDEAction *act = new TDEAction(m_names["instanceCaption"]+"...", info()->createItemIcon(), 0, this, 
 			TQT_SLOT(slotCreate()), m_mainWin->actionCollection(), 
 			KexiPart::nameForCreateAction(*info()));
 		act->plug( m_mainWin->findPopupMenu("insert") );
-//		new KAction(m_names["instance"]+"...", info()->itemIcon(), 0, this, 
+//		new TDEAction(m_names["instance"]+"...", info()->itemIcon(), 0, this, 
 //		TQT_SLOT(create()), m_guiClient->actionCollection(), (info()->objectName()+"part_create").latin1());
 		//let init specific actions for parts
 //		initPartActions( m_guiClient->actionCollection() );
@@ -161,14 +161,14 @@ void Part::createGUIClients(KexiMainWindow *win)
 	}
 }
 
-KActionCollection* Part::actionCollectionForMode(int viewMode) const
+TDEActionCollection* Part::actionCollectionForMode(int viewMode) const
 {
 	KXMLGUIClient *cli = m_instanceGuiClients[viewMode];
 	return cli ? cli->actionCollection() : 0;
 }
 
-KAction* Part::createSharedAction(int mode, const TQString &text, 
-	const TQString &pix_name, const KShortcut &cut, const char *name,
+TDEAction* Part::createSharedAction(int mode, const TQString &text, 
+	const TQString &pix_name, const TDEShortcut &cut, const char *name,
 	const char *subclassName)
 {
 	GUIClient *instanceGuiClient = m_instanceGuiClients[mode];
@@ -180,8 +180,8 @@ KAction* Part::createSharedAction(int mode, const TQString &text,
 		instanceGuiClient->actionCollection(), subclassName);
 }
 
-KAction* Part::createSharedPartAction(const TQString &text, 
-	const TQString &pix_name, const KShortcut &cut, const char *name,
+TDEAction* Part::createSharedPartAction(const TQString &text, 
+	const TQString &pix_name, const TDEShortcut &cut, const char *name,
 	const char *subclassName)
 {
 	if (!m_guiClient)
@@ -190,19 +190,19 @@ KAction* Part::createSharedPartAction(const TQString &text,
 		m_guiClient->actionCollection(), subclassName);
 }
 
-KAction* Part::createSharedToggleAction(int mode, const TQString &text, 
-	const TQString &pix_name, const KShortcut &cut, const char *name)
+TDEAction* Part::createSharedToggleAction(int mode, const TQString &text, 
+	const TQString &pix_name, const TDEShortcut &cut, const char *name)
 {
-	return createSharedAction(mode, text, pix_name, cut, name, "KToggleAction");
+	return createSharedAction(mode, text, pix_name, cut, name, "TDEToggleAction");
 }
 
-KAction* Part::createSharedPartToggleAction(const TQString &text, 
-	const TQString &pix_name, const KShortcut &cut, const char *name)
+TDEAction* Part::createSharedPartToggleAction(const TQString &text, 
+	const TQString &pix_name, const TDEShortcut &cut, const char *name)
 {
-	return createSharedPartAction(text, pix_name, cut, name, "KToggleAction");
+	return createSharedPartAction(text, pix_name, cut, name, "TDEToggleAction");
 }
 
-/*KAction* Part::sharedAction(int mode, const char* name, const char *classname)
+/*TDEAction* Part::sharedAction(int mode, const char* name, const char *classname)
 {
 	GUIClient *instanceGuiClient = m_instanceGuiClients[mode];
 	if (!instanceGuiClient) {
@@ -212,7 +212,7 @@ KAction* Part::createSharedPartToggleAction(const TQString &text,
 	return instanceGuiClient->actionCollection()->action(name, classname);
 }
 
-KAction* Part::sharedPartAction(int mode, const char* name, const char *classname)
+TDEAction* Part::sharedPartAction(int mode, const char* name, const char *classname)
 {
 	if (!m_guiClient)
 		return 0;
@@ -223,7 +223,7 @@ void Part::setActionAvailable(const char *action_name, bool avail)
 {
 	TQIntDictIterator<GUIClient> it( m_instanceGuiClients );
 	for (;it.current();++it) {
-		KAction *act = it.current()->actionCollection()->action(action_name);
+		TDEAction *act = it.current()->actionCollection()->action(action_name);
 		if (act) {
 			act->setEnabled(avail);
 			return;
@@ -438,10 +438,10 @@ GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, c
 		setXMLFile(TQString::fromLatin1("kexi")+part->info()->objectName()
 			+"part"+(partInstanceClient?"inst":"")+"ui.rc");
 
-//	new KAction(part->m_names["new"], part->info()->itemIcon(), 0, this, 
+//	new TDEAction(part->m_names["new"], part->info()->itemIcon(), 0, this, 
 //		TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1());
 
-//	new KAction(i18nInstanceName+"...", part->info()->itemIcon(), 0, this, 
+//	new TDEAction(i18nInstanceName+"...", part->info()->itemIcon(), 0, this, 
 //		TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1());
 
 //	win->guiFactory()->addClient(this);