Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

35 files changed, 299 insertions, 299 deletions

diff --git a/noatun/modules/dcopiface/dcopiface.cpp b/noatun/modules/dcopiface/dcopiface.cpp
index aef6c58f..731d3cf7 100644
--- a/noatun/modules/dcopiface/dcopiface.cpp
+++ b/noatun/modules/dcopiface/dcopiface.cpp
@@ -19,7 +19,7 @@ extern "C"
 NIF::NIF() : Plugin(), DCOPObject("Noatun")
 {
 	mLastVolume = 0;
-//	connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSongPlaying()));
+//	connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSongPlaying()));
 }
 
 NIF::~NIF()
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 0d844671..b03a2dbc 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -67,12 +67,12 @@ Excellent::Excellent()
 {
 	setAcceptDrops(true);
 
-	KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection());
-	KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection());
+	KStdAction::quit(napp, TQ_SLOT(quit()), actionCollection());
+	KStdAction::open(napp, TQ_SLOT(fileOpen()), actionCollection());
 	setStandardToolBarMenuEnabled(true);
 
-	menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection());
-	KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection());
+	menubarAction = KStdAction::showMenubar(this, TQ_SLOT(showMenubar()), actionCollection());
+	KStdAction::preferences(napp, TQ_SLOT(preferences()), actionCollection());
 
 	// buttons
 	NoatunStdAction::back(actionCollection(), "back");
@@ -82,7 +82,7 @@ Excellent::Excellent()
 	NoatunStdAction::forward(actionCollection(), "forward");
 	NoatunStdAction::playlist(actionCollection(), "show_playlist");
 
-	volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, this, TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
+	volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, this, TQ_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
 	volumeAction->setCheckedState(i18n("Hide &Volume Control"));
 	NoatunStdAction::effects(actionCollection(), "effects");
 	NoatunStdAction::equalizer(actionCollection(), "equalizer");
@@ -129,24 +129,24 @@ Excellent::Excellent()
 	statusBar()->addWidget(total, 0, true);
 	statusBar()->show();
 
-	connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) );
-	connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) );
+	connect( napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) );
+	connect( napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) );
 
-	connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying()));
-	connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped()));
-	connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused()));
+	connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying()));
+	connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped()));
+	connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused()));
 	napp->player()->handleButtons();
 
-	connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
-	connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(slotLoopTypeChanged(int)));
+	connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
+	connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(slotLoopTypeChanged(int)));
 
 	/* This skipToWrapper is needed to pass milliseconds to Player() as everybody
 	 * below the GUI is based on milliseconds instead of some unprecise thingy
 	 * like seconds or mille */
-	connect(slider, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int)));
-	connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int)));
+	connect(slider, TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int)));
+	connect(this, TQ_SIGNAL(skipTo(int)), napp->player(), TQ_SLOT(skipTo(int)));
 
-	connect(slider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int)));
+	connect(slider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(sliderMoved(int)));
 
 	setCaption("Noatun");
 	setIcon(SmallIcon("noatun"));
@@ -376,8 +376,8 @@ void Excellent::growVolumeControl(void)
 	volumeSlider = new L33tSlider(0, 100, 10, 0,TQt::Vertical, mainFrame);
 	volumeSlider->setValue(100 - napp->player()->volume());
 	volumeSlider->show();
-	connect(volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(changeVolume(int)));
-	connect(volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(changeVolume(int)));
+	connect(volumeSlider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(changeVolume(int)));
+	connect(volumeSlider, TQ_SIGNAL(userChanged(int)), TQ_SLOT(changeVolume(int)));
 }
 
 void Excellent::shrinkVolumeControl(void)
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index bc2399cc..b256b421 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -18,7 +18,7 @@ HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin()
 	NOATUNPLUGINC(HTMLExport);
 
 	mAction = new TDEAction(i18n("&Export Playlist..."), "document-save-as", 0,
-		this, TQT_SLOT(slotExport()), this, "exportlist");
+		this, TQ_SLOT(slotExport()), this, "exportlist");
 	napp->pluginActionMenu()->insert(mAction);
 
 	new Prefs(this);
diff --git a/noatun/modules/infrared/infrared.cpp b/noatun/modules/infrared/infrared.cpp
index bd8a65bd..92ae3c4f 100644
--- a/noatun/modules/infrared/infrared.cpp
+++ b/noatun/modules/infrared/infrared.cpp
@@ -28,12 +28,12 @@ InfraRed::InfraRed()
 	NOATUNPLUGINC(InfraRed);
 	m_lirc = new Lirc(this);
 	connect(m_lirc,
-	        TQT_SIGNAL(commandReceived(const TQString &, const TQString &, int)),
-	        TQT_SLOT(slotCommand(const TQString &, const TQString &, int)));
+	        TQ_SIGNAL(commandReceived(const TQString &, const TQString &, int)),
+	        TQ_SLOT(slotCommand(const TQString &, const TQString &, int)));
 
 	IRPrefs::s_lirc = m_lirc;
 	volume=0;
-	TQTimer::singleShot(0, this, TQT_SLOT(start()));
+	TQTimer::singleShot(0, this, TQ_SLOT(start()));
 }
 
 InfraRed::~InfraRed()
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index 06a1ade4..50df64cd 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -84,19 +84,19 @@ IRPrefs::IRPrefs(TQObject *parent)
 	m_interval->setEnabled(false);
 	layout->addWidget(m_interval, 2, 4);
 
-	connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen()));
+	connect(s_lirc, TQ_SIGNAL(remotesRead()), TQ_SLOT(reopen()));
 	connect(m_commands,
-	        TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-			TQT_SLOT(slotCommandSelected(TQListViewItem *)));
+	        TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+			TQ_SLOT(slotCommandSelected(TQListViewItem *)));
 	connect(m_action,
-	        TQT_SIGNAL(activated(int)),
-			TQT_SLOT(slotActionActivated(int)));
+	        TQ_SIGNAL(activated(int)),
+			TQ_SLOT(slotActionActivated(int)));
 	connect(m_repeat,
-	        TQT_SIGNAL(toggled(bool)),
-			TQT_SLOT(slotRepeatToggled(bool)));
+	        TQ_SIGNAL(toggled(bool)),
+			TQ_SLOT(slotRepeatToggled(bool)));
 	connect(m_interval,
-	        TQT_SIGNAL(valueChanged(int)),
-			TQT_SLOT(slotIntervalChanged(int)));
+	        TQ_SIGNAL(valueChanged(int)),
+			TQ_SLOT(slotIntervalChanged(int)));
 
 	reopen();
 }
diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp
index 2487278b..2a6e2ec5 100644
--- a/noatun/modules/infrared/lirc.cpp
+++ b/noatun/modules/infrared/lirc.cpp
@@ -34,7 +34,7 @@ Lirc::Lirc(TQObject *parent)
 	
 	m_socket = new TQSocket;
 	m_socket->setSocket(sock);
-	connect(m_socket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead()));
+	connect(m_socket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotRead()));
 	update();
 }
 
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index b380e438..87fc3f56 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -646,7 +646,7 @@ KaimanStyleText::KaimanStyleText(TQWidget *parent, const char *name)
     _pos = 0;
     _timer = new TQTimer( this );
     _delay = 500;
-    connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) );
+    connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) );
 }
 
 KaimanStyleText::~KaimanStyleText()
@@ -741,7 +741,7 @@ KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *parent, const ch
     _delay = delay;
     _frame = 0;
     _timer = new TQTimer( this );
-    connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) );
+    connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) );
 }
 
 KaimanStyleAnimation::~KaimanStyleAnimation()
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index c63c5d0f..bed68ec6 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -92,22 +92,22 @@ Kaiman::Kaiman()
 		if ( !changeStyle( DEFAULT_SKIN, "skindata" ) )
 		{
 			KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) );
-			TQTimer::singleShot( 0, this, TQT_SLOT(close()) );
+			TQTimer::singleShot( 0, this, TQ_SLOT(close()) );
 			return;
 		}
 	}
 
 	// global connects
-	connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) );
-	connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) );
+	connect( napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) );
+	connect( napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) );
 
-	connect( napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(updateMode()));
-	connect( napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(updateMode()));
-	connect( napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(updateMode()));
-	connect( napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
-	connect( napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(loopTypeChange(int)));
-	connect( napp->player(), TQT_SIGNAL(newSongLen(int,int)), this, TQT_SLOT(newSongLen(int,int)));
-	connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()));
+	connect( napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(updateMode()));
+	connect( napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(updateMode()));
+	connect( napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(updateMode()));
+	connect( napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
+	connect( napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(loopTypeChange(int)));
+	connect( napp->player(), TQ_SIGNAL(newSongLen(int,int)), this, TQ_SLOT(newSongLen(int,int)));
+	connect( napp->player(), TQ_SIGNAL(newSong()), this, TQ_SLOT(newSong()));
 
 	if( napp->player()->isPlaying() )
 		newSong();
@@ -174,64 +174,64 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc )
 	}
 
 	item = _style->find("Playlist_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()) );
 
 	item = _style->find("Play_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) );
 
 	item = _style->find("Pause_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) );
 
 	item = _style->find("Stop_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()) );
 
 	item = _style->find("Next_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()) );
 
 	item = _style->find("Prev_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()) );
 
 	item = _style->find("Exit_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()) );
 
 	item = _style->find("Mixer_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(execMixer()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(execMixer()) );
 
 	item = _style->find("Iconify_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMinimized()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMinimized()) );
 
 	item = _style->find("Alt_Skin_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleSkin()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleSkin()) );
 
 	item = _style->find("Repeat_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleLoop()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleLoop()) );
 
 	item = _style->find("Shuffle_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShuffle()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleShuffle()) );
 
 	item = _style->find("Config_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp, TQT_SLOT(preferences()) );
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp, TQ_SLOT(preferences()) );
 
 	item = _style->find("Volume_Up_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeUp()));
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeUp()));
 
 	item = _style->find("Volume_Down_Button");
-	if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeDown()));
+	if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeDown()));
 
 	KaimanStyleSlider* slider =
 		static_cast<KaimanStyleSlider*>(_style->find("Position_Slider"));
 	if( slider!=0 )
 	{
-		connect( slider, TQT_SIGNAL(newValueDrag(int)), this, TQT_SLOT(seekStart(int)) );
-		connect( slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(seekDrag(int)) );
-		connect( slider, TQT_SIGNAL(newValueDrop(int)), this, TQT_SLOT(seekStop(int)) );
+		connect( slider, TQ_SIGNAL(newValueDrag(int)), this, TQ_SLOT(seekStart(int)) );
+		connect( slider, TQ_SIGNAL(newValue(int)), this, TQ_SLOT(seekDrag(int)) );
+		connect( slider, TQ_SIGNAL(newValueDrop(int)), this, TQ_SLOT(seekStop(int)) );
 		slider->setValue( 0, 0, 1000 );
 	}
 
 	slider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider"));
 	if ( slider!=0 )
 	{
-		connect(slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(setVolume(int)));
+		connect(slider, TQ_SIGNAL(newValue(int)), this, TQ_SLOT(setVolume(int)));
 		slider->setValue( napp->player()->volume(), 0, 100 );
 	}
 
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index 9ee32b90..613274e5 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -32,56 +32,56 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0)
         s_accel = new TDEGlobalAccel( this, "noatunglobalaccel" );
         s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString(),
                          CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P,
-                         player, TQT_SLOT( playpause() ));
+                         player, TQ_SLOT( playpause() ));
         s_accel->insert( "Stop", i18n("Stop Playing"), TQString(),
                          CTRL+ALT+Key_S, KKey::QtWIN+CTRL+Key_S,
-                         player, TQT_SLOT( stop() ));
+                         player, TQ_SLOT( stop() ));
         s_accel->insert( "Back", i18n("Back"), TQString(),
                          CTRL+ALT+Key_Left, KKey::QtWIN+CTRL+Key_Left,
-                         player, TQT_SLOT( back() ));
+                         player, TQ_SLOT( back() ));
         s_accel->insert( "Forward", i18n("Forward"), TQString(),
                          CTRL+ALT+Key_Right, KKey::QtWIN+CTRL+Key_Right,
-                         player, TQT_SLOT( forward() ));
+                         player, TQ_SLOT( forward() ));
         s_accel->insert( "Playlist", i18n("Show/Hide Playlist"), TQString(),
                          CTRL+ALT+Key_L, KKey::QtWIN+CTRL+Key_L,
-                         player, TQT_SLOT( toggleListView() ));
+                         player, TQ_SLOT( toggleListView() ));
         s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString(),
                          CTRL+ALT+Key_O, KKey::QtWIN+CTRL+Key_O,
-                         napp, TQT_SLOT( fileOpen() ));
+                         napp, TQ_SLOT( fileOpen() ));
         s_accel->insert( "Effects", i18n("Effects Configuration"), TQString(),
                          CTRL+ALT+Key_E, KKey::QtWIN+CTRL+Key_E,
-                         napp, TQT_SLOT( effectView() ));
+                         napp, TQ_SLOT( effectView() ));
         s_accel->insert( "Preferences", i18n("Preferences"), TQString(),
                          CTRL+ALT+Key_F, KKey::QtWIN+CTRL+Key_F,
-                         napp, TQT_SLOT( preferences() ));
+                         napp, TQ_SLOT( preferences() ));
         s_accel->insert( "VolumeUp", i18n("Volume Up"), TQString(),
                          CTRL+ALT+SHIFT+Key_Up, KKey::QtWIN+CTRL+SHIFT+Key_Up,
-                         this, TQT_SLOT( slotVolumeUp() ));
+                         this, TQ_SLOT( slotVolumeUp() ));
         s_accel->insert( "VolumeDown", i18n("Volume Down"), TQString(),
                          CTRL+ALT+SHIFT+Key_Down, KKey::QtWIN+CTRL+SHIFT+Key_Down,
-                         this, TQT_SLOT( slotVolumeDown() ));
+                         this, TQ_SLOT( slotVolumeDown() ));
         s_accel->insert( "Mute", i18n("Mute"), TQString(),
                          CTRL+ALT+Key_M, KKey::QtWIN+CTRL+Key_M,
-                         this, TQT_SLOT( slotMute() ));
+                         this, TQ_SLOT( slotMute() ));
         s_accel->insert( "SeekForward", i18n("Seek Forward"), TQString(),
                          CTRL+ALT+SHIFT+Key_Right, KKey::QtWIN+CTRL+SHIFT+Key_Right,
-                         this, TQT_SLOT( slotForward() ));
+                         this, TQ_SLOT( slotForward() ));
         s_accel->insert( "SeekBackward", i18n("Seek Backward"), TQString(),
                          CTRL+ALT+SHIFT+Key_Left, KKey::QtWIN+CTRL+SHIFT+Key_Left,
-                         this, TQT_SLOT( slotBackward() ));
+                         this, TQ_SLOT( slotBackward() ));
         s_accel->insert( "NextSection", i18n("Next Section"), TQString(),
                          0, 0,
-                         this, TQT_SLOT( slotNextSection() ));
+                         this, TQ_SLOT( slotNextSection() ));
         s_accel->insert( "PrevSection", i18n("Previous Section"), TQString(),
                          0, 0,
-                         this, TQT_SLOT( slotPrevSection() ));
+                         this, TQ_SLOT( slotPrevSection() ));
         s_accel->insert( "CopyTitle", i18n("Copy Song Title to Clipboard"), TQString(),
                          CTRL+ALT+Key_C, KKey::QtWIN+CTRL+Key_C,
-                         this, TQT_SLOT( slotCopyTitle() ));
+                         this, TQ_SLOT( slotCopyTitle() ));
 
         s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString(),
                          CTRL+ALT+Key_W, KKey::QtWIN+CTRL+Key_W,
-                         napp, TQT_SLOT( toggleInterfaces() ));
+                         napp, TQ_SLOT( toggleInterfaces() ));
 
         s_accel->readSettings();
         s_accel->updateConnections();
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index 306a82fc..31e1ad96 100644
--- a/noatun/modules/kjofol-skin/kjbutton.cpp
+++ b/noatun/modules/kjofol-skin/kjbutton.cpp
@@ -87,18 +87,18 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent)
 	if (mTitle=="playlistbutton")
 	{
 		mShowPressed = napp->playlist()->listVisible();
-		connect( napp->player(), TQT_SIGNAL(playlistShown()), this, TQT_SLOT(slotPlaylistShown()) );
-		connect( napp->player(), TQT_SIGNAL(playlistHidden()), this, TQT_SLOT(slotPlaylistHidden()) );
+		connect( napp->player(), TQ_SIGNAL(playlistShown()), this, TQ_SLOT(slotPlaylistShown()) );
+		connect( napp->player(), TQ_SIGNAL(playlistHidden()), this, TQ_SLOT(slotPlaylistHidden()) );
 	}
 	else if ( mTitle=="equalizeroffbutton") // same goes for EQ buttons
 	{
 		mShowPressed = (!napp->vequalizer()->isEnabled());
-		connect( napp->vequalizer(), TQT_SIGNAL(enabled(bool)), TQT_SLOT(slotEqEnabled(bool)));
+		connect( napp->vequalizer(), TQ_SIGNAL(enabled(bool)), TQ_SLOT(slotEqEnabled(bool)));
 	}
 	else if (mTitle=="equalizeronbutton")
 	{
 		mShowPressed = napp->vequalizer()->isEnabled();
-		connect( napp->vequalizer(), TQT_SIGNAL(enabled(bool)), TQT_SLOT(slotEqEnabled(bool)));
+		connect( napp->vequalizer(), TQ_SIGNAL(enabled(bool)), TQ_SLOT(slotEqEnabled(bool)));
 	}
 }
 
diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp
index d7d2b9fa..c82d1a93 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.cpp
+++ b/noatun/modules/kjofol-skin/kjequalizer.cpp
@@ -47,7 +47,7 @@ KJEqualizer::KJEqualizer(const TQStringList &l, KJLoader *p)
 	kdDebug(66666) << "[KJEqualizer] creating VInterpolation for " << mBands << " bands..." << endl;
 	mInterpEq = new VInterpolation(mBands);
 //	napp->vequalizer()->setBands(mBands); // FIXME: hack because spline sucks :P
-	connect(napp->vequalizer(), TQT_SIGNAL(changed()), this, TQT_SLOT(slotUpdateBuffer()));
+	connect(napp->vequalizer(), TQ_SIGNAL(changed()), this, TQ_SLOT(slotUpdateBuffer()));
 
 	slotUpdateBuffer(); // fill mView pixmap with valid data
 }
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index e23c47a7..293dca96 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -132,7 +132,7 @@ KJLoader::KJLoader()
 	subwidgets.setAutoDelete(true);
 
 	mPrefs = new KJPrefs(this);
-	connect ( mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()) );
+	connect ( mPrefs, TQ_SIGNAL(configChanged()), this, TQ_SLOT(readConfig()) );
 
 	TQString skin = mPrefs->skin();
 	if ( TQFile(skin).exists() )
@@ -147,13 +147,13 @@ KJLoader::KJLoader()
 	}
 
 	mHelpMenu = new KHelpMenu(this, kapp->aboutData());
-	connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(timeUpdate()));
-	connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(timeUpdate()));
-	connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong()));
+	connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(timeUpdate()));
+	connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(timeUpdate()));
+	connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSong()));
 
-	connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide()));
-	connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show()));
-//	KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection());
+	connect(napp, TQ_SIGNAL(hideYourself()), TQ_SLOT(hide()));
+	connect(napp, TQ_SIGNAL(showYourself()), TQ_SLOT(show()));
+//	KStdAction::quit(napp, TQ_SLOT(quit()), actionCollection());
 
 	TQApplication::restoreOverrideCursor();
 //	newSong();
@@ -371,7 +371,7 @@ void KJLoader::loadSkin(const TQString &file)
 
 	// I cant believe it, there are skins without a seeker, now THATS stupid :)
 	if (exist("seekregion"))
-		TQTimer::singleShot(0, this, TQT_SLOT(loadSeeker()));
+		TQTimer::singleShot(0, this, TQ_SLOT(loadSeeker()));
 
 	// all the regular buttons
 	for (TQDictIterator<TQStringList> i(*this); i.current(); ++i)
@@ -487,11 +487,11 @@ void KJLoader::switchToDockmode()
 //	kdDebug(66666) << "KJLoader::switchToDockmode()" << endl;
 	loadSkin( mCurrentDockModeSkin );
 
-	connect(mWin, TQT_SIGNAL(activeWindowChanged(WId)), this, TQT_SLOT(slotWindowActivate(WId)));
-	connect(mWin, TQT_SIGNAL(windowRemoved(WId)), this, TQT_SLOT(slotWindowRemove(WId)));
-	connect(mWin, TQT_SIGNAL(stackingOrderChanged()), this, TQT_SLOT(slotStackingChanged()));
-	connect(mWin, TQT_SIGNAL(windowChanged(WId)), this, TQT_SLOT(slotWindowChange(WId)));
-	connect(mWin, TQT_SIGNAL(currentDesktopChanged(int)), this, TQT_SLOT(slotDesktopChange(int)));
+	connect(mWin, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(slotWindowActivate(WId)));
+	connect(mWin, TQ_SIGNAL(windowRemoved(WId)), this, TQ_SLOT(slotWindowRemove(WId)));
+	connect(mWin, TQ_SIGNAL(stackingOrderChanged()), this, TQ_SLOT(slotStackingChanged()));
+	connect(mWin, TQ_SIGNAL(windowChanged(WId)), this, TQ_SLOT(slotWindowChange(WId)));
+	connect(mWin, TQ_SIGNAL(currentDesktopChanged(int)), this, TQ_SLOT(slotDesktopChange(int)));
 
 	WId activeWin = mWin->activeWindow();
 	if (activeWin && (activeWin != winId()))
@@ -676,7 +676,7 @@ void KJLoader::slotStackingChanged()
 
 	// We seem to get this signal before the window has been restacked,
 	// so we just schedule a restack.
-	TQTimer::singleShot ( 10, this, TQT_SLOT(restack()) );
+	TQTimer::singleShot ( 10, this, TQ_SLOT(restack()) );
 
 //	kdDebug(66666) << "END slotStackingChanged()" << endl;
 }
@@ -822,7 +822,7 @@ void KJLoader::showSplash()
 	splashScreen->show();
 	napp->processEvents(); // we want this one time to get the splash actually displayed ASAP
 
-	TQTimer::singleShot(3000, this, TQT_SLOT(hideSplash()) );
+	TQTimer::singleShot(3000, this, TQ_SLOT(hideSplash()) );
 }
 
 void KJLoader::hideSplash()
diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index cb341ea3..04670fe0 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -63,9 +63,9 @@ KJPrefs::KJPrefs(TQObject* parent)
 	mTabWidget->insertTab( mSkinselectorWidget, i18n("&Skin Selector") );
 	mTabWidget->insertTab( mGuiSettingsWidget, i18n("O&ther Settings") );
 
-	connect ( mSkinselectorWidget->mSkins, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(showPreview(const TQString&)) );
-	connect ( mSkinselectorWidget->installButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(installNewSkin()) );
-	connect ( mSkinselectorWidget->mRemoveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelectedSkin()) );
+	connect ( mSkinselectorWidget->mSkins, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(showPreview(const TQString&)) );
+	connect ( mSkinselectorWidget->installButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(installNewSkin()) );
+	connect ( mSkinselectorWidget->mRemoveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeSelectedSkin()) );
 
 	reopen(); // fill the skinlist and draw a preview
 }
@@ -488,7 +488,7 @@ void KJPrefs::installNewSkin( void )
 			kdDebug(66666) << "src: " << src.path().latin1() << endl;
 			kdDebug(66666) << "dst: " << dst.path().latin1() << endl;
 			TDEIO::Job *job = TDEIO::copy(src,dst);
-			connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) );
+			connect ( job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotResult(TDEIO::Job*)) );
 			skinInstalled = true;
 		}
 	} // END iterate trough dirList
@@ -555,7 +555,7 @@ void KJPrefs::removeSelectedSkin( void )
 	{
 		kdDebug(66666) << "Deleting Skindir: " << dirToDelete.latin1() << endl;
 		TDEIO::Job *job = TDEIO::del( dirToDelete, false, true );
-		connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) );
+		connect ( job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotResult(TDEIO::Job*)) );
 	}
 
 	int item = -1;
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index f7a6e5ff..ba3c258b 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -78,9 +78,9 @@ Marquis::Marquis()
 // for testing: uncomment this and use
 // dcop `dcop | grep noatun` Marquis activateAction dynamicRestore
 // and dynamicSave accordingly.
-//	(void) new TDEAction("Restore", 0, this, TQT_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" );
-// 	(void) new TDEAction("Save", 0, this, TQT_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" );
-	connect( napp, TQT_SIGNAL( saveYourself() ), TQT_SLOT( dynamicSave() ));
+//	(void) new TDEAction("Restore", 0, this, TQ_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" );
+// 	(void) new TDEAction("Save", 0, this, TQ_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" );
+	connect( napp, TQ_SIGNAL( saveYourself() ), TQ_SLOT( dynamicSave() ));
 }
 
 Marquis::~Marquis()
diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp
index 4ff6a9e0..16d09ece 100644
--- a/noatun/modules/metatag/edit.cpp
+++ b/noatun/modules/metatag/edit.cpp
@@ -49,8 +49,8 @@ Editor::Editor()
     mControls.setAutoDelete(true);
     mNextRow = 2;
 
-    connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(delayedDestruct()));
-    connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(save()));
+    connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(delayedDestruct()));
+    connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(save()));
 
     enableButtonSeparator(true);
     setFixedHeight(sizeHint().height());
@@ -215,7 +215,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
 
         box->setValue(info_item.value().toInt());
 
-        connect(box, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(modified()));
+        connect(box, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(modified()));
         meta_widget->widget = box;
     }
     else {
@@ -234,7 +234,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
                                      >(validator)->stringList());
 
              combo->setCurrentText(info_item.value().toString());
-             connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(modified()));
+             connect(combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(modified()));
 
              meta_widget->widget = combo;
         }
@@ -244,7 +244,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
              edit = new KLineEdit(parent);
              edit->setText(info_item.value().toString());
              edit->setValidator(validator);
-             connect(edit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(modified()));
+             connect(edit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(modified()));
 
              meta_widget->widget = edit;
         }
diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp
index 801ddf0f..afb55d2e 100644
--- a/noatun/modules/metatag/metatag.cpp
+++ b/noatun/modules/metatag/metatag.cpp
@@ -32,7 +32,7 @@ extern "C"
 
 MetaTagLoader::MetaTagLoader():Plugin()
 {
-	mAction = new TDEAction(i18n("&Tag Editor..."), "edit", 0, this, TQT_SLOT(editTag()), this, "edittag");
+	mAction = new TDEAction(i18n("&Tag Editor..."), "edit", 0, this, TQ_SLOT(editTag()), this, "edittag");
 	napp->pluginActionMenu()->insert(mAction);
 }
 
@@ -52,8 +52,8 @@ void MetaTagLoader::editTag()
 	e->open(i);
 	e->show();
 
-	connect(e, TQT_SIGNAL(saved(PlaylistItem &)),
-		TQT_SLOT(update(PlaylistItem &)));
+	connect(e, TQ_SIGNAL(saved(PlaylistItem &)),
+		TQ_SLOT(update(PlaylistItem &)));
 }
 
 bool MetaTagLoader::update(PlaylistItem & item)
diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index 702424af..ded4a42d 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -41,7 +41,7 @@ Monoscope::~Monoscope()
 void Monoscope::init()
 {
 	mAction = new TDEToggleAction(i18n("Toggle Monoscope"), 0, 0,
-		this, TQT_SLOT(toggle()), this, "togglemonoscope");
+		this, TQ_SLOT(toggle()), this, "togglemonoscope");
 	mAction->setChecked(!isHidden());
 	napp->pluginActionMenu()->insert(mAction);
 }
diff --git a/noatun/modules/net/net.cpp b/noatun/modules/net/net.cpp
index dbdd7e2f..8d67580e 100644
--- a/noatun/modules/net/net.cpp
+++ b/noatun/modules/net/net.cpp
@@ -14,7 +14,7 @@ extern "C"
 Net::Net() : TQServerSocket(7539, 10), Plugin()
 {
 	mFDs.setAutoDelete(true);
-	connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong()));
+	connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSong()));
 }
 
 Net::~Net()
diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp
index 250d79a9..7fbc497b 100644
--- a/noatun/modules/noatunui/userinterface.cpp
+++ b/noatun/modules/noatunui/userinterface.cpp
@@ -37,45 +37,45 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface()
 		mBack=new TQPushButton(this);
 		mBack->setFixedSize(buttonSize,buttonSize);
 		mBack->setPixmap(BarIcon("noatunback"));
-		connect(mBack, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()));
+		connect(mBack, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()));
 		TQToolTip::add(mBack,i18n("Back"));
 
 		mStop=new TQPushButton(this);
 		mStop->setFixedSize(buttonSize,buttonSize);
 		mStop->setPixmap(BarIcon("noatunstop"));
-		connect(mStop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()));
+		connect(mStop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()));
 		TQToolTip::add(mStop, i18n("Stop"));
 
 		mPlay=new TQPushButton(this);
 		mPlay->setToggleButton(true);
 		mPlay->setFixedSize(buttonSize,buttonSize);
 		mPlay->setPixmap(BarIcon("noatunplay"));
-		connect(mPlay, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()));
+		connect(mPlay, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()));
 		TQToolTip::add(mPlay, i18n("Play"));
 
 		mForward=new TQPushButton(this);
 		mForward->setFixedSize(buttonSize,buttonSize);
 		mForward->setPixmap(BarIcon("noatunforward"));
-		connect(mForward, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()));
+		connect(mForward, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()));
 		TQToolTip::add(mForward, i18n("Forward"));
 
 		mPlaylist=new TQPushButton(this);
 		mPlaylist->setToggleButton(true);
 		mPlaylist->setFixedSize(buttonSize,buttonSize);
 		mPlaylist->setPixmap(BarIcon("noatunplaylist"));
-		connect(mPlaylist, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()));
+		connect(mPlaylist, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()));
 		TQToolTip::add(mPlaylist, i18n("Playlist"));
 
 		mLoop=new TQPushButton(this);
 		mLoop->setFixedSize(buttonSize,buttonSize);
 		mLoop->setPixmap(BarIcon("noatunloopnone"));
-		connect(mLoop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(loop()));
+		connect(mLoop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(loop()));
 		TQToolTip::add(mLoop, i18n("Change loop style"));
 
 		mPopup=new TQPushButton(this);
 		mPopup->setFixedSize(buttonSize,buttonSize);
 		mPopup->setPixmap(BarIcon("noatun"));
-		connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup()));
+		connect(mPopup, TQ_SIGNAL(clicked()), TQ_SLOT(popup()));
 //		TQToolTip::add(mRemoveCurrent, i18n("Remove current file from playlist"));
 
 	}
@@ -104,32 +104,32 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface()
 	statusBar()->message(i18n("No File Loaded"));
 	statusBar()->insertItem("--:--/--:--", 1, 0, true);
 
-	connect(napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) );
-	connect(napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) );
+	connect(napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) );
+	connect(napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) );
 
-	connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying()));
-	connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped()));
-	connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused()));
+	connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying()));
+	connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped()));
+	connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused()));
 	napp->player()->handleButtons();
 
-	connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
-	connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(changeLoopType(int)));
+	connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
+	connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(changeLoopType(int)));
 
 //	if(seeker())
 	{
 		/* This skipToWrapper is needed to pass milliseconds to Player() as everybody
 		 * below the GUI is based on milliseconds instead of some unprecise thingy
 		 * like seconds or mille */
-		connect(seeker(), TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int)));
-		connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int)));
-		connect(seeker(), TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int)));
+		connect(seeker(), TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int)));
+		connect(this, TQ_SIGNAL(skipTo(int)), napp->player(), TQ_SLOT(skipTo(int)));
+		connect(seeker(), TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(sliderMoved(int)));
 	}
-	connect(mVolume, TQT_SIGNAL(sliderMoved(int)), napp->player(), TQT_SLOT(setVolume(int)));
-	connect(mVolume, TQT_SIGNAL(userChanged(int)), napp->player(), TQT_SLOT(setVolume(int)));
+	connect(mVolume, TQ_SIGNAL(sliderMoved(int)), napp->player(), TQ_SLOT(setVolume(int)));
+	connect(mVolume, TQ_SIGNAL(userChanged(int)), napp->player(), TQ_SLOT(setVolume(int)));
 
 
-	connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(playlistShown()));
-	connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden()));
+	connect(napp->player(), TQ_SIGNAL(playlistShown()), TQ_SLOT(playlistShown()));
+	connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(playlistHidden()));
 
 	// Event Filter for the RMB
 	for (TQPtrListIterator<TQObject> i(childrenListObject()); i.current(); ++i)
@@ -205,7 +205,7 @@ void MilkChocolate::popup()
 
 void MilkChocolate::slotPlaying()
 {
-//	connect(twinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptReparent(WId)));
+//	connect(twinmodule, TQ_SIGNAL(windowAdded(WId)), view, TQ_SLOT(attemptReparent(WId)));
 	changeStatusbar(napp->player()->current().title(), napp->player()->lengthString());
 	mPlay->setOn(true);
 	mStop->setEnabled(true);
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index e06feca5..72edda51 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -63,14 +63,14 @@ SimpleUI::SimpleUI()
 
     setupGUI( StatusBar|Create, "simpleui.rc" );
 
-    connect( napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying()) );
-    connect( napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped()) );
-    connect( napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused()) );
-    connect( napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
-    connect( napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(slotChanged()) );
-    connect( napp->player(), TQT_SIGNAL(volumeChanged(int)), TQT_SLOT(slotVolumeChanged(int)) );
-    connect( napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide()) );
-    connect( napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show()) );
+    connect( napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(slotPlaying()) );
+    connect( napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(slotStopped()) );
+    connect( napp->player(), TQ_SIGNAL(paused()), TQ_SLOT(slotPaused()) );
+    connect( napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
+    connect( napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(slotChanged()) );
+    connect( napp->player(), TQ_SIGNAL(volumeChanged(int)), TQ_SLOT(slotVolumeChanged(int)) );
+    connect( napp, TQ_SIGNAL(hideYourself()), TQ_SLOT(hide()) );
+    connect( napp, TQ_SIGNAL(showYourself()), TQ_SLOT(show()) );
 
     napp->player()->handleButtons();
 
@@ -126,10 +126,10 @@ SimpleUI::~SimpleUI()
 
 void SimpleUI::setupActions()
 {
-    KStdAction::open( napp, TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
-    new TDEAction( i18n("&Properties"), 0, propertiesDialog, TQT_SLOT(show()),
+    KStdAction::open( napp, TQ_SLOT(fileOpen()), actionCollection(), "_file_open" );
+    new TDEAction( i18n("&Properties"), 0, propertiesDialog, TQ_SLOT(show()),
         actionCollection(), "_file_properties" );
-    KStdAction::quit( napp, TQT_SLOT(quit()), actionCollection(), "_file_quit");
+    KStdAction::quit( napp, TQ_SLOT(quit()), actionCollection(), "_file_quit");
 
      NoatunStdAction::playlist( actionCollection(), "view_playlist" );
     actionCollection()->insert(video->action( "half_size" ));
@@ -139,14 +139,14 @@ void SimpleUI::setupActions()
 
     actionCollection()->insert(napp->pluginActionMenu());
 
-    menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()),
+    menubarAction = KStdAction::showMenubar(this, TQ_SLOT(showMenubar()),
         actionCollection());
-    statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()),
+    statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(showStatusbar()),
         actionCollection());
     NoatunStdAction::effects( actionCollection(), "effects" );
     NoatunStdAction::equalizer( actionCollection(), "equalizer" );
     NoatunStdAction::loop( actionCollection(), "loop_style" );
-    KStdAction::preferences( napp, TQT_SLOT(preferences()), actionCollection() );
+    KStdAction::preferences( napp, TQ_SLOT(preferences()), actionCollection() );
 }
 
 void SimpleUI::showMenubar()
@@ -178,10 +178,10 @@ void SimpleUI::setupCentralWidget()
     statusBar()->addWidget( positionLabel, 0, true );
 
     video = new VideoFrame( npWidget );
-    connect( video, TQT_SIGNAL(adaptSize(int,int)),
-         TQT_SLOT(slotAdaptSize(int,int)) );
-    connect( video, TQT_SIGNAL(rightButtonPressed(const TQPoint &)),
-         TQT_SLOT(slotContextMenu(const TQPoint &)) );
+    connect( video, TQ_SIGNAL(adaptSize(int,int)),
+         TQ_SLOT(slotAdaptSize(int,int)) );
+    connect( video, TQ_SIGNAL(rightButtonPressed(const TQPoint &)),
+         TQ_SLOT(slotContextMenu(const TQPoint &)) );
 
     TQHBox *ctlFrame = new TQHBox( npWidget );
     ctlFrame->setFixedHeight( 38 );
@@ -194,38 +194,38 @@ void SimpleUI::setupCentralWidget()
     backButton->setFixedSize( 24, 24 );
     backButton->setPixmap( TQPixmap( back_xpm ) );
     TQToolTip::add( backButton, i18n("Back") );
-    connect( backButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) );
+    connect( backButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()) );
 
     stopButton = new TQPushButton( ctlFrame );
     stopButton->setFixedSize( 24, 24 );
     stopButton->setPixmap( TQPixmap( stop_xpm ) );
     TQToolTip::add( stopButton, i18n("Stop") );
-    connect( stopButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) );
+    connect( stopButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()) );
 
     playButton = new TQPushButton( ctlFrame );
     playButton->setFixedSize( 24, 24 );
     playButton->setPixmap( TQPixmap( play_xpm ) );
     TQToolTip::add( playButton, i18n("Play / Pause") );
-    connect( playButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) );
+    connect( playButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) );
 
     TQPushButton *forwButton = new TQPushButton( ctlFrame );
     forwButton->setFixedSize( 24, 24 );
     forwButton->setPixmap( TQPixmap( forward_xpm ) );
     TQToolTip::add( forwButton, i18n("Forward") );
-    connect( forwButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) );
+    connect( forwButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()) );
 
     slider = new L33tSlider( 0, 1000, 10, 0, TQt::Horizontal, ctlFrame );
     slider->setFixedHeight( 24 );
     slider->setMinimumWidth( 100 );
     slider->setTickmarks( TQSlider::NoMarks );
-    connect( slider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotSkipTo(int)) );
-    connect( slider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotSliderMoved(int)) );
+    connect( slider, TQ_SIGNAL(userChanged(int)), TQ_SLOT(slotSkipTo(int)) );
+    connect( slider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(slotSliderMoved(int)) );
 
     TQPushButton *playlistButton = new TQPushButton( ctlFrame );
     playlistButton->setFixedSize( 24, 24 );
     playlistButton->setPixmap( TQPixmap( playlist_xpm ) );
     TQToolTip::add( playlistButton, i18n("Playlist") );
-    connect( playlistButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) );
+    connect( playlistButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()) );
 
     volumeButton = new TQPushButton( ctlFrame );
     volumeButton->setFixedSize( 24, 24 );
@@ -248,9 +248,9 @@ void SimpleUI::setupCentralWidget()
 
     volumeFrame->resize( volumeFrame->sizeHint() );
 
-    connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) );
-    connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) );
-    connect( volumeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotVolumeFrame()) );
+    connect( volumeSlider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(slotVolumeSliderMoved(int)) );
+    connect( volumeSlider, TQ_SIGNAL(userChanged(int)), TQ_SLOT(slotVolumeSliderMoved(int)) );
+    connect( volumeButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotVolumeFrame()) );
 
     setCentralWidget( npWidget );
 
diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp
index 67b7f332..7c504383 100644
--- a/noatun/modules/splitplaylist/find.cpp
+++ b/noatun/modules/splitplaylist/find.cpp
@@ -26,10 +26,10 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C
 	layout->addWidget(mRegexp, 1, 0);
 	layout->addWidget(mBackwards, 1, 1);
 
-	connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked()));
+	connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(clicked()));
 
-	connect(mText, TQT_SIGNAL(activated(int)), TQT_SLOT(clicked()));
-	connect(mText, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &)));
+	connect(mText, TQ_SIGNAL(activated(int)), TQ_SLOT(clicked()));
+	connect(mText, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &)));
 
 	enableButton(User1, false);
 }
diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp
index 34690f91..d940c8ca 100644
--- a/noatun/modules/splitplaylist/playlist.cpp
+++ b/noatun/modules/splitplaylist/playlist.cpp
@@ -20,9 +20,9 @@ SplitPlaylist::SplitPlaylist()
 void SplitPlaylist::init()
 {
 	view=new View(this); // 195
-	connect(view->listView(), TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(listItemSelected(TQListViewItem*)));
-	connect(view, TQT_SIGNAL(shown()), TQT_SIGNAL(listShown()));
-	connect(view, TQT_SIGNAL(hidden()), TQT_SIGNAL(listHidden()));
+	connect(view->listView(), TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(listItemSelected(TQListViewItem*)));
+	connect(view, TQ_SIGNAL(shown()), TQ_SIGNAL(listShown()));
+	connect(view, TQ_SIGNAL(hidden()), TQ_SIGNAL(listHidden()));
 
 	view->init(); // 1000
 }
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index b0179b88..1b2679d5 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -355,10 +355,10 @@ List::List(View *parent)
 	setDragEnabled(true);
 	setItemsMovable(true);
 	setSelectionMode(TQListView::Extended);
-	connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*)));
-	connect(this, TQT_SIGNAL(moved()), TQT_SLOT(move()));
-	connect(this, TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting()));
-	connect(this, TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected()));
+	connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQ_SLOT(dropEvent(TQDropEvent*, TQListViewItem*)));
+	connect(this, TQ_SIGNAL(moved()), TQ_SLOT(move()));
+	connect(this, TQ_SIGNAL(aboutToMove()), parent, TQ_SLOT(setNoSorting()));
+	connect(this, TQ_SIGNAL(deleteCurrentItem()), parent, TQ_SLOT(deleteSelected()));
 }
 
 List::~List()
@@ -569,16 +569,16 @@ void List::addNextPendingDirectory()
 		currentJobURL= *pendingIt;
 		listJob= TDEIO::listRecursive(currentJobURL, false,false);
 		connect(
-				listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
-				TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))
+				listJob, TQ_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
+				TQ_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))
 			);
 		connect(
-				listJob, TQT_SIGNAL(result(TDEIO::Job *)),
-				TQT_SLOT(slotResult(TDEIO::Job *))
+				listJob, TQ_SIGNAL(result(TDEIO::Job *)),
+				TQ_SLOT(slotResult(TDEIO::Job *))
 			);
 		connect(
-				listJob, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)),
-				TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))
+				listJob, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL &)),
+				TQ_SLOT(slotRedirection(TDEIO::Job *, const KURL &))
 			);
 		pendingAddDirectories.remove(pendingIt);
 	}
@@ -638,25 +638,25 @@ View::View(SplitPlaylist *)
 {
 	list=new List(this);
 	setCentralWidget(list);
-	connect(list, TQT_SIGNAL(modified(void)), this, TQT_SLOT(setModified(void)) );
+	connect(list, TQ_SIGNAL(modified(void)), this, TQ_SLOT(setModified(void)) );
 	// connect the click on the header with sorting
-	connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) );
+	connect(list->header(),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(headerClicked(int)) );
 
-	mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files");
-	(void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()),  actionCollection(), "add_dir");
-	mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, this, TQT_SLOT(deleteSelected()),  actionCollection(), "delete");
+	mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQ_SLOT(addFiles()), actionCollection(), "add_files");
+	(void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQ_SLOT(addDirectory()),  actionCollection(), "add_dir");
+	mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, this, TQ_SLOT(deleteSelected()),  actionCollection(), "delete");
 
-	mClose=KStdAction::close(this, TQT_SLOT(close()), actionCollection());
-	mFind=KStdAction::find(this, TQT_SLOT(find()), actionCollection());
+	mClose=KStdAction::close(this, TQ_SLOT(close()), actionCollection());
+	mFind=KStdAction::find(this, TQ_SLOT(find()), actionCollection());
 
-	(void) KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection());
-	mOpenNew=KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection());
-	mOpenpl=KStdAction::open(this, TQT_SLOT(open()), actionCollection());
-	mSave=KStdAction::save(this, TQT_SLOT(save()), actionCollection());
-	mSaveAs=KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
+	(void) KStdAction::configureToolbars(this, TQ_SLOT(configureToolBars()), actionCollection());
+	mOpenNew=KStdAction::openNew(this, TQ_SLOT(openNew()), actionCollection());
+	mOpenpl=KStdAction::open(this, TQ_SLOT(open()), actionCollection());
+	mSave=KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+	mSaveAs=KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
 
-	(void) new TDEAction(i18n("Shuffle"), "misc", 0, SPL, TQT_SLOT( randomize() ), actionCollection(), "shuffle");
-	(void) new TDEAction(i18n("Clear"), "edit-clear", 0, list, TQT_SLOT( clear() ), actionCollection(), "clear");
+	(void) new TDEAction(i18n("Shuffle"), "misc", 0, SPL, TQ_SLOT( randomize() ), actionCollection(), "shuffle");
+	(void) new TDEAction(i18n("Clear"), "edit-clear", 0, list, TQ_SLOT( clear() ), actionCollection(), "clear");
 
 	createGUI("splui.rc");
 
@@ -669,7 +669,7 @@ View::View(SplitPlaylist *)
 void View::find()
 {
 	mFinder->show();
-	connect(mFinder, TQT_SIGNAL(search(Finder*)), TQT_SLOT(findIt(Finder*)));
+	connect(mFinder, TQ_SIGNAL(search(Finder*)), TQ_SLOT(findIt(Finder*)));
 }
 
 static bool testWord(TQListViewItem *i, const TQString &finder)
@@ -967,7 +967,7 @@ void View::configureToolBars()
 {
 	saveMainWindowSettings(TDEGlobal::config(), "SPL Window");
 	KEditToolbar dlg(actionCollection(), "splui.rc");
-	connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig()));
+	connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolBarConfig()));
 	dlg.exec();
 }
 
diff --git a/noatun/modules/systray/cmodule.cpp b/noatun/modules/systray/cmodule.cpp
index 189d1539..e9e33d16 100644
--- a/noatun/modules/systray/cmodule.cpp
+++ b/noatun/modules/systray/cmodule.cpp
@@ -58,9 +58,9 @@ YHModule::YHModule(TQObject *_parent)
 	mWidget->cmbModifier->insertItem(i18n("Ctrl"), YHConfig::Ctrl);
 	mWidget->cmbModifier->setCurrentItem(YHConfig::None);
 
-	connect(mWidget->chkUsePopup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUsePopupToggled(bool)));
-	connect(mWidget->cmbModifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotModifierActivated(int)));
-	connect(mWidget->grpMwheel, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotMwheelClicked(int)));
+	connect(mWidget->chkUsePopup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUsePopupToggled(bool)));
+	connect(mWidget->cmbModifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotModifierActivated(int)));
+	connect(mWidget->grpMwheel, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotMwheelClicked(int)));
 
 	reopen();
 }
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index a1270076..ab70c8dd 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -100,9 +100,9 @@ NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(),
 
 	removeCover(); // make sure any old temp cover is gone
 
-	KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection());
-	KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection());
-	KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection());
+	KStdAction::quit(napp, TQ_SLOT(quit()), actionCollection());
+	KStdAction::open(napp, TQ_SLOT(fileOpen()), actionCollection());
+	KStdAction::preferences(napp, TQ_SLOT(preferences()), actionCollection());
 	NoatunStdAction::back(actionCollection(), "back");
 	NoatunStdAction::stop(actionCollection(), "stop");
 	NoatunStdAction::playpause(actionCollection(), "play");
@@ -124,11 +124,11 @@ NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(),
 	showingTrayStatus = false;
 
 	mBlinkTimer = new TQTimer(this);
-	connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer()));
+	connect(mBlinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotBlinkTimer()));
 
-	connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlayPause()));
-	connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPlayPause()));
-	connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped()));
+	connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlayPause()));
+	connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPlayPause()));
+	connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped()));
 	//napp->player()->handleButtons();
 }
 
@@ -146,7 +146,7 @@ NoatunSystray::~NoatunSystray()
 void NoatunSystray::init()
 {
 	YHModule *cmod = new YHModule(this);
-	connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings()));
+	connect(cmod, TQ_SIGNAL(saved()), this, TQ_SLOT(slotLoadSettings()));
 	slotLoadSettings();
 }
 
@@ -364,7 +364,7 @@ void NoatunSystray::setTipText(const TQString& text)
 
 	YHConfig *c = YHConfig::self();
 	if(c->passivePopup())
-		TQTimer::singleShot(0, this, TQT_SLOT(showPassivePopup()));
+		TQTimer::singleShot(0, this, TQ_SLOT(showPassivePopup()));
 
 	if(c->tip())
 		TQToolTip::add(mTray, tipText);
@@ -405,11 +405,11 @@ void NoatunSystray::showPassivePopup()
 
 			TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward");
 			forwardButton->setFlat(true);
-			connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate()));
+			connect(forwardButton, TQ_SIGNAL(clicked()), action("forward"), TQ_SLOT(activate()));
 
 			TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back");
 			backButton->setFlat(true);
-			connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate()));
+			connect(backButton, TQ_SIGNAL(clicked()), action("back"), TQ_SLOT(activate()));
 
 			TQFrame *line = new TQFrame(box);
 			line->setFrameShape(TQFrame::VLine);
@@ -429,11 +429,11 @@ void NoatunSystray::showPassivePopup()
 
 			TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward");
 			forwardButton->setFlat(true);
-			connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate()));
+			connect(forwardButton, TQ_SIGNAL(clicked()), action("forward"), TQ_SLOT(activate()));
 
 			TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back");
 			backButton->setFlat(true);
-			connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate()));
+			connect(backButton, TQ_SIGNAL(clicked()), action("back"), TQ_SLOT(activate()));
 		}
 		mPassivePopup->setView(box);
 	}
diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
index d5413414..46be1e2f 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
@@ -28,7 +28,7 @@
 GuiSpectrumAnalyser::GuiSpectrumAnalyser()
   : WaWidget(_WA_MAPPING_ANALYSER)
 {
-    connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), this, TQT_SLOT(pixmapChange()));
+    connect(WaSkinModel::instance(), TQ_SIGNAL(skinChanged()), this, TQ_SLOT(pixmapChange()));
 
     contextMenu = new TQPopupMenu(this);
     visualizationMenu = new TQPopupMenu();
@@ -40,13 +40,13 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser()
     visualizationMenu->insertItem(i18n("Analyzer"), (int)MODE_ANALYSER);
     visualizationMenu->insertItem(i18n("Disabled"), (int)MODE_DISABLED);
     visualizationMenu->setCheckable(true);
-    connect(visualizationMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setVisualizationMode(int)));
+    connect(visualizationMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setVisualizationMode(int)));
 
     analyserMenu->insertItem(i18n("Normal"), (int)MODE_NORMAL);
     analyserMenu->insertItem(i18n("Fire"), (int)MODE_FIRE);
     analyserMenu->insertItem(i18n("Vertical Lines"), (int)MODE_VERTICAL_LINES);
     analyserMenu->setCheckable(true);
-    connect(analyserMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setAnalyserMode(int)));
+    connect(analyserMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setAnalyserMode(int)));
 
     analyserCache = NULL;
     winSkinVis = NULL;
@@ -139,7 +139,7 @@ void GuiSpectrumAnalyser::setVisualizationMode(int mode)
         if (!winSkinVis)
         {
             winSkinVis=new WinSkinVis(this,"WinSkinVis");
-            connect(winSkinVis,TQT_SIGNAL(doRepaint()),this,TQT_SLOT(updatePeaks()));
+            connect(winSkinVis,TQ_SIGNAL(doRepaint()),this,TQ_SLOT(updatePeaks()));
         }
     }
     else
diff --git a/noatun/modules/winskin/waBalanceSlider.cpp b/noatun/modules/winskin/waBalanceSlider.cpp
index cb6b0f19..1503632b 100644
--- a/noatun/modules/winskin/waBalanceSlider.cpp
+++ b/noatun/modules/winskin/waBalanceSlider.cpp
@@ -38,10 +38,10 @@ void WaBalanceSlider::buildGui()
 
     ws->setValue(0);
 
-    connect(ws, TQT_SIGNAL(valueChanged(int)), this,
-	    TQT_SIGNAL(balanceSetValue(int)));
-    connect(ws, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed()));
-    connect(ws, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased()));
+    connect(ws, TQ_SIGNAL(valueChanged(int)), this,
+	    TQ_SIGNAL(balanceSetValue(int)));
+    connect(ws, TQ_SIGNAL(sliderPressed()), TQ_SIGNAL(sliderPressed()));
+    connect(ws, TQ_SIGNAL(sliderReleased()), TQ_SIGNAL(sliderReleased()));
 }
 
 
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index 97f21606..1e55af78 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -25,8 +25,8 @@
 
 WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO)
 {
-    connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()),
-	    this, TQT_SLOT(pixmapChange()));
+    connect(WaSkinModel::instance(), TQ_SIGNAL(skinChanged()),
+	    this, TQ_SLOT(pixmapChange()));
 
     completePixmap = new TQPixmap();
 
@@ -36,7 +36,7 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO)
     xGrabbedPos = -1;
 
     timer = new TQTimer(this);
-    connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeEvent()));
+    connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeEvent()));
 }
 
 WaInfo::~WaInfo()
diff --git a/noatun/modules/winskin/waJumpSlider.cpp b/noatun/modules/winskin/waJumpSlider.cpp
index b8750dc1..f38fc3c3 100644
--- a/noatun/modules/winskin/waJumpSlider.cpp
+++ b/noatun/modules/winskin/waJumpSlider.cpp
@@ -30,9 +30,9 @@ void WaJumpSlider::buildGui()
     ws->setRange(0, 100);
     ws->setValue(0);
 
-    connect(ws, TQT_SIGNAL(sliderPressed()), this, TQT_SIGNAL(sliderPressed()));
-    connect(ws, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(releasedSlider()));
-    connect(ws, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(valueChanged(int)));
+    connect(ws, TQ_SIGNAL(sliderPressed()), this, TQ_SIGNAL(sliderPressed()));
+    connect(ws, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(releasedSlider()));
+    connect(ws, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(valueChanged(int)));
 }
 
 void WaJumpSlider::setJumpRange(int val)
diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp
index 54b7513b..7b452dac 100644
--- a/noatun/modules/winskin/waLabel.cpp
+++ b/noatun/modules/winskin/waLabel.cpp
@@ -19,8 +19,8 @@
 
 WaLabel::WaLabel(int mapping) : WaWidget(mapping)
 {
-    connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), 
-	    this, TQT_SLOT(pixmapChange()));
+    connect(WaSkinModel::instance(), TQ_SIGNAL(skinChanged()), 
+	    this, TQ_SLOT(pixmapChange()));
 
     completePixmap = new TQPixmap();
 
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index a9e68a2a..91e6a45e 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -83,18 +83,18 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface()
     title_shaded = false;
 
     // These slots make Young Hickory love us
-    connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) );
-    connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) );
-
-    connect(napp->player(), TQT_SIGNAL(playlistShown()), this,
-            TQT_SLOT(playlistShown()));
-    connect(napp->player(), TQT_SIGNAL(playlistHidden()), this,
-            TQT_SLOT(playlistHidden()));
-    connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this,
-            TQT_SLOT(loopChange(int)));
-    connect(napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()));
-
-    connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timetick()));
+    connect( napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) );
+    connect( napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) );
+
+    connect(napp->player(), TQ_SIGNAL(playlistShown()), this,
+            TQ_SLOT(playlistShown()));
+    connect(napp->player(), TQ_SIGNAL(playlistHidden()), this,
+            TQ_SLOT(playlistHidden()));
+    connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this,
+            TQ_SLOT(loopChange(int)));
+    connect(napp->player(), TQ_SIGNAL(newSong()), this, TQ_SLOT(newSong()));
+
+    connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(timetick()));
     TDEConfig *config=TDEGlobal::config();
 
     config->setGroup("Winskin");
@@ -106,13 +106,13 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface()
     setIcon(SmallIcon("noatun"));
 
 
-    TQObject::connect(waTitleBar, TQT_SIGNAL(shaded()), this, TQT_SLOT(shadeEvent()));
+    TQObject::connect(waTitleBar, TQ_SIGNAL(shaded()), this, TQ_SLOT(shadeEvent()));
     // connect to players signals - so we can update our display if someone else
     // changes settings...
 
-    connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped()));
-    connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying()));
-    connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused()));
+    connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped()));
+    connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying()));
+    connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused()));
 
     napp->player()->handleButtons();
 
@@ -180,22 +180,22 @@ void WaSkin::createButtons()
     menu = new WaButton(_WA_MAPPING_TITLE_MENU);
     menu->setPixmapUp(_WA_SKIN_TITLE_MENU_NORM);
     menu->setPixmapDown(_WA_SKIN_TITLE_MENU_PRES);
-    connect(menu, TQT_SIGNAL(clicked()), this, TQT_SLOT(menuEvent()));
+    connect(menu, TQ_SIGNAL(clicked()), this, TQ_SLOT(menuEvent()));
 
     minimize = new WaButton(_WA_MAPPING_TITLE_MIN);
     minimize->setPixmapUp(_WA_SKIN_TITLE_MIN_NORM);
     minimize->setPixmapDown(_WA_SKIN_TITLE_MIN_PRES);
-    connect(minimize, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimizeEvent()));
+    connect(minimize, TQ_SIGNAL(clicked()), this, TQ_SLOT(minimizeEvent()));
 
     titleshade = new WaButton(_WA_MAPPING_TITLE_SHADE);
     titleshade->setPixmapUp(_WA_SKIN_TITLE_SHADE_NORM);
     titleshade->setPixmapDown(_WA_SKIN_TITLE_SHADE_PRES);
-    connect(titleshade, TQT_SIGNAL(clicked()), this, TQT_SLOT(shadeEvent()));
+    connect(titleshade, TQ_SIGNAL(clicked()), this, TQ_SLOT(shadeEvent()));
 
     close = new WaButton(_WA_MAPPING_TITLE_CLOSE);
     close->setPixmapUp(_WA_SKIN_TITLE_CLOSE_NORM);
     close->setPixmapDown(_WA_SKIN_TITLE_CLOSE_PRES);
-    connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(doClose()));
+    connect(close, TQ_SIGNAL(clicked()), this, TQ_SLOT(doClose()));
 
     shuffle->setTogglable(true);
     shuffle->show();
@@ -203,44 +203,44 @@ void WaSkin::createButtons()
     repeat->setTogglable(true);
     playlist->setTogglable(true);
 
-    connect(shuffle, TQT_SIGNAL(toggleEvent(bool)),
-	    this, TQT_SLOT(shuffleClickedEvent(bool)));
+    connect(shuffle, TQ_SIGNAL(toggleEvent(bool)),
+	    this, TQ_SLOT(shuffleClickedEvent(bool)));
 
-    connect(repeat, TQT_SIGNAL(toggleEvent(bool)),
-	    this, TQT_SLOT(repeatClickedEvent(bool)));
+    connect(repeat, TQ_SIGNAL(toggleEvent(bool)),
+	    this, TQ_SLOT(repeatClickedEvent(bool)));
 
-    connect(playlist, TQT_SIGNAL(toggleEvent(bool)),
-	    this, TQT_SLOT(playlistClickedEvent(bool)));
+    connect(playlist, TQ_SIGNAL(toggleEvent(bool)),
+	    this, TQ_SLOT(playlistClickedEvent(bool)));
 
-    connect(eq, TQT_SIGNAL(clicked()),
-	    this, TQT_SLOT(eqClickedEvent()));
+    connect(eq, TQ_SIGNAL(clicked()),
+	    this, TQ_SLOT(eqClickedEvent()));
 
     prev->setPixmapUp(_WA_SKIN_CBUTTONS_PREV_NORM);
     prev->setPixmapDown(_WA_SKIN_CBUTTONS_PREV_PRES);
-    connect(prev, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()));
+    connect(prev, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()));
 
     play->setPixmapUp(_WA_SKIN_CBUTTONS_PLAY_NORM);
     play->setPixmapDown(_WA_SKIN_CBUTTONS_PLAY_PRES);
-    connect(play, TQT_SIGNAL(clicked()), this, TQT_SLOT(playCurrentEvent()));
+    connect(play, TQ_SIGNAL(clicked()), this, TQ_SLOT(playCurrentEvent()));
 
     pause->setPixmapUp(_WA_SKIN_CBUTTONS_PAUSE_NORM);
     pause->setPixmapDown(_WA_SKIN_CBUTTONS_PAUSE_PRES);
-    connect(pause, TQT_SIGNAL(clicked()), this, TQT_SLOT(playPauseEvent()));
+    connect(pause, TQ_SIGNAL(clicked()), this, TQ_SLOT(playPauseEvent()));
 
 
     stop->setPixmapUp(_WA_SKIN_CBUTTONS_STOP_NORM);
     stop->setPixmapDown(_WA_SKIN_CBUTTONS_STOP_PRES);
-    connect(stop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()));
+    connect(stop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()));
 
 
     next->setPixmapUp(_WA_SKIN_CBUTTONS_NEXT_NORM);
     next->setPixmapDown(_WA_SKIN_CBUTTONS_NEXT_PRES);
-    connect(next, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()));
+    connect(next, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()));
 
 
     eject->setPixmapUp(_WA_SKIN_CBUTTONS_EJECT_NORM);
     eject->setPixmapDown(_WA_SKIN_CBUTTONS_EJECT_PRESS);
-    connect(eject, TQT_SIGNAL(clicked()), napp, TQT_SLOT(fileOpen()));
+    connect(eject, TQ_SIGNAL(clicked()), napp, TQ_SLOT(fileOpen()));
 
     shuffle->setPixmapUp(_WA_SKIN_SHUFREP_SHUFFLE_NOT_SET_NORM);
     shuffle->setPixmapDown(_WA_SKIN_SHUFREP_SHUFFLE_NOT_SET_PRES);
@@ -280,25 +280,25 @@ void WaSkin::createHighLevelElements()
     waVolumeSlider = new WaVolumeSlider();
     waVolumeSlider->buildGui();
 
-    connect(waVolumeSlider, TQT_SIGNAL(volumeSetValue(int)),
-	    this, TQT_SLOT(volumeSetValue(int)));
-    connect(waVolumeSlider, TQT_SIGNAL(sliderPressed()),
-	    this, TQT_SLOT(volumeSliderPressed()));
-    connect(waVolumeSlider, TQT_SIGNAL(sliderReleased()),
-	    this, TQT_SLOT(volumeSliderReleased()));
+    connect(waVolumeSlider, TQ_SIGNAL(volumeSetValue(int)),
+	    this, TQ_SLOT(volumeSetValue(int)));
+    connect(waVolumeSlider, TQ_SIGNAL(sliderPressed()),
+	    this, TQ_SLOT(volumeSliderPressed()));
+    connect(waVolumeSlider, TQ_SIGNAL(sliderReleased()),
+	    this, TQ_SLOT(volumeSliderReleased()));
 
     waBalanceSlider = new WaBalanceSlider();
     waBalanceSlider->buildGui();
 
-    connect(waBalanceSlider, TQT_SIGNAL(balanceSetValue(int)),
-	    this, TQT_SLOT(balanceSetValue(int)));
-    connect(waBalanceSlider, TQT_SIGNAL(sliderPressed()),
-            this, TQT_SLOT(balanceSliderPressed()));
-    connect(waBalanceSlider, TQT_SIGNAL(sliderReleased()),
-            this, TQT_SLOT(balanceSliderReleased()));
+    connect(waBalanceSlider, TQ_SIGNAL(balanceSetValue(int)),
+	    this, TQ_SLOT(balanceSetValue(int)));
+    connect(waBalanceSlider, TQ_SIGNAL(sliderPressed()),
+            this, TQ_SLOT(balanceSliderPressed()));
+    connect(waBalanceSlider, TQ_SIGNAL(sliderReleased()),
+            this, TQ_SLOT(balanceSliderReleased()));
 
     waDigit = new WaDigit();
-    connect(waDigit, TQT_SIGNAL(digitsClicked()), this, TQT_SLOT(digitsClicked()));
+    connect(waDigit, TQ_SIGNAL(digitsClicked()), this, TQ_SLOT(digitsClicked()));
 
     waBPS = new WaLabel(_WA_MAPPING_BPS);
     waFreq = new WaLabel(_WA_MAPPING_FREQ);
@@ -310,13 +310,13 @@ void WaSkin::createHighLevelElements()
     waStereo = new WaIndicator(_WA_MAPPING_MONOSTER_STEREO, _WA_SKIN_MONOSTER_STEREO_TRUE, _WA_SKIN_MONOSTER_STEREO_FALSE);
     waMono = new WaIndicator(_WA_MAPPING_MONOSTER_MONO, _WA_SKIN_MONOSTER_MONO_TRUE, _WA_SKIN_MONOSTER_MONO_FALSE);
 
-    connect(waJumpSlider, TQT_SIGNAL(jump(int)), this, TQT_SLOT(jump(int)));
-    connect(waJumpSlider, TQT_SIGNAL(sliderPressed()),
-	    this, TQT_SLOT(jumpSliderPressed()));
-    connect(waJumpSlider, TQT_SIGNAL(sliderReleased()),
-	    this, TQT_SLOT(jumpSliderReleased()));
-    connect(waJumpSlider, TQT_SIGNAL(valueChanged(int)),
-	    this, TQT_SLOT(jumpValueChanged(int)));
+    connect(waJumpSlider, TQ_SIGNAL(jump(int)), this, TQ_SLOT(jump(int)));
+    connect(waJumpSlider, TQ_SIGNAL(sliderPressed()),
+	    this, TQ_SLOT(jumpSliderPressed()));
+    connect(waJumpSlider, TQ_SIGNAL(sliderReleased()),
+	    this, TQ_SLOT(jumpSliderReleased()));
+    connect(waJumpSlider, TQ_SIGNAL(valueChanged(int)),
+	    this, TQ_SLOT(jumpValueChanged(int)));
 }
 
 
@@ -518,7 +518,7 @@ void WaSkin::doUnload() {
 }
 
 void WaSkin::doClose() {
-    TQTimer::singleShot(0, this, TQT_SLOT(doUnload()));
+    TQTimer::singleShot(0, this, TQ_SLOT(doUnload()));
 }
 
 void WaSkin::dragEnterEvent(TQDragEnterEvent * event)
diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp
index 3363292c..f2e63469 100644
--- a/noatun/modules/winskin/waSkinManager.cpp
+++ b/noatun/modules/winskin/waSkinManager.cpp
@@ -73,7 +73,7 @@ bool WaSkinManager::installSkin(TQString _url) {
 	if (mimetype == "inode/directory")
 	{
 		TDEIO::Job *job = TDEIO::copy(url, location, !url.isLocalFile());
-		connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+		connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SIGNAL(updateSkinList()));
 		return true;
 	}
 	else if ((mimetype == "interface/x-winamp-skin") || (mimetype == "application/x-zip"))
@@ -84,7 +84,7 @@ bool WaSkinManager::installSkin(TQString _url) {
 		TQString base_path;
 		base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " ");
 		TDEIO::Job *job = TDEIO::copy("zip:" + url.path(), base_path);
-		connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+		connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SIGNAL(updateSkinList()));
 
 		return true;
 	}
@@ -99,7 +99,7 @@ bool WaSkinManager::removeSkin(TQString skinName) {
 	TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName);
 
 	TDEIO::Job *job = TDEIO::del(KURL(skins[0]), false, false);
-	connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
+	connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SIGNAL(updateSkinList()));
 
 	return true;
 }
diff --git a/noatun/modules/winskin/waVolumeSlider.cpp b/noatun/modules/winskin/waVolumeSlider.cpp
index f61e22f1..712e974d 100644
--- a/noatun/modules/winskin/waVolumeSlider.cpp
+++ b/noatun/modules/winskin/waVolumeSlider.cpp
@@ -33,10 +33,10 @@ void WaVolumeSlider::buildGui()
     ws->setPixmapSliderButtonDown(_WA_SKIN_VOLUME_SLIDER_PRES);
     ws->setPixmapSliderBar(_WA_SKIN_VOLUME_BAR);
 
-    connect(ws, TQT_SIGNAL(valueChanged(int)), this,
-	    TQT_SIGNAL(volumeSetValue(int)));
-    connect(ws, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed()));
-    connect(ws, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased()));
+    connect(ws, TQ_SIGNAL(valueChanged(int)), this,
+	    TQ_SIGNAL(volumeSetValue(int)));
+    connect(ws, TQ_SIGNAL(sliderPressed()), TQ_SIGNAL(sliderPressed()));
+    connect(ws, TQ_SIGNAL(sliderReleased()), TQ_SIGNAL(sliderReleased()));
 }
 
 void WaVolumeSlider::setVolumeValue(int val)
diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp
index 48e6eb24..b8c4b1ac 100644
--- a/noatun/modules/winskin/waWidget.cpp
+++ b/noatun/modules/winskin/waWidget.cpp
@@ -6,7 +6,7 @@
 WaWidget::WaWidget(int _mapping) : TQWidget(WaSkin::instance()) {
     mapping = _mapping;
     setBackgroundMode(NoBackground);
-    connect (WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), this, TQT_SLOT(skinChanged()));
+    connect (WaSkinModel::instance(), TQ_SIGNAL(skinChanged()), this, TQ_SLOT(skinChanged()));
 }
 
 WaWidget::~WaWidget() {
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 7e49da08..4591b4d7 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -48,10 +48,10 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
     hbox->addWidget(buttonRemove);
     vbox->addLayout(hbox);
 
-    connect( skin_list, TQT_SIGNAL(highlighted(const TQString &)), this, TQT_SLOT(selected()));
-    connect( buttonInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(install()));
-    connect( buttonRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove()));
-    connect(waSkinManager, TQT_SIGNAL(updateSkinList()), this, TQT_SLOT(reopen()));
+    connect( skin_list, TQ_SIGNAL(highlighted(const TQString &)), this, TQ_SLOT(selected()));
+    connect( buttonInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(install()));
+    connect( buttonRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove()));
+    connect(waSkinManager, TQ_SIGNAL(updateSkinList()), this, TQ_SLOT(reopen()));
 
     mWaSkinManager = waSkinManager;