Rename a number of classes to enhance compatibility with KDE4

4 files changed, 37 insertions, 37 deletions

diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index 87783267..f33d360a 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -189,7 +189,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
 	mbroker_updateCount = 0;
 
 	arts_debug("PORT: menumaker");
-	menumaker = new MenuMaker(new KActionMenu(i18n("Modules"), actionCollection(), "modulesmenu"));
+	menumaker = new MenuMaker(new TDEActionMenu(i18n("Modules"), actionCollection(), "modulesmenu"));
 	//menumaker->addCategory("&Gui", "Gui_");
 	menumaker->addCategory(i18n("&Synthesis"), "Arts::Synth_");
 	menumaker->addCategory(i18n("&Synthesis/&Arithmetic + Mixing"), "Arts::Synth_ADD$");
@@ -294,53 +294,53 @@ void ArtsBuilderWindow::setupActions()
 	// File menu
 	KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
 
-	(void)new KAction(i18n("Open Session..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openSession()),
+	(void)new TDEAction(i18n("Open Session..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openSession()),
 					  actionCollection(), "file_open_session");
 	KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
-	(void)new KAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, TQT_TQOBJECT(this), TQT_SLOT(openExample()),
+	(void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, TQT_TQOBJECT(this), TQT_SLOT(openExample()),
 					  actionCollection(), "file_open_example");
 	KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
 	KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
-	(void)new KAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(retrieve()),
+	(void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(retrieve()),
 					  actionCollection(), "file_retrieve_from_server");
-	(void)new KAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(execute()),
+	(void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(execute()),
 					  actionCollection(), "file_execute_structure");
-	(void)new KAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(rename()),
+	(void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(rename()),
 					  actionCollection(), "file_rename_structure");
-	(void)new KAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(publish()),
+	(void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(publish()),
 					  actionCollection(), "file_publish_structure");
 	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 
 	// Edit menu
-	(void)new KAction(i18n("&Delete"), TQt::Key_Delete, TQT_TQOBJECT(modulewidget), TQT_SLOT(delModule()),
+	(void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, TQT_TQOBJECT(modulewidget), TQT_SLOT(delModule()),
 					  actionCollection(), "edit_delete");
 	KStdAction::selectAll(TQT_TQOBJECT(modulewidget), TQT_SLOT(selectAll()), actionCollection());
 
 	// View menu
-	viewPropertiesAction= new KToggleAction(i18n("&Property Panel"), 0,
+	viewPropertiesAction= new TDEToggleAction(i18n("&Property Panel"), 0,
 											TQT_TQOBJECT(propertyDock), TQT_SLOT(changeHideShowState()),
 											actionCollection(), "view_properties");
-	(void)new KAction(i18n("200%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt200()),
+	(void)new TDEAction(i18n("200%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt200()),
 					  actionCollection(), "view_200");
-	(void)new KAction(i18n("150%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt150()),
+	(void)new TDEAction(i18n("150%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt150()),
 					  actionCollection(), "view_150");
-	(void)new KAction(i18n("100%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt100()),
+	(void)new TDEAction(i18n("100%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt100()),
 					  actionCollection(), "view_100");
-	(void)new KAction(i18n("50%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt50()),
+	(void)new TDEAction(i18n("50%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt50()),
 					  actionCollection(), "view_50");
 
 	// Ports menu
-	(void)new KAction(i18n("Create IN Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioSignal()),
+	(void)new TDEAction(i18n("Create IN Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioSignal()),
 					  actionCollection(), "ports_create_in_audio_signal");
-	(void)new KAction(i18n("Create OUT Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createOutAudioSignal()),
+	(void)new TDEAction(i18n("Create OUT Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createOutAudioSignal()),
 					  actionCollection(), "ports_create_out_audio_signal");
-	(void)new KAction(i18n("Create IN String Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInStringProperty()),
+	(void)new TDEAction(i18n("Create IN String Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInStringProperty()),
 					  actionCollection(), "ports_create_in_string_property");
-	(void)new KAction(i18n("Create IN Audio Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioProperty()),
+	(void)new TDEAction(i18n("Create IN Audio Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioProperty()),
 					  actionCollection(), "ports_create_in_audio_property");
-	(void)new KAction(i18n("Implement Interface..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addInterface()),
+	(void)new TDEAction(i18n("Implement Interface..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addInterface()),
 					  actionCollection(), "ports_implement_interface");
-	(void)new KAction(i18n("Change Positions/Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changePortPositions()),
+	(void)new TDEAction(i18n("Change Positions/Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changePortPositions()),
 					  actionCollection(), "ports_change_positions");
 }
 
diff --git a/arts/builder/main.h b/arts/builder/main.h
index 5098ff60..dd8c1c51 100644
--- a/arts/builder/main.h
+++ b/arts/builder/main.h
@@ -35,7 +35,7 @@ class PropertyPanel;
 class Structure;
 class MenuMaker;
 class ExecDlg;
-class KToggleAction;
+class TDEToggleAction;
 
 class ArtsBuilderWindow: public KDockMainWindow
 {
@@ -48,7 +48,7 @@ protected:
 
 	KDockWidget* propertyDock;
 	PropertyPanel *propertyPanel;
-	KToggleAction *viewPropertiesAction;
+	TDEToggleAction *viewPropertiesAction;
 
 	MenuMaker *menumaker;
 
diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp
index 2aed8401..8045091b 100644
--- a/arts/builder/menumaker.cpp
+++ b/arts/builder/menumaker.cpp
@@ -5,10 +5,10 @@
 
 using namespace std;
 
-MenuEntry::MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text)
+MenuEntry::MenuEntry(MenuMaker *menumaker, TDEActionMenu *parent, const char *text)
 	: menumaker(menumaker), text(text)
 {
-	action = new KAction(TQString::fromLocal8Bit(text));
+	action = new TDEAction(TQString::fromLocal8Bit(text));
 	parent->insert(action);
 	connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated()));
 }
@@ -18,7 +18,7 @@ void MenuEntry::activated()
 	menumaker->menuActivated(text);
 }
 
-MenuCategory::MenuCategory(const TQString& name, const char *prefix, KActionMenu *menu)
+MenuCategory::MenuCategory(const TQString& name, const char *prefix, TDEActionMenu *menu)
 {
 	_menu = menu;
 	_name = name;
@@ -60,12 +60,12 @@ bool MenuCategory::matches(const char *item)
 	return false;
 }
 
-KActionMenu *MenuCategory::menu()
+TDEActionMenu *MenuCategory::menu()
 {
 	return _menu;
 }
 
-MenuMaker::MenuMaker(KActionMenu *root)
+MenuMaker::MenuMaker(TDEActionMenu *root)
 {
 	categories.push_back(new MenuCategory("","",root));
 }
@@ -90,7 +90,7 @@ void MenuMaker::addCategory(const TQString& name, const char *prefix)
 	pc = lookupCategoryByName(basename(name));
 	if(pc)
 	{
-		KActionMenu *newMenu = new KActionMenu(catname(name));
+		TDEActionMenu *newMenu = new TDEActionMenu(catname(name));
 		pc->menu()->insert(newMenu);
 		/* 000 */
 		/*connect(newMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuactivated(int)));
@@ -134,14 +134,14 @@ void MenuMaker::addItem(const char *name, int index)
 			if((*i)->catchall()) mc = (*i);
 	}
 	//mc->menu()->insertItem(name,index); 000
-	//mc->menu()->insert(new KAction(name)); // index??
+	//mc->menu()->insert(new TDEAction(name)); // index??
 	new MenuEntry(this, mc->menu(), name);
 	/*
-	KAction *action = new KAction(TQString(name));
+	TDEAction *action = new TDEAction(TQString(name));
 	mc->menu()->insert(action);
 	*/
 	//action->plug(mc->menu());
-	//mc->menu()->insert(new KAction(name)); // index??
+	//mc->menu()->insert(new TDEAction(name)); // index??
 }
 
 TQString MenuMaker::basename(const TQString& name)
@@ -172,7 +172,7 @@ void MenuMaker::clear()
 	for(i=categories.begin();i != categories.end();++i)
 	{
 		/* 000
-		KActionMenu *m = (*i)->menu();
+		TDEActionMenu *m = (*i)->menu();
 		unsigned int k;
 
 		k = 0;
diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h
index 3cf32304..f1368d73 100644
--- a/arts/builder/menumaker.h
+++ b/arts/builder/menumaker.h
@@ -15,11 +15,11 @@ class MenuEntry : public TQObject
 
 protected:
 	MenuMaker *menumaker;
-	KAction *action;
+	TDEAction *action;
 	TQCString text;
 
 public:
-	MenuEntry(MenuMaker *menumaker, KActionMenu *parent, const char *text);
+	MenuEntry(MenuMaker *menumaker, TDEActionMenu *parent, const char *text);
 
 public slots:
 	void activated();
@@ -28,17 +28,17 @@ public slots:
 class MenuCategory
 {
 protected:
-	KActionMenu *_menu;
+	TDEActionMenu *_menu;
 	TQString _name;
 	std::list<std::string> prefixList;
 	bool _catchall;
 
 public:
-	MenuCategory(const TQString& name, const char *prefix, KActionMenu *menu);
+	MenuCategory(const TQString& name, const char *prefix, TDEActionMenu *menu);
 
 	void addPrefix(const char *prefix);
 	TQString name();
-	KActionMenu *menu();
+	TDEActionMenu *menu();
 
 	bool catchall();
 	bool matches(const char *item);
@@ -53,7 +53,7 @@ class MenuMaker :public TQObject
 public:
 	enum { CAT_MAGIC_ID = 10000 };
 
-	MenuMaker(KActionMenu *root);
+	MenuMaker(TDEActionMenu *root);
 
 	void addCategory(const TQString& name, const char *prefix);
 	MenuCategory *lookupCategoryByName(const TQString& name);