Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

9 files changed, 70 insertions, 70 deletions

diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp
index f52ae4b..482c59b 100644
--- a/kicker-applets/mediacontrol/amarokInterface.cpp
+++ b/kicker-applets/mediacontrol/amarokInterface.cpp
@@ -32,16 +32,16 @@ AmarokInterface::AmarokInterface() : PlayerInterface()
    mTimerValue = TIMER_FAST;
    mAmarokTimer = new TQTimer ( this, "mAmaroKTimer" );
 
-   connect(mAmarokTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) );
+   connect(mAmarokTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()) );
    kapp->dcopClient()->setNotifications ( true );
 
-   connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)),
-      TQT_SLOT(appRegistered(const TQCString&)) );
+   connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
+      TQ_SLOT(appRegistered(const TQCString&)) );
 
-   connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)),
-      TQT_SLOT(appRemoved(const TQCString&)));
+   connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+      TQ_SLOT(appRemoved(const TQCString&)));
 
-   TQTimer::singleShot(0, this, TQT_SLOT(myInit()));
+   TQTimer::singleShot(0, this, TQ_SLOT(myInit()));
 }
 
 AmarokInterface::~AmarokInterface()
diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp
index ce9de9f..67e4b4a 100644
--- a/kicker-applets/mediacontrol/jukInterface.cpp
+++ b/kicker-applets/mediacontrol/jukInterface.cpp
@@ -32,16 +32,16 @@ JuKInterface::JuKInterface() : PlayerInterface(), mProc(0)
 	mTimerValue = TIMER_FAST;
 	mJuKTimer = new TQTimer ( this, "mJukTimer" );
 
-	connect(mJuKTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) );
+	connect(mJuKTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()) );
 	kapp->dcopClient()->setNotifications ( true );
 
-	connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)),
-		TQT_SLOT(appRegistered(const TQCString&)) );
+	connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
+		TQ_SLOT(appRegistered(const TQCString&)) );
 
-	connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)),
-		TQT_SLOT(appRemoved(const TQCString&)));
+	connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+		TQ_SLOT(appRemoved(const TQCString&)));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(myInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(myInit()));
 }
 
 JuKInterface::~JuKInterface()
@@ -86,7 +86,7 @@ void JuKInterface::appRegistered ( const TQCString &appId )
 		mProc->addArgument("Player");
 		mProc->addArgument("status()");
 
-		connect(mProc, TQT_SIGNAL(processExited()), TQT_SLOT(jukIsReady()));
+		connect(mProc, TQ_SIGNAL(processExited()), TQ_SLOT(jukIsReady()));
 		mProc->start();
 	}
 }
diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 5b846c9..6f88bbf 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -32,16 +32,16 @@ KsCDInterface::KsCDInterface() : PlayerInterface()
 {
 	mKsCDTimer = new TQTimer(this, "mKsCDTimer");
 
-	connect(mKsCDTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) );
+	connect(mKsCDTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()) );
 	kapp->dcopClient()->setNotifications ( true );
 
-	connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)),
-		TQT_SLOT(appRegistered(const TQCString&)) );
+	connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
+		TQ_SLOT(appRegistered(const TQCString&)) );
 
-	connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)),
-		TQT_SLOT(appRemoved(const TQCString&)));
+	connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+		TQ_SLOT(appRemoved(const TQCString&)));
 
-	TQTimer::singleShot(0, this, TQT_SLOT(myInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(myInit()));
 }
 
 KsCDInterface::~KsCDInterface()
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index 31d1076..a55ed06 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -147,15 +147,15 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions,
 
 	// request notification of changes in icon style
 	kapp->addKipcEventMask(KIPC::IconChanged);
-	connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged()));
+	connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged()));
 
 	reparseConfig();
 
 	rmbMenu = new TDEPopupMenu(this, "RMBMenu");
 	rmbMenu->insertTitle(i18n("MediaControl"), 0, 0);
 	rmbMenu->insertItem(SmallIcon("configure"), i18n("Configure MediaControl..."),
-		this, TQT_SLOT(preferences()));
-	rmbMenu->insertItem(i18n("About MediaControl"), this, TQT_SLOT(about()));
+		this, TQ_SLOT(preferences()));
+	rmbMenu->insertItem(i18n("About MediaControl"), this, TQ_SLOT(about()));
 }
 
 MediaControl::~MediaControl()
@@ -275,12 +275,12 @@ void MediaControl::preferences()
 	else
 	{
 		_prefsDialog = new MediaControlConfig ( _configFrontend );
-		connect ( _prefsDialog, TQT_SIGNAL(closing()),
-			this, TQT_SLOT(slotClosePrefsDialog()) );
-		connect ( _prefsDialog, TQT_SIGNAL(destroyed()),
-			this, TQT_SLOT(slotPrefsDialogClosing()) );
-		connect ( _prefsDialog, TQT_SIGNAL(configChanged()),
-			this, TQT_SLOT(slotConfigChanged()) );
+		connect ( _prefsDialog, TQ_SIGNAL(closing()),
+			this, TQ_SLOT(slotClosePrefsDialog()) );
+		connect ( _prefsDialog, TQ_SIGNAL(destroyed()),
+			this, TQ_SLOT(slotPrefsDialogClosing()) );
+		connect ( _prefsDialog, TQ_SIGNAL(configChanged()),
+			this, TQ_SLOT(slotConfigChanged()) );
 	}
 }
 
@@ -396,12 +396,12 @@ void MediaControl::reparseConfig()
 	}
 
 	//  this signal gets emitted by a playerInterface when the player's playtime changed
-	connect(_player, TQT_SIGNAL(newSliderPosition(int,int)),
-		this, TQT_SLOT(setSliderPosition(int,int)));
+	connect(_player, TQ_SIGNAL(newSliderPosition(int,int)),
+		this, TQ_SLOT(setSliderPosition(int,int)));
 
-	connect(_player, TQT_SIGNAL(playerStarted()), TQT_SLOT(enableAll()));
-	connect(_player, TQT_SIGNAL(playerStopped()), TQT_SLOT(disableAll()));
-	connect(_player, TQT_SIGNAL(playingStatusChanged(int)), TQT_SLOT(slotPlayingStatusChanged(int)));
+	connect(_player, TQ_SIGNAL(playerStarted()), TQ_SLOT(enableAll()));
+	connect(_player, TQ_SIGNAL(playerStopped()), TQ_SLOT(disableAll()));
+	connect(_player, TQ_SIGNAL(playingStatusChanged(int)), TQ_SLOT(slotPlayingStatusChanged(int)));
 
 	// do we use our icons or the default ones from KDE?
 	if(_configFrontend->useCustomTheme())
@@ -441,17 +441,17 @@ void MediaControl::reparseConfig()
 
 	slider_tooltip = new MediaControlToolTip(time_slider, _player);
 
-	connect(prev_button, TQT_SIGNAL(clicked()), _player, TQT_SLOT(prev()));
-	connect(playpause_button, TQT_SIGNAL(clicked()), _player, TQT_SLOT(playpause()));
-	connect(stop_button, TQT_SIGNAL(clicked()), _player, TQT_SLOT(stop()));
-	connect(next_button, TQT_SIGNAL(clicked()), _player, TQT_SLOT(next()));
-
-	connect(time_slider, TQT_SIGNAL(sliderPressed()), _player, TQT_SLOT(sliderStartDrag()));
-	connect(time_slider, TQT_SIGNAL(sliderReleased()), _player, TQT_SLOT(sliderStopDrag()));
-	connect(time_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(adjustTime(int)));
-	connect(time_slider, TQT_SIGNAL(volumeUp()), _player, TQT_SLOT(volumeUp()));
-	connect(time_slider, TQT_SIGNAL(volumeDown()), _player, TQT_SLOT(volumeDown()));
-	connect(this, TQT_SIGNAL(newJumpToTime(int)), _player, TQT_SLOT(jumpToTime(int)));
+	connect(prev_button, TQ_SIGNAL(clicked()), _player, TQ_SLOT(prev()));
+	connect(playpause_button, TQ_SIGNAL(clicked()), _player, TQ_SLOT(playpause()));
+	connect(stop_button, TQ_SIGNAL(clicked()), _player, TQ_SLOT(stop()));
+	connect(next_button, TQ_SIGNAL(clicked()), _player, TQ_SLOT(next()));
+
+	connect(time_slider, TQ_SIGNAL(sliderPressed()), _player, TQ_SLOT(sliderStartDrag()));
+	connect(time_slider, TQ_SIGNAL(sliderReleased()), _player, TQ_SLOT(sliderStopDrag()));
+	connect(time_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(adjustTime(int)));
+	connect(time_slider, TQ_SIGNAL(volumeUp()), _player, TQ_SLOT(volumeUp()));
+	connect(time_slider, TQ_SIGNAL(volumeDown()), _player, TQ_SLOT(volumeDown()));
+	connect(this, TQ_SIGNAL(newJumpToTime(int)), _player, TQ_SLOT(jumpToTime(int)));
 }
 
 // Widget Placement ===================================================================
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index 9df7362..a1de847 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -68,12 +68,12 @@ MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, c
 	for (TQStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it)
 		readSkinDir(*it);
 
-	connect(_child->mWheelScrollAmount, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotConfigChanged()));
-	connect(_child->playerListBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotConfigChanged()));
-	connect(_child->themeListBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotConfigChanged()));
-	connect(_child->themeListBox, TQT_SIGNAL(selectionChanged(TQListBoxItem *)), TQT_SLOT(slotChangePreview(TQListBoxItem *)));
-	connect(_child->mUseThemes, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotConfigChanged()) );
-	connect(_child->mUseThemes, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUseThemesToggled(bool)) );
+	connect(_child->mWheelScrollAmount, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotConfigChanged()));
+	connect(_child->playerListBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotConfigChanged()));
+	connect(_child->themeListBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotConfigChanged()));
+	connect(_child->themeListBox, TQ_SIGNAL(selectionChanged(TQListBoxItem *)), TQ_SLOT(slotChangePreview(TQListBoxItem *)));
+	connect(_child->mUseThemes, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotConfigChanged()) );
+	connect(_child->mUseThemes, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotUseThemesToggled(bool)) );
 
 	load();
 	show();
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index 0f0e1c6..e6182d2 100644
--- a/kicker-applets/mediacontrol/mpdInterface.cpp
+++ b/kicker-applets/mediacontrol/mpdInterface.cpp
@@ -39,16 +39,16 @@ MpdInterface::MpdInterface()
 ,   slider_timer(0)
 ,   reconnect_timer(0)
 {
-    connect(&sock, TQT_SIGNAL(error(int)), this, TQT_SLOT(connectionError(int)));
-    connect(&sock, TQT_SIGNAL(error(int)), this, TQT_SLOT(stopSliderClock()));
+    connect(&sock, TQ_SIGNAL(error(int)), this, TQ_SLOT(connectionError(int)));
+    connect(&sock, TQ_SIGNAL(error(int)), this, TQ_SLOT(stopSliderClock()));
 
-    connect(&sock, TQT_SIGNAL(connected()), this, TQT_SLOT(startSliderClock()));
-    connect(&sock, TQT_SIGNAL(connected()), this, TQT_SLOT(stopReconnectClock()));
-    connect(&sock, TQT_SIGNAL(connected()), this, TQT_SLOT(connected()));
+    connect(&sock, TQ_SIGNAL(connected()), this, TQ_SLOT(startSliderClock()));
+    connect(&sock, TQ_SIGNAL(connected()), this, TQ_SLOT(stopReconnectClock()));
+    connect(&sock, TQ_SIGNAL(connected()), this, TQ_SLOT(connected()));
 
-    connect(&sock, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(stopSliderClock()));
-    connect(&sock, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(startReconnectClock()));
-    connect(&sock, TQT_SIGNAL(connectionClosed()), this, TQT_SIGNAL(playerStopped()));
+    connect(&sock, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(stopSliderClock()));
+    connect(&sock, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(startReconnectClock()));
+    connect(&sock, TQ_SIGNAL(connectionClosed()), this, TQ_SIGNAL(playerStopped()));
 
     reconnect();
 }
diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp
index 61b7b14..fd58bf5 100644
--- a/kicker-applets/mediacontrol/noatunInterface.cpp
+++ b/kicker-applets/mediacontrol/noatunInterface.cpp
@@ -31,16 +31,16 @@ NoatunInterface::NoatunInterface() : PlayerInterface()
 	mTimerValue = TIMER_FAST;
 	mNoatunTimer = new TQTimer(this, "mNoatunTimer");
 
-	connect(mNoatunTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()));
+	connect(mNoatunTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()));
 
-	connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)),
-		TQT_SLOT(appRegistered(const TQCString&)) );
+	connect(kapp->dcopClient(), TQ_SIGNAL(applicationRegistered(const TQCString&)),
+		TQ_SLOT(appRegistered(const TQCString&)) );
 
-	connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)),
-		TQT_SLOT(appRemoved(const TQCString&)));
+	connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+		TQ_SLOT(appRemoved(const TQCString&)));
 
 	kapp->dcopClient()->setNotifications(true);
-	TQTimer::singleShot(0, this, TQT_SLOT(myInit()));
+	TQTimer::singleShot(0, this, TQ_SLOT(myInit()));
 }
 
 NoatunInterface::~NoatunInterface()
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index ef09f71..6e099b8 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -39,10 +39,10 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name)
 {
     setBackgroundOrigin( AncestorOrigin );
 
-    connect( kapp, TQT_SIGNAL( settingsChanged( int ) ),
-       TQT_SLOT( slotSettingsChanged( int ) ) );
-    connect( kapp, TQT_SIGNAL( iconChanged( int ) ),
-       TQT_SLOT( slotIconChanged( int ) ) );
+    connect( kapp, TQ_SIGNAL( settingsChanged( int ) ),
+       TQ_SLOT( slotSettingsChanged( int ) ) );
+    connect( kapp, TQ_SIGNAL( iconChanged( int ) ),
+       TQ_SLOT( slotIconChanged( int ) ) );
 
     kapp->addKipcEventMask( KIPC::SettingsChanged );
     kapp->addKipcEventMask( KIPC::IconChanged );
diff --git a/kicker-applets/mediacontrol/xmmsInterface.cpp b/kicker-applets/mediacontrol/xmmsInterface.cpp
index 7d8e236..3dcfb75 100644
--- a/kicker-applets/mediacontrol/xmmsInterface.cpp
+++ b/kicker-applets/mediacontrol/xmmsInterface.cpp
@@ -36,7 +36,7 @@ XmmsInterface::XmmsInterface() : PlayerInterface()
 	bStartingXMMS = false;
 	xmms_timer = new TQTimer ( this, "xmms_timer" );
 
-	TQObject::connect( xmms_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateSlider()) );
+	TQObject::connect( xmms_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateSlider()) );
 
 	// Better start the timer as late as possible in initialization
 	xmms_timer->start ( timervalue );
@@ -127,7 +127,7 @@ void XmmsInterface::playpause()
 			return;
 		startPlayer("xmms");
 		bStartingXMMS = true;
-		TQTimer::singleShot(500, this, TQT_SLOT(playpause()));
+		TQTimer::singleShot(500, this, TQ_SLOT(playpause()));
 	}
 	else
 	{