Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

15 files changed, 105 insertions, 105 deletions

diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 3064179..0cfcb5e 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -58,7 +58,7 @@ TDEConfigDialogImp::TDEConfigDialogImp( TQWidget *parent, const char *name, TDEC
 
 	settings = new SettingsImp(0, "General");
 	addPage(settings, i18n("General"),	"package_settings");
-	connect(this, TQT_SIGNAL(widgetModified()), settings, TQT_SLOT(updatePreview()));
+	connect(this, TQ_SIGNAL(widgetModified()), settings, TQ_SLOT(updatePreview()));
 }
 
 SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Settings(parent, name, fl){
@@ -138,7 +138,7 @@ KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, T
 	updateClock();
 	loadSettings();
 	TQTimer *timer=new TQTimer(this);
-	connect (timer, TQT_SIGNAL (timeout()), this, TQT_SLOT (updateClock()));
+	connect (timer, TQ_SIGNAL (timeout()), this, TQ_SLOT (updateClock()));
 	timer->start(500,false);
 }
 
@@ -217,7 +217,7 @@ void KBinaryClock::preferences(){
 		return;
 
 	TDEConfigDialogImp *dialog = new TDEConfigDialogImp(this, "settings", prefs, KDialogBase::Swallow);
-	connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings()));
+	connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings()));
 	dialog->show();
 	dialog->settings->updatePreview();
 }
@@ -301,7 +301,7 @@ void KBinaryClock::openContextMenu() {
 		copyMenu->insertItem(dt.date().toString(), 206);
 		copyMenu->insertItem(dt.time().toString(), 207);
 		copyMenu->insertItem(dt.toString(), 208);
-		connect( copyMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCopyMenuActivated(int) ) );
+		connect( copyMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotCopyMenuActivated(int) ) );
 
 		if (!bImmutable)
 		{
@@ -362,7 +362,7 @@ void KBinaryClock::toggleCalendar()
 		return;
 	}
 	_calendar = new DatePicker(this, TQDateTime::currentDateTime().date());
-	connect( _calendar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotCalendarDeleted() ));
+	connect( _calendar, TQ_SIGNAL( destroyed() ), TQ_SLOT( slotCalendarDeleted() ));
 
 	// some extra spacing is included if aligned on a desktop edge
 	TQPoint c = mapToGlobal(TQPoint(0,0));
@@ -393,7 +393,7 @@ void KBinaryClock::slotCalendarDeleted()
 		_calendar = 0L;
 		// don't reopen the calendar immediately ...
 		_disableCalendar = true;
-		TQTimer::singleShot(100, this, TQT_SLOT(slotEnableCalendar()));
+		TQTimer::singleShot(100, this, TQ_SLOT(slotEnableCalendar()));
 }
 
 void KBinaryClock::slotEnableCalendar()
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index 5dc353a..4328f8f 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -83,7 +83,7 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type,
 	m_colourButton->setPixmap(SmallIcon("colorpicker"));
 	m_colourButton->setFixedSize(20, 20);
 	TQToolTip::add(m_colourButton, i18n("Pick a color"));
-	connect(m_colourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPick()));
+	connect(m_colourButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotPick()));
 
 	m_historyButton = new SimpleButton(this);
 	m_historyButton->setFixedSize(20, 20);
@@ -95,7 +95,7 @@ KolourPicker::KolourPicker(const TQString& configFile, Type type,
 		m_historyButton->setEnabled(false);
 	}
 	TQToolTip::add(m_historyButton, i18n("History"));
-	connect(m_historyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotHistory()));
+	connect(m_historyButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotHistory()));
 }
 
 KolourPicker::~KolourPicker()
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index ef09f71..6e099b8 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/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/ktimemon/confdlg.cpp b/kicker-applets/ktimemon/confdlg.cpp
index c2c9493..a186b88 100644
--- a/kicker-applets/ktimemon/confdlg.cpp
+++ b/kicker-applets/ktimemon/confdlg.cpp
@@ -65,7 +65,7 @@ KConfDialog::KConfDialog(KTimeMon *t)
     bl->addStretch();
 
     autoScaleBox = new TQCheckBox(i18n("&Automatic"), b);
-    connect(autoScaleBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggle(bool)));
+    connect(autoScaleBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggle(bool)));
 
     pageScaleEdit = new KIntNumInput(intervalEdit, 1000, b);
     pageScaleEdit->setRange(10, 10000, 10);
@@ -117,8 +117,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
       cb = *cpuColourButtons[j] = new KColorButton(white, page);
       gl->addWidget(cb, 1, 3*j+2, AlignCenter);
       
-      connect(cb, TQT_SIGNAL(changed(const TQColor &)),
-              this, TQT_SLOT(updateSampleWidget(const TQColor &)));
+      connect(cb, TQ_SIGNAL(changed(const TQColor &)),
+              this, TQ_SLOT(updateSampleWidget(const TQColor &)));
     }
 
     KColorButton **memColourButtons[4] = { &mkernelCB, &usedCB, &buffersCB, &cachedCB };
@@ -132,8 +132,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
       cb = *memColourButtons[j] = new KColorButton(white, page);
       gl->addWidget(cb, 5, 3*j+2, AlignCenter);
       
-      connect(cb, TQT_SIGNAL(changed(const TQColor &)),
-              this, TQT_SLOT(updateSampleWidget(const TQColor &)));
+      connect(cb, TQ_SIGNAL(changed(const TQColor &)),
+              this, TQ_SLOT(updateSampleWidget(const TQColor &)));
     }
 
     b = new TQGroupBox(i18n("Swap"), page);
@@ -145,8 +145,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
     cb = swapCB = new KColorButton(red, page);
     gl->addWidget(cb, 9, 2);
 
-    connect(cb, TQT_SIGNAL(changed(const TQColor &)),
-            this, TQT_SLOT(updateSampleWidget(const TQColor &)));
+    connect(cb, TQ_SIGNAL(changed(const TQColor &)),
+            this, TQ_SLOT(updateSampleWidget(const TQColor &)));
 
     l = new TQLabel(i18n("Backgd:"), page);
     gl->addWidget(l, 9, 4, AlignVCenter | AlignRight);
@@ -154,8 +154,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
     cb = bgCB = new KColorButton(blue, page);
     gl->addWidget(cb, 9, 5);
 
-  connect(cb, TQT_SIGNAL(changed(const TQColor &)),
-	  this, TQT_SLOT(updateSampleWidget(const TQColor &)));
+  connect(cb, TQ_SIGNAL(changed(const TQColor &)),
+	  this, TQ_SLOT(updateSampleWidget(const TQColor &)));
 
   //b = new TQGroupBox(i18n("Sample"), page);
   //gl->addMultiCellWidget(b, 8, 10, 7, 9);
@@ -197,8 +197,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
     mouseC[i]->insertItem(i18n("Starts"), KTimeMon::COMMAND - 1);
     gl->addWidget(mouseC[i], i+1, 1);
 
-    connect( mouseC[ i ], TQT_SIGNAL( activated( int ) ), this,
-           TQT_SLOT( mouseCommandEnable() ) );
+    connect( mouseC[ i ], TQ_SIGNAL( activated( int ) ), this,
+           TQ_SLOT( mouseCommandEnable() ) );
 
     mouseLE[i] = new KURLRequester(b);
     mouseLE[i]->lineEdit()->setText(t->mouseActionCommand[i]);
@@ -209,8 +209,8 @@ KConfDialog::KConfDialog(KTimeMon *t)
 
   resize(380, 300);
 
-  connect(this, TQT_SIGNAL(applyClicked()), timemon, TQT_SLOT(apply()));
-  connect(this, TQT_SIGNAL(okClicked()), timemon, TQT_SLOT(apply()));
+  connect(this, TQ_SIGNAL(applyClicked()), timemon, TQ_SLOT(apply()));
+  connect(this, TQ_SIGNAL(okClicked()), timemon, TQ_SLOT(apply()));
 }
 
 // Adjust the colours of the sample widget in the configuration dialog.
diff --git a/kicker-applets/ktimemon/timemon.cpp b/kicker-applets/ktimemon/timemon.cpp
index 3d0d3da..3fe5372 100644
--- a/kicker-applets/ktimemon/timemon.cpp
+++ b/kicker-applets/ktimemon/timemon.cpp
@@ -230,7 +230,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions,
     vertical = conf->readBoolEntry("Vertical", true);
 
     timer = new TQTimer(this);
-    connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+    connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
     timer->start(interval);
 
     sample = new KSample(this, autoScale, pageScale, swapScale, ctxScale);
@@ -249,8 +249,8 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions,
     menu->insertSeparator();
     menu->insertItem(SmallIcon( "help" ), i18n("Help"), hmenu->menu(), 1);
 
-    menu->connectItem(2, this, TQT_SLOT(configure()));
-    menu->connectItem(4, this, TQT_SLOT(orientation()));
+    menu->connectItem(2, this, TQ_SLOT(configure()));
+    menu->connectItem(4, this, TQ_SLOT(orientation()));
 
     menu->setCheckable(true);
 
@@ -413,8 +413,8 @@ void KTimeMon::runCommand(int index)
 
     bgProcess = new KShellProcess;
     *bgProcess << mouseActionCommand[index];
-    connect(bgProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-            this, TQT_SLOT(commandStderr(TDEProcess *, char *, int)));
+    connect(bgProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+            this, TQ_SLOT(commandStderr(TDEProcess *, char *, int)));
     bgProcess->start(TDEProcess::DontCare, TDEProcess::Stderr);
 }
 
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index 253ba78..08c534f 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -77,15 +77,15 @@ MathApplet::MathApplet(const TQString& configFile, Type type, int actions,
     f = _btn->font();
     f.setPixelSize(12);
     _btn->setFont(f);
-    connect(_btn, TQT_SIGNAL(clicked()), TQT_SLOT(popup_combo()));
+    connect(_btn, TQ_SIGNAL(clicked()), TQ_SLOT(popup_combo()));
 
     // setup history combo
     _input = new KHistoryCombo(this);
     _input->setFocus();
     _input->clearEdit();
     watchForFocus(_input->lineEdit());
-    connect(_input, TQT_SIGNAL(activated(const TQString&)),
-	    TQT_SLOT(evaluate(const TQString&)));
+    connect(_input, TQ_SIGNAL(activated(const TQString&)),
+	    TQ_SLOT(evaluate(const TQString&)));
 
     initContextMenu();    
     useDegrees();
@@ -112,8 +112,8 @@ void MathApplet::initContextMenu()
 {
     mContextMenu = new TDEPopupMenu(this);
     mContextMenu->setCheckable(true);
-    mContextMenu->insertItem(i18n("Use &Degrees"), this, TQT_SLOT(useDegrees()), 0, 0, 0);
-    mContextMenu->insertItem(i18n("Use &Radians"), this, TQT_SLOT(useRadians()), 0, 1, 1);
+    mContextMenu->insertItem(i18n("Use &Degrees"), this, TQ_SLOT(useDegrees()), 0, 0, 0);
+    mContextMenu->insertItem(i18n("Use &Radians"), this, TQ_SLOT(useRadians()), 0, 1, 1);
     setCustomMenu(mContextMenu);
 }
 
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
 	{