Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>

5 files changed, 40 insertions, 40 deletions

diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index fcdce6b8..56207052 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -115,7 +115,7 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
 
 	bbox->addStretch(1);
 
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index 99b8072e..8cd65f90 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -112,7 +112,7 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index 1d7bbce9..7f598816 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -251,17 +251,17 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
  */
 
 #if 000
-	connect(menubar, TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(activateMenu(int)));
+	connect(menubar, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(activateMenu(int)));
 	connect(m_view, TQT_SIGNAL(activated(int)), modulewidget, TQT_SLOT(setZoom(int)));
-	connect(m_ports, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addPort(int)));
-	connect(m_file_new, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(fileNew(int)));
+	connect(m_ports, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addPort(int)));
+	connect(m_file_new, TQT_SIGNAL(activated(int)), this, TQT_SLOT(fileNew(int)));
 
-	//connect(m_modules, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
+	//connect(m_modules, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
 	/*
-	connect(m_modules_synth, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
-	connect(m_modules_gui, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
-	connect(m_modules_instruments, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
-	connect(m_modules_other, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
+	connect(m_modules_synth, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
+	connect(m_modules_gui, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
+	connect(m_modules_instruments, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
+	connect(m_modules_other, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
 	*/
 	connect(kapp, TQT_SIGNAL(lastWindowClosed()), this , TQT_SLOT(quit()));
 
@@ -269,7 +269,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
 #endif
 
 	arts_debug("PORT: activatemenu");
-	connect(menumaker, TQT_SIGNAL(activated(const char *)), TQT_TQOBJECT(this), TQT_SLOT(addModule(const char *)));
+	connect(menumaker, TQT_SIGNAL(activated(const char *)), this, TQT_SLOT(addModule(const char *)));
 	fillModuleMenu();
 	arts_debug("PORT: activatemenu ok");
 	setupActions();
@@ -279,7 +279,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
 	// connect to aboutToShow to correctly show state of dockwidget there:
 	TQPopupMenu *viewmenu = (TQPopupMenu*)factory()->container("view", this);
 	if (viewmenu)
-		connect(viewmenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(viewMenuAboutToShow()));
+		connect(viewmenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(viewMenuAboutToShow()));
 	else
 		arts_debug("view menu not found!");
 
@@ -292,55 +292,55 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
 void ArtsBuilderWindow::setupActions()
 {
 	// File menu
-	KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
+	KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
 
-	(void)new TDEAction(i18n("Open Session..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openSession()),
+	(void)new TDEAction(i18n("Open Session..."), 0, this, TQT_SLOT(openSession()),
 					  actionCollection(), "file_open_session");
-	KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
-	(void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, TQT_TQOBJECT(this), TQT_SLOT(openExample()),
+	KStdAction::open(this, TQT_SLOT(open()), actionCollection());
+	(void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, 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 TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(retrieve()),
+	KStdAction::save(this, TQT_SLOT(save()), actionCollection());
+	KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
+	(void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, this, TQT_SLOT(retrieve()),
 					  actionCollection(), "file_retrieve_from_server");
-	(void)new TDEAction(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, this, TQT_SLOT(execute()),
 					  actionCollection(), "file_execute_structure");
-	(void)new TDEAction(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, this, TQT_SLOT(rename()),
 					  actionCollection(), "file_rename_structure");
-	(void)new TDEAction(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, this, TQT_SLOT(publish()),
 					  actionCollection(), "file_publish_structure");
-	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+	KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
 
 	// Edit menu
-	(void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, TQT_TQOBJECT(modulewidget), TQT_SLOT(delModule()),
+	(void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, modulewidget, TQT_SLOT(delModule()),
 					  actionCollection(), "edit_delete");
-	KStdAction::selectAll(TQT_TQOBJECT(modulewidget), TQT_SLOT(selectAll()), actionCollection());
+	KStdAction::selectAll(modulewidget, TQT_SLOT(selectAll()), actionCollection());
 
 	// View menu
 	viewPropertiesAction= new TDEToggleAction(i18n("&Property Panel"), 0,
-											TQT_TQOBJECT(propertyDock), TQT_SLOT(changeHideShowState()),
+											propertyDock, TQT_SLOT(changeHideShowState()),
 											actionCollection(), "view_properties");
-	(void)new TDEAction(i18n("200%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt200()),
+	(void)new TDEAction(i18n("200%"), 0, this, TQT_SLOT(viewAt200()),
 					  actionCollection(), "view_200");
-	(void)new TDEAction(i18n("150%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt150()),
+	(void)new TDEAction(i18n("150%"), 0, this, TQT_SLOT(viewAt150()),
 					  actionCollection(), "view_150");
-	(void)new TDEAction(i18n("100%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt100()),
+	(void)new TDEAction(i18n("100%"), 0, this, TQT_SLOT(viewAt100()),
 					  actionCollection(), "view_100");
-	(void)new TDEAction(i18n("50%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt50()),
+	(void)new TDEAction(i18n("50%"), 0, this, TQT_SLOT(viewAt50()),
 					  actionCollection(), "view_50");
 
 	// Ports menu
-	(void)new TDEAction(i18n("Create IN Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioSignal()),
+	(void)new TDEAction(i18n("Create IN Audio Signal"), 0, this, TQT_SLOT(createInAudioSignal()),
 					  actionCollection(), "ports_create_in_audio_signal");
-	(void)new TDEAction(i18n("Create OUT Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createOutAudioSignal()),
+	(void)new TDEAction(i18n("Create OUT Audio Signal"), 0, this, TQT_SLOT(createOutAudioSignal()),
 					  actionCollection(), "ports_create_out_audio_signal");
-	(void)new TDEAction(i18n("Create IN String Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInStringProperty()),
+	(void)new TDEAction(i18n("Create IN String Property"), 0, this, TQT_SLOT(createInStringProperty()),
 					  actionCollection(), "ports_create_in_string_property");
-	(void)new TDEAction(i18n("Create IN Audio Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioProperty()),
+	(void)new TDEAction(i18n("Create IN Audio Property"), 0, this, TQT_SLOT(createInAudioProperty()),
 					  actionCollection(), "ports_create_in_audio_property");
-	(void)new TDEAction(i18n("Implement Interface..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addInterface()),
+	(void)new TDEAction(i18n("Implement Interface..."), 0, this, TQT_SLOT(addInterface()),
 					  actionCollection(), "ports_implement_interface");
-	(void)new TDEAction(i18n("Change Positions/Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changePortPositions()),
+	(void)new TDEAction(i18n("Change Positions/Names..."), 0, this, TQT_SLOT(changePortPositions()),
 					  actionCollection(), "ports_change_positions");
 }
 
@@ -532,7 +532,7 @@ void ArtsBuilderWindow::openSession()
 		execDlg->start();
 		execDlg->show();
 
-		connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute()));
+		connect(execDlg, TQT_SIGNAL(ready()), this, TQT_SLOT(endexecute()));
 
 		hide();
 		// m_filename = filename; FIXME: DOESN'T THIS BELONG HERE?
@@ -674,7 +674,7 @@ void ArtsBuilderWindow::execute()
 		execDlg->start();
 		execDlg->show();
 
-		connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute()));
+		connect(execDlg, TQT_SIGNAL(ready()), this, TQT_SLOT(endexecute()));
 
 		hide();
 	}
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index 2bf9dbe4..006b5c6d 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -111,7 +111,7 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TDEIconLoader iconloader;
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index c95d40ad..96c8dd18 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -104,7 +104,7 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());