2 files changed, 36 insertions, 36 deletions

diff --git a/noatun-plugins/charlatan/seeker.cpp b/noatun-plugins/charlatan/seeker.cpp
index 8e639d8..c740c53 100644
--- a/noatun-plugins/charlatan/seeker.cpp
+++ b/noatun-plugins/charlatan/seeker.cpp
@@ -33,12 +33,12 @@ Seeker::Seeker(TQWidget * parent)
 {
 	delayedUpdateTimer_ = new TQTimer(this);
 
-	connect(this, TQT_SIGNAL(sliderPressed()),		TQT_SLOT(slotSliderPressed()));
-	connect(this, TQT_SIGNAL(sliderReleased()),		TQT_SLOT(slotSliderReleased()));
-	connect(this, TQT_SIGNAL(valueChanged(int)),	TQT_SLOT(slotValueChanged(int)));
+	connect(this, TQ_SIGNAL(sliderPressed()),		TQ_SLOT(slotSliderPressed()));
+	connect(this, TQ_SIGNAL(sliderReleased()),		TQ_SLOT(slotSliderReleased()));
+	connect(this, TQ_SIGNAL(valueChanged(int)),	TQ_SLOT(slotValueChanged(int)));
 
-	connect(napp->player(),				TQT_SIGNAL(timeout()),	TQT_SLOT(slotTimeout()));
-	connect(delayedUpdateTimer_,	TQT_SIGNAL(timeout()), 	TQT_SLOT(slotDelayedUpdate()));
+	connect(napp->player(),				TQ_SIGNAL(timeout()),	TQ_SLOT(slotTimeout()));
+	connect(delayedUpdateTimer_,	TQ_SIGNAL(timeout()), 	TQ_SLOT(slotDelayedUpdate()));
 }
 
 Seeker::~Seeker()
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index a896cfa..c62c344 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -69,8 +69,8 @@ Charlatan::Charlatan()
 	connect
 		(
 			showingVolumeTimer_,
-			TQT_SIGNAL(timeout()),
-			TQT_SLOT(slotStopShowingVolume())
+			TQ_SIGNAL(timeout()),
+			TQ_SLOT(slotStopShowingVolume())
 		);
 
 	playListToggleButton_	= new TQToolButton(this);
@@ -130,68 +130,68 @@ Charlatan::Charlatan()
 	connect
 		(
 		 playListToggleButton_,
-		 TQT_SIGNAL(clicked()),
+		 TQ_SIGNAL(clicked()),
 		 napp->player(),
-		 TQT_SLOT(toggleListView())
+		 TQ_SLOT(toggleListView())
 		);
 
 	connect
 		(
 		 previousButton_,
-		 TQT_SIGNAL(clicked()),
+		 TQ_SIGNAL(clicked()),
 		 napp->player(),
-		 TQT_SLOT(back())
+		 TQ_SLOT(back())
 		);
 
 	connect
 		(
 		 nextButton_,
-		 TQT_SIGNAL(clicked()),
+		 TQ_SIGNAL(clicked()),
 		 napp->player(),
-		 TQT_SLOT(forward())
+		 TQ_SLOT(forward())
 		);
 
 	connect
 		(
 		 stopButton_,
-		 TQT_SIGNAL(clicked()),
+		 TQ_SIGNAL(clicked()),
 		 napp->player(),
-		 TQT_SLOT(stop())
+		 TQ_SLOT(stop())
 		);
 
-	connect(restartButton_, TQT_SIGNAL(clicked()), TQT_SLOT(slotRestart()));
+	connect(restartButton_, TQ_SIGNAL(clicked()), TQ_SLOT(slotRestart()));
 
 	connect
 		(
 		 playButton_,
-		 TQT_SIGNAL(clicked()),
+		 TQ_SIGNAL(clicked()),
 		 napp->player(),
-		 TQT_SLOT(playpause())
+		 TQ_SLOT(playpause())
 		);
 
-	connect(napp,						TQT_SIGNAL(hideYourself()), 	TQT_SLOT(hide()));
-	connect(napp,						TQT_SIGNAL(showYourself()), 	TQT_SLOT(show()));
+	connect(napp,						TQ_SIGNAL(hideYourself()), 	TQ_SLOT(hide()));
+	connect(napp,						TQ_SIGNAL(showYourself()), 	TQ_SLOT(show()));
 
-	connect(napp->player(), TQT_SIGNAL(playlistShown()),	TQT_SLOT(slotPlayListShown()));
-	connect(napp->player(), TQT_SIGNAL(playlistHidden()),	TQT_SLOT(slotPlayListHidden()));
-	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(), TQ_SIGNAL(playlistShown()),	TQ_SLOT(slotPlayListShown()));
+	connect(napp->player(), TQ_SIGNAL(playlistHidden()),	TQ_SLOT(slotPlayListHidden()));
+	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(), TQT_SIGNAL(timeout()),				TQT_SLOT(slotTimeout()));
+	connect(napp->player(), TQ_SIGNAL(timeout()),				TQ_SLOT(slotTimeout()));
 
 	connect
 		(
 		 napp->player(),
-		 TQT_SIGNAL(volumeChanged(int)),
-		 TQT_SLOT(slotVolumeChanged(int))
+		 TQ_SIGNAL(volumeChanged(int)),
+		 TQ_SLOT(slotVolumeChanged(int))
 		);
 
 	connect
 		(
 		 new CharlatanConfigModule(this),
-		 TQT_SIGNAL(saved()),
-		 TQT_SLOT(slotConfigChanged())
+		 TQ_SIGNAL(saved()),
+		 TQ_SLOT(slotConfigChanged())
 		);
 
 	setCaption(i18n("Noatun"));
@@ -213,12 +213,12 @@ Charlatan::Charlatan()
 	int accelRstt = a->insertItem(Key_Return);
 	int accelQuit = a->insertItem(Key_Q);
 
-	a->connectItem(accelPlay, napp->player(), TQT_SLOT(playpause()));
-	a->connectItem(accelNext, napp->player(), TQT_SLOT(forward()));
-	a->connectItem(accelPrev, napp->player(), TQT_SLOT(back()));
-	a->connectItem(accelStop, napp->player(), TQT_SLOT(stop()));
-	a->connectItem(accelRstt, this, TQT_SLOT(slotRestart()));
-	a->connectItem(accelQuit, napp, TQT_SLOT(quit()));
+	a->connectItem(accelPlay, napp->player(), TQ_SLOT(playpause()));
+	a->connectItem(accelNext, napp->player(), TQ_SLOT(forward()));
+	a->connectItem(accelPrev, napp->player(), TQ_SLOT(back()));
+	a->connectItem(accelStop, napp->player(), TQ_SLOT(stop()));
+	a->connectItem(accelRstt, this, TQ_SLOT(slotRestart()));
+	a->connectItem(accelQuit, napp, TQ_SLOT(quit()));
 
 	show();