Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 286a061a4cd8a904a0b16b5be4c274a20935d5df)

18 files changed, 135 insertions, 135 deletions

diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index d135658e..e93509d9 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -101,7 +101,7 @@ NoatunApp::NoatunApp()
 	mEffectView=new EffectView; // 859
 	mEqualizerView=new EqualizerView; // 24
 
-	TQTimer::singleShot(0, mDownloader, TQT_SLOT(start()));
+	TQTimer::singleShot(0, mDownloader, TQ_SLOT(start()));
 
 	::globalVideo = new GlobalVideo;
 
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 92058c85..7c5e1a99 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -64,8 +64,8 @@ General::General(TQObject *parent)
 	TQLabel *dlsaver=new TQLabel(i18n("&Download folder:"), this);
 	mDlSaver=new KURLRequester(napp->saveDirectory(), this);
 	dlsaver->setBuddy(mDlSaver);
-	connect( mDlSaver, TQT_SIGNAL( openFileDialog( KURLRequester * )),
-		 this, TQT_SLOT( slotRequesterClicked( KURLRequester * )));
+	connect( mDlSaver, TQ_SIGNAL( openFileDialog( KURLRequester * )),
+		 this, TQ_SLOT( slotRequesterClicked( KURLRequester * )));
 	TQWhatsThis::add(mDlSaver, i18n("When opening a non-local file, download it to the selected folder."));
 
 	mPlayOnStartup = new TQButtonGroup(1,TQt::Horizontal, i18n("Play Behavior on Startup"), this);
diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp
index fef7768f..7042cfbd 100644
--- a/noatun/library/controls.cpp
+++ b/noatun/library/controls.cpp
@@ -73,11 +73,11 @@ int SliderAction::plug( TQWidget *w, int index )
 
 
 	addContainer( toolBar, id );
-	connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+	connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 	toolBar->setItemAutoSized( id, true );
 
 	if (w->inherits( "TDEToolBar" ))
-		connect(toolBar, TQT_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(TDEToolBar::BarPosition)));
+		connect(toolBar, TQ_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQ_SLOT(toolbarMoved(TDEToolBar::BarPosition)));
 	
 	emit plugged();
 
diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp
index b8081626..2c65f536 100644
--- a/noatun/library/downloader.cpp
+++ b/noatun/library/downloader.cpp
@@ -94,7 +94,7 @@ void Downloader::start()
 	
 	delete mUnstartedQueue;
 	mUnstartedQueue=0;
-	TQTimer::singleShot(0, this, TQT_SLOT(getNext()));
+	TQTimer::singleShot(0, this, TQ_SLOT(getNext()));
 }
 
 static TQString nonExistantFile(const TQString &file)
@@ -143,7 +143,7 @@ TQString Downloader::enqueue(DownloadItem *notifier, const KURL &file)
 	}
 
 	mQueue.append(i);
-	TQTimer::singleShot(0, this, TQT_SLOT(getNext()));
+	TQTimer::singleShot(0, this, TQ_SLOT(getNext()));
 	emit enqueued(notifier, file);
 	return i->local;
 }
@@ -181,15 +181,15 @@ void Downloader::getNext()
 	localfile->open(IO_ReadWrite | IO_Append);
 
 	mJob= TDEIO::get(current->file, true, false);
-	connect(mJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), TQT_SLOT(data(TDEIO::Job*, const TQByteArray&)));
-	connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(jobDone(TDEIO::Job*)));
-	connect(mJob, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), TQT_SLOT(percent(TDEIO::Job*, unsigned long)));
+	connect(mJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), TQ_SLOT(data(TDEIO::Job*, const TQByteArray&)));
+	connect(mJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(jobDone(TDEIO::Job*)));
+	connect(mJob, TQ_SIGNAL(percent(TDEIO::Job*, unsigned long)), TQ_SLOT(percent(TDEIO::Job*, unsigned long)));
 
 	if (mTimeout)
 		delete mTimeout;
 	mTimeout=new TQTimer(this);
 	mTimeout->start(30000, true);
-	connect(mTimeout, TQT_SIGNAL(timeout()), TQT_SLOT(giveUpWithThisDownloadServerIsRunningNT()));
+	connect(mTimeout, TQ_SIGNAL(timeout()), TQ_SLOT(giveUpWithThisDownloadServerIsRunningNT()));
 }
 
 void Downloader::data(TDEIO::Job *, const TQByteArray &data)
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index 3fc17983..193d8adb 100644
--- a/noatun/library/effectview.cpp
+++ b/noatun/library/effectview.cpp
@@ -90,7 +90,7 @@ TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQO
 	TQToolButton *button = new TQToolButton(parent, name);
 	button->setIconSet(iconSet);
 	button->setTextLabel(textLabel, true);
-	TQObject::connect(button, TQT_SIGNAL(clicked()), receiver, slot);
+	TQObject::connect(button, TQ_SIGNAL(clicked()), receiver, slot);
 	button->setFixedSize(TQSize(22, 22));
 	return button;
 }
@@ -116,7 +116,7 @@ void EffectView::init(void)
 	TQHBoxLayout *topTopLayout = new TQHBoxLayout(topTopFrame, 0, KDialog::spacingHint());
 	topTopLayout->setAutoAdd(true);
 	available = new KComboBox(false, topTopFrame);
-	TQToolButton *add = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Add"), this, TQT_SLOT(addEffect()), topTopFrame);
+	TQToolButton *add = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Add"), this, TQ_SLOT(addEffect()), topTopFrame);
 
 	// Active
 	TQHGroupBox *bottomBox = new TQHGroupBox(i18n("Active Effects"), box);
@@ -138,25 +138,25 @@ void EffectView::init(void)
 	active->setItemsMovable(true);
 	active->setSelectionMode(TQListView::Single);
 	active->setDragEnabled(true);
-	connect(active, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), TQT_SLOT(activeDrop(TQDropEvent *, TQListViewItem *)));
+	connect(active, TQ_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), TQ_SLOT(activeDrop(TQDropEvent *, TQListViewItem *)));
 
 	// when a new effect is added
-	connect(napp->effects(), TQT_SIGNAL(added(Effect *)), TQT_SLOT(added(Effect *)));
-	connect(napp->effects(), TQT_SIGNAL(removed(Effect *)), TQT_SLOT(removed(Effect *)));
-	connect(napp->effects(), TQT_SIGNAL(moved(Effect *)), TQT_SLOT(moved(Effect *)));
+	connect(napp->effects(), TQ_SIGNAL(added(Effect *)), TQ_SLOT(added(Effect *)));
+	connect(napp->effects(), TQ_SIGNAL(removed(Effect *)), TQ_SLOT(removed(Effect *)));
+	connect(napp->effects(), TQ_SIGNAL(moved(Effect *)), TQ_SLOT(moved(Effect *)));
 
 	available->setCurrentItem(0);
 
-	connect(active, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_SLOT(activeChanged(TQListViewItem *)));
+	connect(active, TQ_SIGNAL(currentChanged(TQListViewItem *)), TQ_SLOT(activeChanged(TQListViewItem *)));
 	active->setCurrentItem(0);
 
 	// the buttons
 	TQFrame *bottomLeftFrame = new TQFrame(bottomBox);
 	TQVBoxLayout *bottomLeftLayout = new TQVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint());
-	up = newButton(BarIconSet("go-up", TDEIcon::SizeSmall), i18n("Up"), this, TQT_SLOT(moveUp()), bottomLeftFrame);
-	down = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Down"), this, TQT_SLOT(moveDown()), bottomLeftFrame);
-	configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), this, TQT_SLOT(configureEffect()), bottomLeftFrame);
-	remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), this, TQT_SLOT(removeEffect()), bottomLeftFrame);
+	up = newButton(BarIconSet("go-up", TDEIcon::SizeSmall), i18n("Up"), this, TQ_SLOT(moveUp()), bottomLeftFrame);
+	down = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Down"), this, TQ_SLOT(moveDown()), bottomLeftFrame);
+	configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), this, TQ_SLOT(configureEffect()), bottomLeftFrame);
+	remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), this, TQ_SLOT(removeEffect()), bottomLeftFrame);
 	bottomLeftLayout->addWidget(up);
 	bottomLeftLayout->addWidget(down);
 	bottomLeftLayout->addWidget(configure);
diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp
index dbb4d978..8e0000fa 100644
--- a/noatun/library/engine.cpp
+++ b/noatun/library/engine.cpp
@@ -293,19 +293,19 @@ bool Engine::open(const PlaylistItem &file)
 		d->pProxy = new TitleProxy::Proxy(KURL(file.property("stream_")));
 		d->playobj = factory.createPlayObject(d->pProxy->proxyUrl(), false);
 
-		connect(d->playobj, TQT_SIGNAL(destroyed()), this, TQT_SLOT(deleteProxy()));
+		connect(d->playobj, TQ_SIGNAL(destroyed()), this, TQ_SLOT(deleteProxy()));
 		connect(
-			d->pProxy, TQT_SIGNAL(
+			d->pProxy, TQ_SIGNAL(
 				metaData(
 				const TQString &, const TQString &,
 				const TQString &, const TQString &,
 				const TQString &, const TQString &)),
-			this, TQT_SIGNAL(
+			this, TQ_SIGNAL(
 				receivedStreamMeta(const TQString &, const TQString &,
 				const TQString &, const TQString &,
 				const TQString &, const TQString &))
 		);
-		connect(d->pProxy, TQT_SIGNAL(proxyError()), this, TQT_SLOT(slotProxyError()));
+		connect(d->pProxy, TQ_SIGNAL(proxyError()), this, TQ_SLOT(slotProxyError()));
 	}
 	else
 	{
@@ -328,7 +328,7 @@ bool Engine::open(const PlaylistItem &file)
 	}
 	else
 	{
-		connect( d->playobj, TQT_SIGNAL( playObjectCreated() ), this, TQT_SLOT( connectPlayObject() ) );
+		connect( d->playobj, TQ_SIGNAL( playObjectCreated() ), this, TQ_SLOT( connectPlayObject() ) );
 	}
 
 	if (mPlay)
diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp
index 87255cb7..aad2de65 100644
--- a/noatun/library/equalizer.cpp
+++ b/noatun/library/equalizer.cpp
@@ -164,19 +164,19 @@ void Equalizer::init()
 	mBands.append(new Band(4));
 	mBands.append(new Band(5));
 	
-	connect(VEQ, TQT_SIGNAL(changed()), TQT_SIGNAL(changed()));
+	connect(VEQ, TQ_SIGNAL(changed()), TQ_SIGNAL(changed()));
 	
-	connect(VEQ, TQT_SIGNAL(created(VPreset)), TQT_SLOT(created(VPreset)));
-	connect(VEQ, TQT_SIGNAL(selected(VPreset)), TQT_SLOT(selected(VPreset)));
-	connect(VEQ, TQT_SIGNAL(renamed(VPreset)), TQT_SLOT(renamed(VPreset)));
-	connect(VEQ, TQT_SIGNAL(removed(VPreset)), TQT_SLOT(removed(VPreset)));
+	connect(VEQ, TQ_SIGNAL(created(VPreset)), TQ_SLOT(created(VPreset)));
+	connect(VEQ, TQ_SIGNAL(selected(VPreset)), TQ_SLOT(selected(VPreset)));
+	connect(VEQ, TQ_SIGNAL(renamed(VPreset)), TQ_SLOT(renamed(VPreset)));
+	connect(VEQ, TQ_SIGNAL(removed(VPreset)), TQ_SLOT(removed(VPreset)));
 	
-	connect(VEQ, TQT_SIGNAL(enabled()), TQT_SIGNAL(enabled()));
-	connect(VEQ, TQT_SIGNAL(disabled()), TQT_SIGNAL(disabled()));
-	connect(VEQ, TQT_SIGNAL(enabled(bool)), TQT_SIGNAL(enabled(bool)));
+	connect(VEQ, TQ_SIGNAL(enabled()), TQ_SIGNAL(enabled()));
+	connect(VEQ, TQ_SIGNAL(disabled()), TQ_SIGNAL(disabled()));
+	connect(VEQ, TQ_SIGNAL(enabled(bool)), TQ_SIGNAL(enabled(bool)));
 	
-	connect(VEQ, TQT_SIGNAL(preampChanged(int)), TQT_SIGNAL(preampChanged(int)));
-	connect(VEQ, TQT_SIGNAL(preampChanged(int)), TQT_SIGNAL(preampChanged(int)));
+	connect(VEQ, TQ_SIGNAL(preampChanged(int)), TQ_SIGNAL(preampChanged(int)));
+	connect(VEQ, TQ_SIGNAL(preampChanged(int)), TQ_SIGNAL(preampChanged(int)));
 }
 
 void Equalizer::created(VPreset preset)
diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index dd809257..89ec960b 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -71,7 +71,7 @@ EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band)
 	mSlider->setTickmarks(TQSlider::Left);
 	mSlider->setTickInterval(25);
 	layout->addWidget(mSlider);
-	connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int)));
+	connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed(int)));
 	mLabel = new TQLabel("", this, "EqualizerLevel::mLabel");
 	mLabel->setAlignment(AlignHCenter | AlignVCenter);
 	layout->addWidget(mLabel);
@@ -82,8 +82,8 @@ EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band)
 
 	setBand(band);
 
-	connect(EQ, TQT_SIGNAL(modified()), TQT_SLOT(changed()));
-	connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int)));
+	connect(EQ, TQ_SIGNAL(modified()), TQ_SLOT(changed()));
+	connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed(int)));
 }
 
 void EqualizerLevel::setBand(VBand band)
@@ -126,30 +126,30 @@ void EqualizerView::show()
 		bandsLayout = new TQHBoxLayout(mWidget->bandsFrame,
 			0, KDialog::spacingHint(), "bandsLayout");
 
-		connect(mWidget->preampSlider, TQT_SIGNAL(valueChanged(int)),
-			this, TQT_SLOT(setPreamp(int)));
-		connect(EQ, TQT_SIGNAL(preampChanged(int)),
-			this, TQT_SLOT(changedPreamp(int)));
+		connect(mWidget->preampSlider, TQ_SIGNAL(valueChanged(int)),
+			this, TQ_SLOT(setPreamp(int)));
+		connect(EQ, TQ_SIGNAL(preampChanged(int)),
+			this, TQ_SLOT(changedPreamp(int)));
 
 		mWidget->bandCount->setRange(EQ->minBands(), EQ->maxBands());
-		connect(mWidget->bandCount, TQT_SIGNAL(valueChanged(int)),
-			EQ, TQT_SLOT(setBands(int)));
+		connect(mWidget->bandCount, TQ_SIGNAL(valueChanged(int)),
+			EQ, TQ_SLOT(setBands(int)));
 
 		TQVBoxLayout *l = new TQVBoxLayout(mWidget->presetFrame);
 		mPresets = new PresetList(mWidget->presetFrame, "mPresets");
 		l->addWidget(mPresets);
 
-		connect(mWidget->removePresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(remove()));
-		connect(mWidget->addPresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(create()));
-		connect(mWidget->resetEqButton, TQT_SIGNAL(clicked()), TQT_SLOT(reset()));
+		connect(mWidget->removePresetButton, TQ_SIGNAL(clicked()), TQ_SLOT(remove()));
+		connect(mWidget->addPresetButton, TQ_SIGNAL(clicked()), TQ_SLOT(create()));
+		connect(mWidget->resetEqButton, TQ_SIGNAL(clicked()), TQ_SLOT(reset()));
 
 		new TDEListViewItem(mPresets, i18n("Custom"));
 
-		connect(mPresets, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-			this, TQT_SLOT(select(TQListViewItem*)));
+		connect(mPresets, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+			this, TQ_SLOT(select(TQListViewItem*)));
 
-		connect(mPresets, TQT_SIGNAL(itemRenamed(TQListViewItem*)),
-			this, TQT_SLOT(rename(TQListViewItem*)));
+		connect(mPresets, TQ_SIGNAL(itemRenamed(TQListViewItem*)),
+			this, TQ_SLOT(rename(TQListViewItem*)));
 
 		// populate the preset list
 		TQValueList<VPreset> presets = EQ->presets();
@@ -159,20 +159,20 @@ void EqualizerView::show()
 			created(*it);
 		}
 
-		connect(EQ, TQT_SIGNAL(created(VPreset)), TQT_SLOT(created(VPreset)));
-		connect(EQ, TQT_SIGNAL(renamed(VPreset)), TQT_SLOT(renamed(VPreset)));
-		connect(EQ, TQT_SIGNAL(removed(VPreset)), TQT_SLOT(removed(VPreset)));
+		connect(EQ, TQ_SIGNAL(created(VPreset)), TQ_SLOT(created(VPreset)));
+		connect(EQ, TQ_SIGNAL(renamed(VPreset)), TQ_SLOT(renamed(VPreset)));
+		connect(EQ, TQ_SIGNAL(removed(VPreset)), TQ_SLOT(removed(VPreset)));
 
 		mWidget->enabledCheckBox->setChecked(EQ->isEnabled());
-		connect(mWidget->enabledCheckBox, TQT_SIGNAL(toggled(bool)),
-			EQ, TQT_SLOT(setEnabled(bool)));
-		connect(EQ, TQT_SIGNAL(enabled(bool)),
-			mWidget->enabledCheckBox, TQT_SLOT(setChecked(bool)));
-
-		connect(EQ, TQT_SIGNAL(changed()),
-			this, TQT_SLOT(changedEq()));
-		connect(EQ, TQT_SIGNAL(changedBands()),
-			this, TQT_SLOT(changedBands()));
+		connect(mWidget->enabledCheckBox, TQ_SIGNAL(toggled(bool)),
+			EQ, TQ_SLOT(setEnabled(bool)));
+		connect(EQ, TQ_SIGNAL(enabled(bool)),
+			mWidget->enabledCheckBox, TQ_SLOT(setChecked(bool)));
+
+		connect(EQ, TQ_SIGNAL(changed()),
+			this, TQ_SLOT(changedEq()));
+		connect(EQ, TQ_SIGNAL(changedBands()),
+			this, TQ_SLOT(changedBands()));
 
 		changedBands();
 		changedEq();
diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index 745886da..5fa6b0fc 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -22,11 +22,11 @@ namespace NoatunStdAction
 {
 /////////////////////////////////////////////////////
 PlayAction::PlayAction(TQObject *parent, const char *name)
-	: TDEAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name)
+	: TDEAction(i18n("Play"), 0, napp->player(), TQ_SLOT(playpause()), parent, name)
 {
-	connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing()));
-	connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying()));
-	connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(notplaying()));
+	connect(napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(playing()));
+	connect(napp->player(), TQ_SIGNAL(paused()), TQ_SLOT(notplaying()));
+	connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(notplaying()));
 	if (napp->player()->isPlaying())
 		playing();
 	else if (napp->player()->isPaused() || napp->player()->isStopped())
@@ -47,11 +47,11 @@ void PlayAction::notplaying()
 /////////////////////////////////////////////////////
 
 PlaylistAction::PlaylistAction(TQObject *parent, const char *name)
-	: TDEToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name)
+	: TDEToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQ_SLOT(toggleListView()), parent, name)
 {
         setCheckedState(i18n("Hide Playlist"));
-	connect(napp->player(), TQT_SIGNAL(playlistShown()),  TQT_SLOT(shown()));
-	connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(hidden()));
+	connect(napp->player(), TQ_SIGNAL(playlistShown()),  TQ_SLOT(shown()));
+	connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(hidden()));
 	setChecked(napp->playlist()->listVisible());
 }
 
@@ -114,8 +114,8 @@ void PluginActionMenu::menuRemove(int id)
 VisActionMenu::VisActionMenu(TQObject *parent, const char *name)
 	: TDEActionMenu(i18n("&Visualizations"), parent, name)
 {
-	connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillPopup()));
-	connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleVisPlugin(int)));
+	connect(popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(fillPopup()));
+	connect(popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggleVisPlugin(int)));
 }
 
 void VisActionMenu::fillPopup()
@@ -163,26 +163,26 @@ LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name)
 	: TDEActionMenu(i18n("&Loop"), parent, name)
 {
 	mLoopNone = new TDERadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"),
-		0, this, TQT_SLOT(loopNoneSelected()), this, "loop_none");
+		0, this, TQ_SLOT(loopNoneSelected()), this, "loop_none");
 	mLoopNone->setExclusiveGroup("loopType");
 	insert(mLoopNone);
 
 	mLoopSong = new TDERadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"),
-		0, this, TQT_SLOT(loopSongSelected()), this, "loop_song");
+		0, this, TQ_SLOT(loopSongSelected()), this, "loop_song");
 	mLoopSong->setExclusiveGroup("loopType");
 	insert(mLoopSong);
 
 	mLoopPlaylist = new TDERadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"),
-		0, this, TQT_SLOT(loopPlaylistSelected()), this, "loop_playlist");
+		0, this, TQ_SLOT(loopPlaylistSelected()), this, "loop_playlist");
 	mLoopPlaylist->setExclusiveGroup("loopType");
 	insert(mLoopPlaylist);
 
 	mLoopRandom = new TDERadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"),
-		0, this, TQT_SLOT(loopRandomSelected()), this, "loop_random");
+		0, this, TQ_SLOT(loopRandomSelected()), this, "loop_random");
 	mLoopRandom->setExclusiveGroup("loopType");
 	insert(mLoopRandom);
 
-	connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(updateLooping(int)));
+	connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(updateLooping(int)));
 
 	updateLooping(static_cast<int>(napp->player()->loopStyle()));
 }
@@ -239,25 +239,25 @@ TDEAction *playpause(TQObject *parent, const char *name)
 
 TDEAction *effects(TQObject *parent, const char *name)
 {
-	return new TDEAction(i18n("&Effects..."), "effect", 0, napp, TQT_SLOT(effectView()), parent, name);
+	return new TDEAction(i18n("&Effects..."), "effect", 0, napp, TQ_SLOT(effectView()), parent, name);
 }
 
 TDEAction *equalizer(TQObject *parent, const char *name)
 {
-	return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, napp, TQT_SLOT(equalizerView()), parent, name);
+	return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, napp, TQ_SLOT(equalizerView()), parent, name);
 }
 
 TDEAction *back(TQObject *parent, const char *name)
 {
-	return new TDEAction(i18n("&Back"), "media-skip-backward", 0, napp->player(), TQT_SLOT(back()), parent, name);
+	return new TDEAction(i18n("&Back"), "media-skip-backward", 0, napp->player(), TQ_SLOT(back()), parent, name);
 }
 
 TDEAction *stop(TQObject *parent, const char *name)
 {
-	StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "media-playback-stop", 0, napp->player(), TQT_SLOT(stop()), parent, name);
-	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
-	TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable()));
-	TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable()));
+	StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "media-playback-stop", 0, napp->player(), TQ_SLOT(stop()), parent, name);
+	TQObject::connect(napp->player(), TQ_SIGNAL(playing()), action, TQ_SLOT(enable()));
+	TQObject::connect(napp->player(), TQ_SIGNAL(paused()), action, TQ_SLOT(enable()));
+	TQObject::connect(napp->player(), TQ_SIGNAL(stopped()), action, TQ_SLOT(disable()));
 	if(napp->player()->isStopped())
 		action->disable();
 	else
@@ -267,15 +267,15 @@ TDEAction *stop(TQObject *parent, const char *name)
 
 TDEAction *forward(TQObject *parent, const char *name)
 {
-	return new TDEAction(i18n("&Forward"), "media-skip-forward", 0, napp->player(), TQT_SLOT(forward()), parent, name);
+	return new TDEAction(i18n("&Forward"), "media-skip-forward", 0, napp->player(), TQ_SLOT(forward()), parent, name);
 }
 
 TDEAction *play(TQObject *parent, const char *name)
 {
-	StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "media-playback-start", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
-	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable()));
-	TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable()));
-	TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(enable()));
+	StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "media-playback-start", 0, napp->player(), TQ_SLOT(playpause()), parent, name);
+	TQObject::connect(napp->player(), TQ_SIGNAL(playing()), action, TQ_SLOT(disable()));
+	TQObject::connect(napp->player(), TQ_SIGNAL(paused()), action, TQ_SLOT(enable()));
+	TQObject::connect(napp->player(), TQ_SIGNAL(stopped()), action, TQ_SLOT(enable()));
 	if(napp->player()->isPlaying())
 		action->disable();
 	else
@@ -285,10 +285,10 @@ TDEAction *play(TQObject *parent, const char *name)
 
 TDEAction *pause(TQObject *parent, const char *name)
 {
-	StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "media-playback-pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
-	TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
-	TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(disable()));
-	TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable()));
+	StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "media-playback-pause", 0, napp->player(), TQ_SLOT(playpause()), parent, name);
+	TQObject::connect(napp->player(), TQ_SIGNAL(playing()), action, TQ_SLOT(enable()));
+	TQObject::connect(napp->player(), TQ_SIGNAL(paused()), action, TQ_SLOT(disable()));
+	TQObject::connect(napp->player(), TQ_SIGNAL(stopped()), action, TQ_SLOT(disable()));
 	if(napp->player()->isPlaying())
 		action->enable();
 	else
@@ -333,11 +333,11 @@ TDEPopupMenu *ContextMenu::createContextMenu(TQWidget *p)
 	KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false);
 	TDEActionCollection* actions = new TDEActionCollection(helpmenu);
 
-	KStdAction::open(napp, TQT_SLOT(fileOpen()), actions)->plug(contextMenu);
-	KStdAction::quit(napp, TQT_SLOT(quit()), actions)->plug(contextMenu);
+	KStdAction::open(napp, TQ_SLOT(fileOpen()), actions)->plug(contextMenu);
+	KStdAction::quit(napp, TQ_SLOT(quit()), actions)->plug(contextMenu);
 	contextMenu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), helpmenu->menu());
 	contextMenu->insertSeparator();
-	KStdAction::preferences(napp, TQT_SLOT(preferences()), actions)->plug(contextMenu);
+	KStdAction::preferences(napp, TQ_SLOT(preferences()), actions)->plug(contextMenu);
 	NoatunStdAction::playlist(contextMenu)->plug(contextMenu);
 	NoatunStdAction::effects(contextMenu)->plug(contextMenu);
 	NoatunStdAction::equalizer(napp)->plug(contextMenu);
diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp
index 7ac9e07f..62cd97bb 100644
--- a/noatun/library/noatuntags/tags.cpp
+++ b/noatun/library/noatuntags/tags.cpp
@@ -16,7 +16,7 @@ TagsGetter *Tags::getter=0;
 TagsGetter::TagsGetter()
 {
 	new Control(this);
-	connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong()));
+	connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSong()));
 }
 
 int TagsGetter::interval() const
@@ -115,7 +115,7 @@ void TagsGetter::associate(Tags *t)
 	tags.append(t);
 	sortPriority();
 //	getSongs();
-	TQTimer::singleShot(interval(), this, TQT_SLOT(getSongs()));
+	TQTimer::singleShot(interval(), this, TQ_SLOT(getSongs()));
 }
 
 void TagsGetter::sortPriority()
@@ -210,14 +210,14 @@ Control::Control(TagsGetter *parent)
 		spin->setSuffix(i18n("Milliseconds", " ms"));
 		
 		
-		connect(slider, TQT_SIGNAL(valueChanged(int)), spin, TQT_SLOT(setValue(int)));
-		connect(spin, TQT_SIGNAL(valueChanged(int)), slider, TQT_SLOT(setValue(int)));
+		connect(slider, TQ_SIGNAL(valueChanged(int)), spin, TQ_SLOT(setValue(int)));
+		connect(spin, TQ_SIGNAL(valueChanged(int)), slider, TQ_SLOT(setValue(int)));
 		slider->setValue(parent->interval());
-		connect(slider, TQT_SIGNAL(valueChanged(int)), parent, TQT_SLOT(setInterval(int)));
+		connect(slider, TQ_SIGNAL(valueChanged(int)), parent, TQ_SLOT(setInterval(int)));
 	
-		connect(onPlay, TQT_SIGNAL(toggled(bool)), intervalLine, TQT_SLOT(setEnabled(bool)));
+		connect(onPlay, TQ_SIGNAL(toggled(bool)), intervalLine, TQ_SLOT(setEnabled(bool)));
 	}
-	connect(onPlay, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(setLoadAuto(bool)));
+	connect(onPlay, TQ_SIGNAL(toggled(bool)), parent, TQ_SLOT(setLoadAuto(bool)));
 
 	onPlay->setChecked(parent->loadAuto());
 }
diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp
index 5ab2aeba..bf1ecaed 100644
--- a/noatun/library/player.cpp
+++ b/noatun/library/player.cpp
@@ -18,18 +18,18 @@ Player::Player(TQObject *parent) : TQObject(parent, "Player"),
 	position(-1), mLoopStyle(None), firstTimeout(true)
 {
 	mEngine=new Engine;
-	connect(&filePos, TQT_SIGNAL(timeout()), TQT_SLOT(posTimeout()));
-	connect(mEngine, TQT_SIGNAL(aboutToPlay()), this, TQT_SLOT(aboutToPlay()));
+	connect(&filePos, TQ_SIGNAL(timeout()), TQ_SLOT(posTimeout()));
+	connect(mEngine, TQ_SIGNAL(aboutToPlay()), this, TQ_SLOT(aboutToPlay()));
 	connect(mEngine,
-		TQT_SIGNAL(receivedStreamMeta(const TQString &, const TQString &,
+		TQ_SIGNAL(receivedStreamMeta(const TQString &, const TQString &,
 			const TQString &, const TQString &,
 			const TQString &, const TQString &)),
-		this, TQT_SLOT(
+		this, TQ_SLOT(
 			slotUpdateStreamMeta(const TQString &, const TQString &,
 				const TQString &, const TQString &,
 				const TQString &, const TQString &))
 	);
-	connect(mEngine, TQT_SIGNAL(playingFailed()), this, TQT_SLOT(forward()));
+	connect(mEngine, TQ_SIGNAL(playingFailed()), this, TQ_SLOT(forward()));
 
 	handleButtons();
 }
diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp
index 7e59885f..380934bd 100644
--- a/noatun/library/playlist.cpp
+++ b/noatun/library/playlist.cpp
@@ -280,9 +280,9 @@ bool PlaylistItemData::operator != (const PlaylistItemData &d) const
 
 Playlist::Playlist(TQObject *parent, const char *name) : TQObject(parent, name)
 {
-	napp->player()->connect(this, TQT_SIGNAL(playCurrent()), TQT_SLOT(playCurrent()));
-	napp->player()->connect(this, TQT_SIGNAL(listHidden()), TQT_SIGNAL(playlistHidden()));
-	napp->player()->connect(this, TQT_SIGNAL(listShown()), TQT_SIGNAL(playlistShown()));
+	napp->player()->connect(this, TQ_SIGNAL(playCurrent()), TQ_SLOT(playCurrent()));
+	napp->player()->connect(this, TQ_SIGNAL(listHidden()), TQ_SIGNAL(playlistHidden()));
+	napp->player()->connect(this, TQ_SIGNAL(listShown()), TQ_SIGNAL(playlistShown()));
 
 }
 
diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp
index 3c5b6f5d..ac0f0329 100644
--- a/noatun/library/plugin.cpp
+++ b/noatun/library/plugin.cpp
@@ -566,7 +566,7 @@ ExitNotifier::~ExitNotifier()
 BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent)
 	: TQObject(parent)
 {
-	connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event()));
+	connect(listener, TQ_SIGNAL(event()), TQ_SLOT(event()));
 	mValue=value;
 }
 
diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp
index d6b86e86..a7a59b48 100644
--- a/noatun/library/pluginmodule.cpp
+++ b/noatun/library/pluginmodule.cpp
@@ -152,7 +152,7 @@ Plugins::Plugins(TQObject *_parent)
 	interfaceList->addColumn(i18n("Description"));
 	interfaceList->addColumn(i18n("Author"));
 	interfaceList->addColumn(i18n("License"));
-	connect(interfaceList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool)));
+	connect(interfaceList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool)));
 	tabControl->addTab(interfaceTab, i18n("&Interfaces"));
 
 	TQFrame *playlistTab = new TQFrame(tabControl);
@@ -164,7 +164,7 @@ Plugins::Plugins(TQObject *_parent)
 	playlistList->addColumn(i18n("Description"));
 	playlistList->addColumn(i18n("Author"));
 	playlistList->addColumn(i18n("License"));
-	connect(playlistList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool)));
+	connect(playlistList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool)));
 	tabControl->addTab(playlistTab, i18n("&Playlist"));
 
 	TQFrame *visTab = new TQFrame(tabControl);
@@ -175,7 +175,7 @@ Plugins::Plugins(TQObject *_parent)
 	visList->addColumn(i18n("Description"));
 	visList->addColumn(i18n("Author"));
 	visList->addColumn(i18n("License"));
-	connect(visList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool)));
+	connect(visList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool)));
 	tabControl->addTab(visTab, i18n("&Visualizations"));
 
 	// Other plugins are not restricted
@@ -187,7 +187,7 @@ Plugins::Plugins(TQObject *_parent)
 	otherList->addColumn(i18n("Description"));
 	otherList->addColumn(i18n("Author"));
 	otherList->addColumn(i18n("License"));
-	connect(otherList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool)));
+	connect(otherList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool)));
 	tabControl->addTab(otherTab, i18n("O&ther Plugins"));
 }
 
diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp
index a0d1bbcc..55926830 100644
--- a/noatun/library/pref.cpp
+++ b/noatun/library/pref.cpp
@@ -59,7 +59,7 @@ CModule::CModule(const TQString &name, const TQString &description, const TQStri
 		icon, TDEIcon::Small,0, TDEIcon::DefaultState,0, true)))
 {
 	if (owner)
-		connect(owner, TQT_SIGNAL(destroyed()), TQT_SLOT(ownerDeleted()));
+		connect(owner, TQ_SIGNAL(destroyed()), TQ_SLOT(ownerDeleted()));
 
 	//kdDebug(66666) << k_funcinfo << "name = " << name << endl;
 
diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp
index d21a2aad..235d10b3 100644
--- a/noatun/library/scrollinglabel.cpp
+++ b/noatun/library/scrollinglabel.cpp
@@ -62,8 +62,8 @@ ScrollingLabel::ScrollingLabel
 {
 	d = new Private;
 
-	connect(&d->scrollTimer,	TQT_SIGNAL(timeout()), this, TQT_SLOT(scroll()));
-	connect(&d->resetTimer,		TQT_SIGNAL(timeout()), this, TQT_SLOT(restoreText()));
+	connect(&d->scrollTimer,	TQ_SIGNAL(timeout()), this, TQ_SLOT(scroll()));
+	connect(&d->resetTimer,		TQ_SIGNAL(timeout()), this, TQ_SLOT(restoreText()));
 
 	setText(initialText);
 }
diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp
index 65006135..a4439207 100644
--- a/noatun/library/titleproxy.cpp
+++ b/noatun/library/titleproxy.cpp
@@ -50,9 +50,9 @@ Proxy::Proxy( KURL url )
 	if ( m_url.port() < 1 )
 		m_url.setPort( 80 );
 
-	connect( &m_sockRemote, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( connectError() ) );
-	connect( &m_sockRemote, TQT_SIGNAL( connected() ), this, TQT_SLOT( sendRequest() ) );
-	connect( &m_sockRemote, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( readRemote() ) );
+	connect( &m_sockRemote, TQ_SIGNAL( error( int ) ), this, TQ_SLOT( connectError() ) );
+	connect( &m_sockRemote, TQ_SIGNAL( connected() ), this, TQ_SLOT( sendRequest() ) );
+	connect( &m_sockRemote, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( readRemote() ) );
 
 	uint i = 0;
 	Server* server = 0;
@@ -74,7 +74,7 @@ Proxy::Proxy( KURL url )
 		return;
 	}
 	m_usedPort = i;
-	connect( server, TQT_SIGNAL( connected( int ) ), this, TQT_SLOT( accept( int ) ) );
+	connect( server, TQ_SIGNAL( connected( int ) ), this, TQ_SLOT( accept( int ) ) );
 }
 
 
@@ -130,7 +130,7 @@ void Proxy::connectToHost() //SLOT
 
 	{ //connect to server
 		TQTimer::singleShot( KProtocolManager::connectTimeout() * 1000,
-			this, TQT_SLOT( connectError() ) );
+			this, TQ_SLOT( connectError() ) );
 
 		kdDebug(66666) << k_funcinfo << "Connecting to " <<
 			m_url.host() << ":" << m_url.port() << endl;
@@ -316,8 +316,8 @@ bool Proxy::processHeader( TQ_LONG &index, TQ_LONG bytesRead )
 				return false;
 			}
 
-			connect( &m_sockRemote, TQT_SIGNAL( connectionClosed() ),
-				this, TQT_SLOT( connectError() ) );
+			connect( &m_sockRemote, TQ_SIGNAL( connectionClosed() ),
+				this, TQ_SLOT( connectError() ) );
 			return true;
 		}
 	}
diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp
index 0fceeb2d..8105127d 100644
--- a/noatun/library/video.cpp
+++ b/noatun/library/video.cpp
@@ -28,8 +28,8 @@ VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char
 	: KVideoWidget(clientParent, parent, name, f)
 {
 	d = new Private;
-	connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed()));
-	connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(stopped()));
+	connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(changed()));
+	connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(stopped()));
 	frames.append(this);
 }
 
@@ -37,8 +37,8 @@ VideoFrame::VideoFrame(TQWidget *parent, const char *name, WFlags f)
 	 : KVideoWidget(parent, name, f)
 {
 	d = new Private;
-	connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed()));
-	connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(stopped()));
+	connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(changed()));
+	connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(stopped()));
 	frames.append(this);
 }
 
@@ -126,9 +126,9 @@ GlobalVideo::GlobalVideo()
 //	video->setMinimumSize(101,35);
 	video->setMinimumSize(128,96);
 
-	connect(video, TQT_SIGNAL(acquired()), TQT_SLOT(appear()));
-	connect(video, TQT_SIGNAL(lost()), TQT_SLOT(hide()));
-	connect(video, TQT_SIGNAL(adaptSize(int,int)), this, TQT_SLOT(slotAdaptSize(int,int)));
+	connect(video, TQ_SIGNAL(acquired()), TQ_SLOT(appear()));
+	connect(video, TQ_SIGNAL(lost()), TQ_SLOT(hide()));
+	connect(video, TQ_SIGNAL(adaptSize(int,int)), this, TQ_SLOT(slotAdaptSize(int,int)));
 
 	video->setNormalSize();
 	video->give();