Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 25 insertions, 25 deletions

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;