Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

6 files changed, 15 insertions, 15 deletions

diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index 62ba74be..8a9a8031 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -126,7 +126,7 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *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);
 
 	TQPushButton * okbutton = bbox->addButton(KStdGuiItem::ok());
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index 35805877..6307fa71 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -80,11 +80,11 @@ kdDebug()<<k_funcinfo<<endl;
 	connect( updatetimer,TQT_SIGNAL( timeout() ),this,TQT_SLOT( updateScope() ) );
 
 	_artsactions = new ArtsActions( 0, 0, this );
-	_moreBars = ArtsActions::actionMoreBars( TQT_TQOBJECT(this), TQT_SLOT( moreBars() ), 0 );
-	_lessBars = ArtsActions::actionLessBars( TQT_TQOBJECT(this), TQT_SLOT( lessBars() ), 0 );
+	_moreBars = ArtsActions::actionMoreBars( this, TQT_SLOT( moreBars() ), 0 );
+	_lessBars = ArtsActions::actionLessBars( this, TQT_SLOT( lessBars() ), 0 );
 	_menu = new TDEPopupMenu( 0 );
 	_moreBars->plug( _menu ); _lessBars->plug( _menu );
-	_substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( substyle() ), TQT_TQOBJECT(this) );
+	_substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), this, TQT_SLOT( substyle() ), this );
 	_substyle->plug( _menu );
 	_menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() );
 
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index b651c625..00450f51 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -158,7 +158,7 @@ void MainWindow::toggleVolumeBar() {
 	vc->useOldVolumeBar(showOldVolumeDisplay->isChecked());
 }
 
-MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( TQT_TQOBJECT(this) ) ) {
+MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( this ) ) {
 kdDebug() << k_funcinfo << endl;
 	connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) );
 
@@ -172,11 +172,11 @@ kdDebug() << k_funcinfo << endl;
 	( void ) artsactions->actionMidiManagerView();
 	( void ) artsactions->actionEnvironmentView();
 	( void ) artsactions->actionMediaTypesView();
-	( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, TQT_TQOBJECT(vc), TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
+	( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, vc, TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
 	showOldVolumeDisplay=
-		new TDEToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, TQT_TQOBJECT(this),
+		new TDEToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, this,
 		TQT_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" );
-	( void ) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" );
+	( void ) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" );
 
 	createGUI("artscontrol.rc");
 	resize(20,300);
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 6d155b06..5ef0b828 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -135,7 +135,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *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);
 
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index b32c09f2..c3f32e41 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -122,14 +122,14 @@ MidiManagerView::MidiManagerView()
 	setCaption(i18n("MIDI Manager"));
 	setIcon( MainBarIcon( "artsfftscope", 32 ) );
 
-	(void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()),
+	(void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, this, TQT_SLOT(addOSSMidiPort()),
 		  actionCollection(), "add_oss_midi_port");
-	(void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this),
+	(void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, this,
 		  TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output");
 
-	(void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
-	connect(widget->connectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotConnect()));
-	connect(widget->disconnectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDisconnect()));
+	(void) KStdAction::quit( this, TQT_SLOT(close()), actionCollection());
+	connect(widget->connectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConnect()));
+	connect(widget->disconnectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisconnect()));
 
 	connectionWidget = new ConnectionWidget(this, widget->connectionFrame);
 	connectionWidget->setMinimumSize(60,10);
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 1273bf58..56686be6 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -80,7 +80,7 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+	TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
 	bbox->addStretch(1);
 	helpbutton->setAutoDefault( true );
 	helpbutton->setDefault( true );