Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

12 files changed, 69 insertions, 69 deletions

diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp
index d5c5f071..226c0bad 100644
--- a/arts/tools/artsactions.cpp
+++ b/arts/tools/artsactions.cpp
@@ -62,52 +62,52 @@ ArtsActions::~ArtsActions() {
 }
 
 TDEAction* ArtsActions::actionScopeView() {
-	if ( !_a_sv ) _a_sv = new TDEAction( i18n( "&FFT Scope" ), "artsfftscope", TDEShortcut(), this, TQT_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" );
+	if ( !_a_sv ) _a_sv = new TDEAction( i18n( "&FFT Scope" ), "artsfftscope", TDEShortcut(), this, TQ_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" );
 	return _a_sv;
 }
 TDEAction* ArtsActions::actionAudioManager() {
-	if ( !_a_am ) _a_am = new TDEAction( i18n( "&Audio Manager" ), "artsaudiomanager", TDEShortcut(), this, TQT_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" );
+	if ( !_a_am ) _a_am = new TDEAction( i18n( "&Audio Manager" ), "artsaudiomanager", TDEShortcut(), this, TQ_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" );
 	return _a_am;
 }
 TDEAction* ArtsActions::actionArtsStatusView() {
-	if ( !_a_asv ) _a_asv = new TDEAction( i18n( "aRts &Status" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" );
+	if ( !_a_asv ) _a_asv = new TDEAction( i18n( "aRts &Status" ), "artscontrol", TDEShortcut(), this, TQ_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" );
 	return _a_asv;
 }
 TDEAction* ArtsActions::actionMidiManagerView() {
-	if ( !_a_mmv ) _a_mmv = new TDEAction( i18n( "&MIDI Manager" ), "artsmidimanager", TDEShortcut(), this, TQT_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" );
+	if ( !_a_mmv ) _a_mmv = new TDEAction( i18n( "&MIDI Manager" ), "artsmidimanager", TDEShortcut(), this, TQ_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" );
 	return _a_mmv;
 }
 TDEAction* ArtsActions::actionEnvironmentView() {
-	if ( !_a_ev ) _a_ev = new TDEAction( i18n( "&Environment" ), "artsenvironment", TDEShortcut(), this, TQT_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" );
+	if ( !_a_ev ) _a_ev = new TDEAction( i18n( "&Environment" ), "artsenvironment", TDEShortcut(), this, TQ_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" );
 	return _a_ev;
 }
 TDEAction* ArtsActions::actionMediaTypesView() {
-	if ( !_a_mtv ) _a_mtv = new TDEAction( i18n( "Available Media &Types" ), "artsmediatypes", TDEShortcut(), this, TQT_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" );
+	if ( !_a_mtv ) _a_mtv = new TDEAction( i18n( "Available Media &Types" ), "artsmediatypes", TDEShortcut(), this, TQ_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" );
 	return _a_mtv;
 }
 
 TDEAction* ArtsActions::actionStyleNormal() {
-	if ( !_a_style_normal ) _a_style_normal = new TDEAction( i18n( "Style: NormalBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" );
+	if ( !_a_style_normal ) _a_style_normal = new TDEAction( i18n( "Style: NormalBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" );
 	return _a_style_normal;
 }
 TDEAction* ArtsActions::actionStyleFire() {
-	if ( !_a_style_fire ) _a_style_fire = new TDEAction( i18n( "Style: FireBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" );
+	if ( !_a_style_fire ) _a_style_fire = new TDEAction( i18n( "Style: FireBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" );
 	return _a_style_fire;
 }
 TDEAction* ArtsActions::actionStyleLine() {
-	if ( !_a_style_line ) _a_style_line = new TDEAction( i18n( "Style: LineBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" );
+	if ( !_a_style_line ) _a_style_line = new TDEAction( i18n( "Style: LineBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" );
 	return _a_style_line;
 }
 TDEAction* ArtsActions::actionStyleLED() {
-	if ( !_a_style_led ) _a_style_led = new TDEAction( i18n( "Style: LEDs" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" );
+	if ( !_a_style_led ) _a_style_led = new TDEAction( i18n( "Style: LEDs" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" );
 	return _a_style_led;
 }
 TDEAction* ArtsActions::actionStyleAnalog() {
-	if ( !_a_style_analog ) _a_style_analog = new TDEAction( i18n( "Style: Analog" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" );
+	if ( !_a_style_analog ) _a_style_analog = new TDEAction( i18n( "Style: Analog" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" );
 	return _a_style_analog;
 }
 TDEAction* ArtsActions::actionStyleSmall() {
-	if ( !_a_style_small ) _a_style_small = new TDEAction( i18n( "Style: Small" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" );
+	if ( !_a_style_small ) _a_style_small = new TDEAction( i18n( "Style: Small" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" );
 	return _a_style_small;
 }
 TDEPopupMenu* ArtsActions::stylemenu() {
@@ -136,7 +136,7 @@ TDEAction* ArtsActions::actionLessBars( const TQObject* receiver, const char* sl
 void ArtsActions::viewScopeView() {
 	if ( !_sv ) {
 		_sv = new FFTScopeView( _kartsserver->server() );
-		connect( _sv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewScopeView() ) );
+		connect( _sv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewScopeView() ) );
 	} else {
 		delete _sv;
 		_sv = 0;
@@ -145,7 +145,7 @@ void ArtsActions::viewScopeView() {
 void ArtsActions::viewAudioManager() {
 	if ( !_am ) {
 		_am = new Gui_AUDIO_MANAGER();
-		connect( _am, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewAudioManager() ) );
+		connect( _am, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewAudioManager() ) );
 	} else {
 		delete _am;
 		_am = 0;
@@ -154,7 +154,7 @@ void ArtsActions::viewAudioManager() {
 void ArtsActions::viewArtsStatusView() {
 	if ( !_asv ) {
 		_asv = new ArtsStatusView( _kartsserver->server() );
-		connect( _asv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewArtsStatusView() ) );
+		connect( _asv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewArtsStatusView() ) );
 	} else {
 		delete _asv;
 		_asv = 0;
@@ -163,7 +163,7 @@ void ArtsActions::viewArtsStatusView() {
 void ArtsActions::viewMidiManagerView() {
 	if ( !_mmv ) {
 		_mmv = new MidiManagerView();
-		connect( _mmv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewMidiManagerView() ) );
+		connect( _mmv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewMidiManagerView() ) );
 	} else {
 		delete _mmv;
 		_mmv = 0;
@@ -172,7 +172,7 @@ void ArtsActions::viewMidiManagerView() {
 void ArtsActions::viewEnvironmentView() {
 	if ( !_ev ) {
 		_ev = new EnvironmentView( defaultEnvironment() );
-		connect( _ev, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewEnvironmentView() ) );
+		connect( _ev, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewEnvironmentView() ) );
 	} else {
 		delete _ev;
 		_ev = 0;
@@ -181,7 +181,7 @@ void ArtsActions::viewEnvironmentView() {
 void ArtsActions::viewMediaTypesView() {
 	if ( !_mtv ) {
 		_mtv = new MediaTypesView();
-		connect( _mtv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewMediaTypesView() ) );
+		connect( _mtv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewMediaTypesView() ) );
 	} else {
 		delete _mtv;
 		_mtv = 0;
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index a70b8683..bada9d2c 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -61,7 +61,7 @@ ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int
 
 	p->layout->activate();
 
-	TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) );
+	TQTimer::singleShot( 100, this, TQ_SLOT( supdatelayout() ) );
 
 kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<<endl;
 }
@@ -139,7 +139,7 @@ kdDebug() << k_funcinfo << endl;
 	if ( !svinline ) {
 		svinline = new FFTScopeView( arts->server(), _parent );
 		svinline->setMargin( 2 ); svinline->setLineWidth( 2 ); svinline->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
-		connect( svinline, TQT_SIGNAL( closed() ), this, TQT_SLOT( SVinline() ) );
+		connect( svinline, TQ_SIGNAL( closed() ), this, TQ_SLOT( SVinline() ) );
 		layout->addWidget( svinline );
 	} else {
 		delete svinline;
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index 54928a84..7d14f458 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -83,7 +83,7 @@ public:
 		menu = new TDEPopupMenu( 0 );
 		_showSV = _artsactions->actionScopeView();
 		_showSV->plug( menu );
-		_showSVinline = new TDEAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( SVinline() ), this );
+		_showSVinline = new TDEAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", TDEShortcut(), this, TQ_SLOT( SVinline() ), this );
 		_showSVinline->plug( menu );
 		_showAM = _artsactions->actionAudioManager();
 		_showAM->plug( menu );
@@ -97,12 +97,12 @@ public:
 		_showMediaTypes->plug( menu );
 		menu->insertSeparator();
 		menu->insertItem( i18n( "VU-Style" ), _artsactions->stylemenu() );
-		connect( _artsactions, TQT_SIGNAL( styleNormal() ), this, TQT_SLOT( styleNormalBars() ) );
-		connect( _artsactions, TQT_SIGNAL( styleFire() ), this, TQT_SLOT( styleFireBars() ) );
-		connect( _artsactions, TQT_SIGNAL( styleLine() ), this, TQT_SLOT( styleLineBars() ) );
-		connect( _artsactions, TQT_SIGNAL( styleLED() ), this, TQT_SLOT( styleLEDs() ) );
-		connect( _artsactions, TQT_SIGNAL( styleAnalog() ), this, TQT_SLOT( styleAnalog() ) );
-		connect( _artsactions, TQT_SIGNAL( styleSmall() ), this, TQT_SLOT( styleSmall() ) );
+		connect( _artsactions, TQ_SIGNAL( styleNormal() ), this, TQ_SLOT( styleNormalBars() ) );
+		connect( _artsactions, TQ_SIGNAL( styleFire() ), this, TQ_SLOT( styleFireBars() ) );
+		connect( _artsactions, TQ_SIGNAL( styleLine() ), this, TQ_SLOT( styleLineBars() ) );
+		connect( _artsactions, TQ_SIGNAL( styleLED() ), this, TQ_SLOT( styleLEDs() ) );
+		connect( _artsactions, TQ_SIGNAL( styleAnalog() ), this, TQ_SLOT( styleAnalog() ) );
+		connect( _artsactions, TQ_SIGNAL( styleSmall() ), this, TQ_SLOT( styleSmall() ) );
 	}
 	~ArtsControlAppletPrivate() {
 		if ( svinline ) SVinline();
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index e8858954..10f901ee 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -55,7 +55,7 @@ Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* parent, const char* name ) : Tem
 
 	TQTimer *updatetimer = new TQTimer(this);
 	updatetimer->start(500);
-	TQObject::connect(updatetimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(tick()));
+	TQObject::connect(updatetimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(tick()));
 }
 
 Gui_AUDIO_MANAGER::~Gui_AUDIO_MANAGER()
@@ -103,8 +103,8 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
 
 	listview->setMinimumSize(300,100);
 
-	TQObject::connect(listview,TQT_SIGNAL(executed(TQListViewItem *)),proxy,
-								TQT_SLOT(edit(TQListViewItem *)));
+	TQObject::connect(listview,TQ_SIGNAL(executed(TQListViewItem *)),proxy,
+								TQ_SLOT(edit(TQListViewItem *)));
 
 	mainlayout->addWidget(listview);
 
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index 8a9a8031..e3a533a7 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -105,7 +105,7 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
 	TQLabel * newbuslabel = new TQLabel( i18n( "New bus:" ), this );
 	layout2->addWidget( newbuslabel );
 	lineedit = new KLineEdit( this );
-	connect( lineedit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) );
+	connect( lineedit, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( textChanged( const TQString & ) ) );
 	layout2->addWidget( lineedit );
 
 // hruler
@@ -126,15 +126,15 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TQPushButton * okbutton = bbox->addButton(KStdGuiItem::ok());
 	okbutton->setDefault( true );
-	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
 
 	TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
-	connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+	connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
 
 	bbox->layout();
 
diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index aca373e9..1e223629 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -71,25 +71,25 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const c
         defaultEnvFileName.replace('~', TQDir::homeDirPath());
         listBox = new TDEListBox(this);
 	update();
-	connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)),
-			this,TQT_SLOT(view(TQListBoxItem*)));
+	connect(listBox,TQ_SIGNAL(executed(TQListBoxItem*)),
+			this,TQ_SLOT(view(TQListBoxItem*)));
 	
 	TQPushButton *mixerButton = new TQPushButton(i18n("Add Mixer"), this);
-	connect(mixerButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addMixer()));
+	connect(mixerButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addMixer()));
 
 	TQPushButton *effectRackButton = new TQPushButton(i18n("Add Effect Rack"), this);
-	connect(effectRackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEffectRack()));
+	connect(effectRackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addEffectRack()));
 
 	TQPushButton *delButton = new TQPushButton(i18n("Delete Item"), this);
-	connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delItem()));
+	connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(delItem()));
 
 	TQPushButton *loadButton = new
 		TQPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this);
-	connect(loadButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(load()));
+	connect(loadButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(load()));
 
 	TQPushButton *saveButton = new
 		TQPushButton(i18n("Save %1").arg(DEFAULT_ENV_FILENAME), this);
-	connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save()));
+	connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(save()));
 	show();
 }
 
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index 6307fa71..975b2943 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -77,23 +77,23 @@ kdDebug()<<k_funcinfo<<endl;
 
 	updatetimer = new TQTimer( this );
 	updatetimer->start( 100 );
-	connect( updatetimer,TQT_SIGNAL( timeout() ),this,TQT_SLOT( updateScope() ) );
+	connect( updatetimer,TQ_SIGNAL( timeout() ),this,TQ_SLOT( updateScope() ) );
 
 	_artsactions = new ArtsActions( 0, 0, this );
-	_moreBars = ArtsActions::actionMoreBars( this, TQT_SLOT( moreBars() ), 0 );
-	_lessBars = ArtsActions::actionLessBars( this, TQT_SLOT( lessBars() ), 0 );
+	_moreBars = ArtsActions::actionMoreBars( this, TQ_SLOT( moreBars() ), 0 );
+	_lessBars = ArtsActions::actionLessBars( this, TQ_SLOT( lessBars() ), 0 );
 	_menu = new TDEPopupMenu( 0 );
 	_moreBars->plug( _menu ); _lessBars->plug( _menu );
-	_substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), this, TQT_SLOT( substyle() ), this );
+	_substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), this, TQ_SLOT( substyle() ), this );
 	_substyle->plug( _menu );
 	_menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() );
 
-	connect( _artsactions, TQT_SIGNAL( styleNormal() ), this, TQT_SLOT( styleNormalBars() ) );
-	connect( _artsactions, TQT_SIGNAL( styleFire() ), this, TQT_SLOT( styleFireBars() ) );
-	connect( _artsactions, TQT_SIGNAL( styleLine() ), this, TQT_SLOT( styleLineBars() ) );
-	connect( _artsactions, TQT_SIGNAL( styleLED() ), this, TQT_SLOT( styleLEDs() ) );
-	connect( _artsactions, TQT_SIGNAL( styleAnalog() ), this, TQT_SLOT( styleAnalog() ) );
-	connect( _artsactions, TQT_SIGNAL( styleSmall() ), this, TQT_SLOT( styleSmall() ) );
+	connect( _artsactions, TQ_SIGNAL( styleNormal() ), this, TQ_SLOT( styleNormalBars() ) );
+	connect( _artsactions, TQ_SIGNAL( styleFire() ), this, TQ_SLOT( styleFireBars() ) );
+	connect( _artsactions, TQ_SIGNAL( styleLine() ), this, TQ_SLOT( styleLineBars() ) );
+	connect( _artsactions, TQ_SIGNAL( styleLED() ), this, TQ_SLOT( styleLEDs() ) );
+	connect( _artsactions, TQ_SIGNAL( styleAnalog() ), this, TQ_SLOT( styleAnalog() ) );
+	connect( _artsactions, TQ_SIGNAL( styleSmall() ), this, TQ_SLOT( styleSmall() ) );
 }
 
 FFTScopeView::~FFTScopeView() {
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index 00450f51..74a9ed6f 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -87,7 +87,7 @@ VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent)
 	, server( artsserver )
 {
 
-	connect( server, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( initaRtsConnections() ) );
+	connect( server, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( initaRtsConnections() ) );
 /*   	if(server.isNull())
    	{
 		KMessageBox::error( 0, i18n("Connection to the soundserver failed - make sure that artsd is really running and that your tdelibs version is not older than tdemultimedia."));
@@ -136,7 +136,7 @@ void VControl::useOldVolumeBar(int old) {
 void VControl::showFreeVerbView() {
 	if(!freeVerbView) {
 		freeVerbView = new FreeVerbView(server->server());
-		connect(freeVerbView,TQT_SIGNAL(closed()),this,TQT_SLOT(showFreeVerbView()));
+		connect(freeVerbView,TQ_SIGNAL(closed()),this,TQ_SLOT(showFreeVerbView()));
 	} else {
 		delete freeVerbView;
 		freeVerbView = 0;
@@ -160,7 +160,7 @@ void MainWindow::toggleVolumeBar() {
 
 MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( this ) ) {
 kdDebug() << k_funcinfo << endl;
-	connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) );
+	connect( kartsserver, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( serverRestarted() ) );
 
 	vc = new VControl( kartsserver, this );
 	setCentralWidget( vc );
@@ -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, vc, TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
+	( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, vc, TQ_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
 	showOldVolumeDisplay=
 		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( this, TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" );
+		TQ_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" );
+	( void ) KStdAction::quit( this, TQ_SLOT( close() ), actionCollection(), "quit_artscontrol" );
 
 	createGUI("artscontrol.rc");
 	resize(20,300);
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 5ef0b828..f07a7b8f 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -135,11 +135,11 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+	bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
 	bbox->addStretch(1);
 
 	TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
-	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
 
 	bbox->layout();
 
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index c3f32e41..4e92c000 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -115,21 +115,21 @@ MidiManagerView::MidiManagerView()
 {
 	TQTimer *updatetimer = new TQTimer(this);
 	updatetimer->start(5000);
-	connect(updatetimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateLists()));
+	connect(updatetimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateLists()));
 
 	widget = new MidiManagerWidget(this);
 	setCentralWidget(widget);
 	setCaption(i18n("MIDI Manager"));
 	setIcon( MainBarIcon( "artsfftscope", 32 ) );
 
-	(void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, this, TQT_SLOT(addOSSMidiPort()),
+	(void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, this, TQ_SLOT(addOSSMidiPort()),
 		  actionCollection(), "add_oss_midi_port");
 	(void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, this,
-		  TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output");
+		  TQ_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output");
 
-	(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()));
+	(void) KStdAction::quit( this, TQ_SLOT(close()), actionCollection());
+	connect(widget->connectButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConnect()));
+	connect(widget->disconnectButton,TQ_SIGNAL(clicked()), this, TQ_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 56686be6..5c20e2bf 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -80,13 +80,13 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
 	buttonlayout->addSpacing(5);
 	KButtonBox *bbox = new KButtonBox(this);
 
-	TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+	TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
 	bbox->addStretch(1);
 	helpbutton->setAutoDefault( true );
 	helpbutton->setDefault( true );
 
 	TQPushButton *okbutton = bbox->addButton(KStdGuiItem::ok());
-	connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+	connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
 	okbutton->setAutoDefault( true );
 	okbutton->setDefault( true );
 
diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp
index 197d620d..4f21657d 100644
--- a/arts/tools/statusview.cpp
+++ b/arts/tools/statusview.cpp
@@ -63,10 +63,10 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con
 	suspendButton= new TQPushButton(this, "suspendButton");
 	suspendButton->setText(i18n("&Suspend Now"));
 	l->addWidget(suspendButton);
-	connect(suspendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(suspendButtonClicked()));
+	connect(suspendButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(suspendButtonClicked()));
 
 	artsPollStatusTimer= new TQTimer(this);
-	connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus()));
+	connect(artsPollStatusTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateStatus()));
 	artsPollStatusTimer->start(1000);
 	//l->activate();
 	show();