Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

28 files changed, 305 insertions, 305 deletions

diff --git a/plugins/alsa-sound/alsa-mixer-element.cpp b/plugins/alsa-sound/alsa-mixer-element.cpp
index 53a7216..12a48f2 100644
--- a/plugins/alsa-sound/alsa-mixer-element.cpp
+++ b/plugins/alsa-sound/alsa-mixer-element.cpp
@@ -34,33 +34,33 @@ QAlsaMixerElement::QAlsaMixerElement(TQWidget *parent, const TQString &label, bo
     setLabel(label);
     setVolume(0);
 
-    TQObject::connect(m_spinboxVolume, TQT_SIGNAL(valueChanged(int)),
-                     this,            TQT_SLOT  (slotSpinboxValueChanged(int)));
-    TQObject::connect(m_sliderVolume,  TQT_SIGNAL(valueChanged(int)),
-                     this,            TQT_SLOT  (slotSliderValueChanged(int)));
+    TQObject::connect(m_spinboxVolume, TQ_SIGNAL(valueChanged(int)),
+                     this,            TQ_SLOT  (slotSpinboxValueChanged(int)));
+    TQObject::connect(m_sliderVolume,  TQ_SIGNAL(valueChanged(int)),
+                     this,            TQ_SLOT  (slotSliderValueChanged(int)));
 
     if (m_HasVolume) {
-        TQObject::connect(m_checkboxOverride, TQT_SIGNAL(toggled(bool)),
-                         m_spinboxVolume,    TQT_SLOT  (setEnabled(bool)));
-        TQObject::connect(m_checkboxOverride, TQT_SIGNAL(toggled(bool)),
-                         m_sliderVolume,     TQT_SLOT  (setEnabled(bool)));
+        TQObject::connect(m_checkboxOverride, TQ_SIGNAL(toggled(bool)),
+                         m_spinboxVolume,    TQ_SLOT  (setEnabled(bool)));
+        TQObject::connect(m_checkboxOverride, TQ_SIGNAL(toggled(bool)),
+                         m_sliderVolume,     TQ_SLOT  (setEnabled(bool)));
     } else {
         m_spinboxVolume->hide();
         m_sliderVolume->hide();
     }
     if (m_HasSwitch) {
-        TQObject::connect(m_checkboxOverride, TQT_SIGNAL(toggled(bool)),
-                         m_checkboxActive,   TQT_SLOT  (setEnabled(bool)));
+        TQObject::connect(m_checkboxOverride, TQ_SIGNAL(toggled(bool)),
+                         m_checkboxActive,   TQ_SLOT  (setEnabled(bool)));
     } else {
         //m_checkboxActive->hide();
         m_checkboxActive->setEnabled(false);
         m_checkboxActive->setChecked(true);
     }
 
-    connect(m_checkboxOverride, TQT_SIGNAL(toggled(bool)),     this, TQT_SLOT(slotSetDirty()));
-    connect(m_checkboxActive,   TQT_SIGNAL(toggled(bool)),     this, TQT_SLOT(slotSetDirty()));
-    connect(m_spinboxVolume,    TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetDirty()));
-    connect(m_sliderVolume,     TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetDirty()));
+    connect(m_checkboxOverride, TQ_SIGNAL(toggled(bool)),     this, TQ_SLOT(slotSetDirty()));
+    connect(m_checkboxActive,   TQ_SIGNAL(toggled(bool)),     this, TQ_SLOT(slotSetDirty()));
+    connect(m_spinboxVolume,    TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetDirty()));
+    connect(m_sliderVolume,     TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetDirty()));
 }
 
 
diff --git a/plugins/alsa-sound/alsa-sound-configuration.cpp b/plugins/alsa-sound/alsa-sound-configuration.cpp
index bf21210..362d19e 100644
--- a/plugins/alsa-sound/alsa-sound-configuration.cpp
+++ b/plugins/alsa-sound/alsa-sound-configuration.cpp
@@ -41,19 +41,19 @@ AlsaSoundConfiguration::AlsaSoundConfiguration (TQWidget *parent, AlsaSoundDevic
    m_dirty(true),
    m_ignore_updates(false)
 {
-    TQObject::connect(m_comboPlaybackCard,   TQT_SIGNAL(activated(int)),    this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(m_comboCaptureCard,    TQT_SIGNAL(activated(int)),    this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(m_comboPlaybackDevice, TQT_SIGNAL(activated(int)),    this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(m_comboCaptureDevice,  TQT_SIGNAL(activated(int)),    this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(editHWBufferSize,      TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(editBufferSize,        TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(chkDisablePlayback,    TQT_SIGNAL(toggled(bool)),     this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(chkDisableCapture,     TQT_SIGNAL(toggled(bool)),     this, TQT_SLOT(slotSetDirty()));
-
-    TQObject::connect(m_comboPlaybackCard, TQT_SIGNAL(activated(const TQString &)),
-                     this, TQT_SLOT(slotPlaybackCardSelected(const TQString &)));
-    TQObject::connect(m_comboCaptureCard, TQT_SIGNAL(activated(const TQString &)),
-                     this, TQT_SLOT(slotCaptureCardSelected(const TQString &)));
+    TQObject::connect(m_comboPlaybackCard,   TQ_SIGNAL(activated(int)),    this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(m_comboCaptureCard,    TQ_SIGNAL(activated(int)),    this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(m_comboPlaybackDevice, TQ_SIGNAL(activated(int)),    this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(m_comboCaptureDevice,  TQ_SIGNAL(activated(int)),    this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(editHWBufferSize,      TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(editBufferSize,        TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(chkDisablePlayback,    TQ_SIGNAL(toggled(bool)),     this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(chkDisableCapture,     TQ_SIGNAL(toggled(bool)),     this, TQ_SLOT(slotSetDirty()));
+
+    TQObject::connect(m_comboPlaybackCard, TQ_SIGNAL(activated(const TQString &)),
+                     this, TQ_SLOT(slotPlaybackCardSelected(const TQString &)));
+    TQObject::connect(m_comboCaptureCard, TQ_SIGNAL(activated(const TQString &)),
+                     this, TQ_SLOT(slotCaptureCardSelected(const TQString &)));
 
     m_groupMixer->setColumnLayout(0, TQt::Horizontal );
 
@@ -147,7 +147,7 @@ void AlsaSoundConfiguration::slotCaptureCardSelected(const TQString &cardname)
     for (TQValueListConstIterator<TQString> it = all_list.begin(); it != all_list.end(); ++it, ++idx) {
         QAlsaMixerElement *e = new QAlsaMixerElement(m_groupMixerSubFrame, *it,
                                                      sw_list.contains(*it), vol_list.contains(*it));
-        TQObject::connect(e, TQT_SIGNAL(sigDirty()), this, TQT_SLOT(slotSetDirty()));
+        TQObject::connect(e, TQ_SIGNAL(sigDirty()), this, TQ_SLOT(slotSetDirty()));
         m_groupMixerLayout->addWidget(e, idx > cols, idx % cols);
         e->show();
         m_MixerElements.insert(*it, e);
diff --git a/plugins/alsa-sound/alsa-sound.cpp b/plugins/alsa-sound/alsa-sound.cpp
index 746eacf..d2cef4f 100644
--- a/plugins/alsa-sound/alsa-sound.cpp
+++ b/plugins/alsa-sound/alsa-sound.cpp
@@ -74,8 +74,8 @@ AlsaSoundDevice::AlsaSoundDevice(const TQString &name)
       m_EnableCapture(true)//,
 //       m_captureThread(NULL)
 {
-    TQObject::connect(&m_PlaybackPollingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollPlayback()));
-    TQObject::connect(&m_CapturePollingTimer,  TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollCapture()));
+    TQObject::connect(&m_PlaybackPollingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollPlayback()));
+    TQObject::connect(&m_CapturePollingTimer,  TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollCapture()));
 }
 
 
@@ -191,7 +191,7 @@ void AlsaSoundDevice::restoreState (TDEConfig *c)
 ConfigPageInfo  AlsaSoundDevice::createConfigurationPage()
 {
     AlsaSoundConfiguration *conf = new AlsaSoundConfiguration(NULL, this);
-    TQObject::connect(this, TQT_SIGNAL(sigUpdateConfig()), conf, TQT_SLOT(slotUpdateConfig()));
+    TQObject::connect(this, TQ_SIGNAL(sigUpdateConfig()), conf, TQ_SLOT(slotUpdateConfig()));
     return ConfigPageInfo (conf,
                            i18n("ALSA Sound"),
                            i18n("ALSA Sound Device Options"),
diff --git a/plugins/gui-docking-menu/docking-configuration.cpp b/plugins/gui-docking-menu/docking-configuration.cpp
index dd1a18c..c77b4dc 100644
--- a/plugins/gui-docking-menu/docking-configuration.cpp
+++ b/plugins/gui-docking-menu/docking-configuration.cpp
@@ -52,7 +52,7 @@ DockingConfiguration::DockingConfiguration (RadioDocking *docking, TQWidget *par
     StationSelectorUILayout->addMultiCellLayout(layout2, 2, 2, 0, 2);
     StationSelectorUILayout->addMultiCellLayout(layout,  3, 3, 0, 2);
 
-    connect(m_comboClickMode, TQT_SIGNAL(activated( int )), this, TQT_SLOT(slotSetDirty()));
+    connect(m_comboClickMode, TQ_SIGNAL(activated( int )), this, TQ_SLOT(slotSetDirty()));
 
     languageChange();
     slotCancel();
diff --git a/plugins/gui-docking-menu/docking.cpp b/plugins/gui-docking-menu/docking.cpp
index 5aa5069..0cff351 100644
--- a/plugins/gui-docking-menu/docking.cpp
+++ b/plugins/gui-docking-menu/docking.cpp
@@ -56,8 +56,8 @@ RadioDocking::RadioDocking(const TQString &name)
     setPixmap(BarIcon("tderadio"));
 
     m_menu = contextMenu();
-    TQObject::connect(m_menu, TQT_SIGNAL(activated(int)),
-                     this,   TQT_SLOT(slotMenuItemActivated(int)));
+    TQObject::connect(m_menu, TQ_SIGNAL(activated(int)),
+                     this,   TQ_SLOT(slotMenuItemActivated(int)));
 
     buildContextMenu ();
     show();
@@ -172,8 +172,8 @@ ConfigPageInfo RadioDocking::createConfigurationPage()
     DockingConfiguration *conf = new DockingConfiguration(this, NULL);
     connectI (conf);
 
-    TQObject::connect(this, TQT_SIGNAL(sigLeftClickActionChanged(LeftClickAction)),
-                     conf, TQT_SLOT(slotLeftClickActionChanged(LeftClickAction)));
+    TQObject::connect(this, TQ_SIGNAL(sigLeftClickActionChanged(LeftClickAction)),
+                     conf, TQ_SLOT(slotLeftClickActionChanged(LeftClickAction)));
 
     return ConfigPageInfo(
         conf,
@@ -222,13 +222,13 @@ void RadioDocking::buildContextMenu()
     noticeNextAlarmChanged(queryNextAlarm());
 
     m_sleepID  = m_menu->insertItem(SmallIcon("tderadio_zzz"), "sleep-dummy",
-                                    this, TQT_SLOT(slotSleepCountdown()));
+                                    this, TQ_SLOT(slotSleepCountdown()));
     noticeCountdownStarted(queryCountdownEnd());
 
     m_seekfwID = m_menu->insertItem(SmallIcon("forward"), i18n("Search Next Station"),
-                                    this, TQT_SLOT(slotSeekFwd()));
+                                    this, TQ_SLOT(slotSeekFwd()));
     m_seekbwID = m_menu->insertItem(SmallIcon("back"),    i18n("Search Previous Station"),
-                                    this, TQT_SLOT(slotSeekBkwd()));
+                                    this, TQ_SLOT(slotSeekBkwd()));
 
     // recording menu
     buildRecordingMenu();
@@ -236,14 +236,14 @@ void RadioDocking::buildContextMenu()
 
 
     m_powerID = m_menu->insertItem(SmallIcon("tderadio_muteoff"), "power-dummy",
-                                   this, TQT_SLOT(slotPower()));
+                                   this, TQ_SLOT(slotPower()));
     m_pauseID = m_menu->insertItem(SmallIcon("tderadio_pause"), i18n("Pause Radio"),
-                                   this, TQT_SLOT(slotPause()));
+                                   this, TQ_SLOT(slotPause()));
     noticePowerChanged(queryIsPowerOn());
 
     m_menu->insertSeparator();
 
-    m_menu->insertItem(SmallIcon("tderadio"), i18n("&About"), this, TQT_SLOT(slotShowAbout()));
+    m_menu->insertItem(SmallIcon("tderadio"), i18n("&About"), this, TQ_SLOT(slotShowAbout()));
 
     // build list of widgets for hide/show items
     m_pluginMenu = new TDEPopupMenu(m_menu);
@@ -253,7 +253,7 @@ void RadioDocking::buildContextMenu()
     }
 
     m_menu->insertSeparator();
-    m_menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit" ), kapp, TQT_SLOT(quit()) );
+    m_menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit" ), kapp, TQ_SLOT(quit()) );
 
 
     noticeStationChanged(queryCurrentStation(), -1);
@@ -598,8 +598,8 @@ void RadioDocking::buildRecordingMenu()
 
     m_recordingID = m->insertItem(SmallIcon("tderadio_record"), i18n("Start Recording"),
                                   POPUP_ID_START_RECORDING_DEFAULT);
-    TQObject::connect(m, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotRecordingMenu(int)));
+    TQObject::connect(m, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotRecordingMenu(int)));
     SoundStreamID currentID = queryCurrentSoundStreamID();
 
     TQMapIterator<TQString, SoundStreamID> end = streams.end();
diff --git a/plugins/gui-quickbar/quickbar.cpp b/plugins/gui-quickbar/quickbar.cpp
index d8bba88..df9a299 100644
--- a/plugins/gui-quickbar/quickbar.cpp
+++ b/plugins/gui-quickbar/quickbar.cpp
@@ -280,7 +280,7 @@ void QuickBar::rebuildGUI()
     m_layout->setSpacing(2);
 
     m_buttonGroup = new TQButtonGroup(this);
-    TQObject::connect (m_buttonGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(buttonClicked(int)));
+    TQObject::connect (m_buttonGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(buttonClicked(int)));
     // we use buttonGroup to enable automatic toggle/untoggle
     m_buttonGroup->setExclusive(true);
     m_buttonGroup->setFrameStyle(TQFrame::NoFrame);
diff --git a/plugins/gui-standard-display/displaycfg.cpp b/plugins/gui-standard-display/displaycfg.cpp
index f51a4db..4cb9b18 100644
--- a/plugins/gui-standard-display/displaycfg.cpp
+++ b/plugins/gui-standard-display/displaycfg.cpp
@@ -40,9 +40,9 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
     m_btnInactive = new KColorButton(queryDisplayInactiveColor(), bg);
     m_btnBkgnd    = new KColorButton(queryDisplayBkgndColor(), bg);
 
-    connect(m_btnActive,   TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(slotSetDirty()));
-    connect(m_btnInactive, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(slotSetDirty()));
-    connect(m_btnBkgnd,    TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(slotSetDirty()));
+    connect(m_btnActive,   TQ_SIGNAL(changed(const TQColor &)), this, TQ_SLOT(slotSetDirty()));
+    connect(m_btnInactive, TQ_SIGNAL(changed(const TQColor &)), this, TQ_SLOT(slotSetDirty()));
+    connect(m_btnBkgnd,    TQ_SIGNAL(changed(const TQColor &)), this, TQ_SLOT(slotSetDirty()));
 
     TQLabel *l1  = new TQLabel(i18n("Active Text"), bg);
     TQLabel *l2  = new TQLabel(i18n("Inactive Text"), bg);
@@ -78,10 +78,10 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
     l->addWidget(bg);
     l->addWidget(m_fontChooser);
 
-    connect(m_btnActive,   TQT_SIGNAL(changed(const TQColor &)),     this, TQT_SLOT(slotSetDirty()));
-    connect(m_btnInactive, TQT_SIGNAL(changed(const TQColor &)),     this, TQT_SLOT(slotSetDirty()));
-    connect(m_btnBkgnd,    TQT_SIGNAL(changed(const TQColor &)),     this, TQT_SLOT(slotSetDirty()));
-    connect(m_fontChooser, TQT_SIGNAL(fontSelected(const TQFont &)), this, TQT_SLOT(slotSetDirty()));
+    connect(m_btnActive,   TQ_SIGNAL(changed(const TQColor &)),     this, TQ_SLOT(slotSetDirty()));
+    connect(m_btnInactive, TQ_SIGNAL(changed(const TQColor &)),     this, TQ_SLOT(slotSetDirty()));
+    connect(m_btnBkgnd,    TQ_SIGNAL(changed(const TQColor &)),     this, TQ_SLOT(slotSetDirty()));
+    connect(m_fontChooser, TQ_SIGNAL(fontSelected(const TQFont &)), this, TQ_SLOT(slotSetDirty()));
 
 }
 
diff --git a/plugins/gui-standard-display/radioview-configuration.cpp b/plugins/gui-standard-display/radioview-configuration.cpp
index 64af3ed..b007f3f 100644
--- a/plugins/gui-standard-display/radioview-configuration.cpp
+++ b/plugins/gui-standard-display/radioview-configuration.cpp
@@ -31,62 +31,62 @@ RadioViewConfiguration::~RadioViewConfiguration()
 void RadioViewConfiguration::addTab    (TQWidget *child, const TQString &label)
 {
 	TQTabWidget::addTab(child, label);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::addTab    (TQWidget *child, const TQIconSet &iconset, const TQString &label)
 {
 	TQTabWidget::addTab(child, iconset, label);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::addTab    (TQWidget *child, TQTab *tab)
 {
 	TQTabWidget::addTab(child, tab);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::insertTab (TQWidget *child, const TQString &label, int index)
 {
 	TQTabWidget::insertTab(child, label, index);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::insertTab (TQWidget *child, const TQIconSet &iconset, const TQString &label, int index)
 {
 	TQTabWidget::insertTab(child, iconset, label, index);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::insertTab (TQWidget *child, TQTab *tab, int index)
 {
 	TQTabWidget::insertTab(child, tab, index);
-	TQObject::connect(this,  TQT_SIGNAL(sigOK()),     child, TQT_SLOT(slotOK()));
-	TQObject::connect(this,  TQT_SIGNAL(sigCancel()), child, TQT_SLOT(slotCancel()));
-    TQObject::connect(child, TQT_SIGNAL(sigDirty()),  this,  TQT_SLOT(slotSetDirty()));
+	TQObject::connect(this,  TQ_SIGNAL(sigOK()),     child, TQ_SLOT(slotOK()));
+	TQObject::connect(this,  TQ_SIGNAL(sigCancel()), child, TQ_SLOT(slotCancel()));
+    TQObject::connect(child, TQ_SIGNAL(sigDirty()),  this,  TQ_SLOT(slotSetDirty()));
 }
 
 
 void RadioViewConfiguration::removePage(TQWidget *w)
 {
-	TQObject::disconnect(this,  TQT_SIGNAL(sigOK()),     w,    TQT_SLOT(slotOK()));
-	TQObject::disconnect(this,  TQT_SIGNAL(sigCancel()), w,    TQT_SLOT(slotCancel()));
-    TQObject::disconnect(w,     TQT_SIGNAL(sigDirty()),  this, TQT_SLOT(slotSetDirty()));
+	TQObject::disconnect(this,  TQ_SIGNAL(sigOK()),     w,    TQ_SLOT(slotOK()));
+	TQObject::disconnect(this,  TQ_SIGNAL(sigCancel()), w,    TQ_SLOT(slotCancel()));
+    TQObject::disconnect(w,     TQ_SIGNAL(sigDirty()),  this, TQ_SLOT(slotSetDirty()));
 	TQTabWidget::removePage(w);
 }
 
diff --git a/plugins/gui-standard-display/radioview.cpp b/plugins/gui-standard-display/radioview.cpp
index 3ea0a9a..43f1a1b 100644
--- a/plugins/gui-standard-display/radioview.cpp
+++ b/plugins/gui-standard-display/radioview.cpp
@@ -125,24 +125,24 @@ RadioView::RadioView(const TQString &name)
     m_pauseMenu     = new TDEPopupMenu(btnPower);
     m_pauseMenu->insertItem(SmallIcon("tderadio_pause"),
                             i18n("Pause TDERadio"),
-                            this, TQT_SLOT(slotPause()));
+                            this, TQ_SLOT(slotPause()));
     btnPower->setPopupDelay(200);
 
     m_RecordingMenu = new TDEPopupMenu(btnRecording);
     m_RecordingMenu->insertItem(SmallIcon("tderadio_record"),
                                 i18n("Start Recording"),
                                 POPUP_ID_START_RECORDING_DEFAULT);
-    TQObject::connect(m_RecordingMenu, TQT_SIGNAL(activated(int)),
-                     this,            TQT_SLOT(slotRecordingMenu(int)));
+    TQObject::connect(m_RecordingMenu, TQ_SIGNAL(activated(int)),
+                     this,            TQ_SLOT(slotRecordingMenu(int)));
     btnRecording->setPopup(m_RecordingMenu);
 
 
     m_SnoozeMenu   = new TDEPopupMenu(btnSnooze);
-    m_SnoozeMenu->insertItem(i18n("5 min"),  this, TQT_SLOT(slotSnooze(int)), 0,  5);
-    m_SnoozeMenu->insertItem(i18n("10 min"), this, TQT_SLOT(slotSnooze(int)), 0, 10);
-    m_SnoozeMenu->insertItem(i18n("15 min"), this, TQT_SLOT(slotSnooze(int)), 0, 15);
-    m_SnoozeMenu->insertItem(i18n("30 min"), this, TQT_SLOT(slotSnooze(int)), 0, 30);
-    m_SnoozeMenu->insertItem(i18n("60 min"), this, TQT_SLOT(slotSnooze(int)), 0, 60);
+    m_SnoozeMenu->insertItem(i18n("5 min"),  this, TQ_SLOT(slotSnooze(int)), 0,  5);
+    m_SnoozeMenu->insertItem(i18n("10 min"), this, TQ_SLOT(slotSnooze(int)), 0, 10);
+    m_SnoozeMenu->insertItem(i18n("15 min"), this, TQ_SLOT(slotSnooze(int)), 0, 15);
+    m_SnoozeMenu->insertItem(i18n("30 min"), this, TQ_SLOT(slotSnooze(int)), 0, 30);
+    m_SnoozeMenu->insertItem(i18n("60 min"), this, TQ_SLOT(slotSnooze(int)), 0, 60);
     btnSnooze->setPopup(m_SnoozeMenu);
     btnSnooze->setPopupDelay(200);
 
@@ -169,20 +169,20 @@ RadioView::RadioView(const TQString &name)
     comboStations->setMinimumHeight(28);
 
 
-    TQObject::connect(btnPower,      TQT_SIGNAL(toggled(bool)),
-                     this,          TQT_SLOT(slotPower(bool)));
-    TQObject::connect(btnQuit,       TQT_SIGNAL(clicked()),
-                     kapp,          TQT_SLOT(quit()));
-    TQObject::connect(btnConfigure,  TQT_SIGNAL(toggled(bool)),
-                     this,          TQT_SLOT(slotConfigure(bool)));
-    TQObject::connect(btnRecording,  TQT_SIGNAL(clicked()),
-                     this,          TQT_SLOT(slotRecord()));
-    TQObject::connect(btnSnooze,     TQT_SIGNAL(toggled(bool)),
-                     this,          TQT_SLOT(slotSnooze(bool)));
-    TQObject::connect(comboStations, TQT_SIGNAL(activated(int)),
-                     this,          TQT_SLOT(slotComboStationSelected(int)));
-    TQObject::connect(btnPlugins,    TQT_SIGNAL(clicked()),
-                     this,          TQT_SLOT(slotBtnPluginsClicked()));
+    TQObject::connect(btnPower,      TQ_SIGNAL(toggled(bool)),
+                     this,          TQ_SLOT(slotPower(bool)));
+    TQObject::connect(btnQuit,       TQ_SIGNAL(clicked()),
+                     kapp,          TQ_SLOT(quit()));
+    TQObject::connect(btnConfigure,  TQ_SIGNAL(toggled(bool)),
+                     this,          TQ_SLOT(slotConfigure(bool)));
+    TQObject::connect(btnRecording,  TQ_SIGNAL(clicked()),
+                     this,          TQ_SLOT(slotRecord()));
+    TQObject::connect(btnSnooze,     TQ_SIGNAL(toggled(bool)),
+                     this,          TQ_SLOT(slotSnooze(bool)));
+    TQObject::connect(comboStations, TQ_SIGNAL(activated(int)),
+                     this,          TQ_SLOT(slotComboStationSelected(int)));
+    TQObject::connect(btnPlugins,    TQ_SIGNAL(clicked()),
+                     this,          TQ_SLOT(slotBtnPluginsClicked()));
 
     // tooltips
 
@@ -224,8 +224,8 @@ bool RadioView::addElement (RadioViewElement *e)
 
 
     e->reparent(this, TQPoint(0, 0), true);
-    TQObject::connect(e,    TQT_SIGNAL(destroyed(TQObject*)),
-                     this, TQT_SLOT(removeElement(TQObject*)));
+    TQObject::connect(e,    TQ_SIGNAL(destroyed(TQObject*)),
+                     this, TQ_SLOT(removeElement(TQObject*)));
     elements.append(e);
     widgetStacks[cls]->addWidget(e);
 
@@ -266,8 +266,8 @@ bool RadioView::removeElement (TQObject *_e)
         e->disconnectI(currentDevice);
 
     RadioViewClass cls = e->getClass();
-    TQObject::disconnect(e,    TQT_SIGNAL(destroyed(TQObject*)),
-                        this, TQT_SLOT(removeElement(TQObject*)));
+    TQObject::disconnect(e,    TQ_SIGNAL(destroyed(TQObject*)),
+                        this, TQ_SLOT(removeElement(TQObject*)));
     widgetStacks[cls]->removeWidget(e);
     elements.remove(e);
 
@@ -545,8 +545,8 @@ ConfigPageInfo RadioView::createConfigurationPage()
     }
 
     configPages.append(c);
-    TQObject::connect(c,    TQT_SIGNAL(destroyed(TQObject *)),
-                     this, TQT_SLOT(slotConfigPageDeleted(TQObject *)));
+    TQObject::connect(c,    TQ_SIGNAL(destroyed(TQObject *)),
+                     this, TQ_SLOT(slotConfigPageDeleted(TQObject *)));
 
     return ConfigPageInfo(
         c,
@@ -573,8 +573,8 @@ void RadioView::addConfigurationTabFor(RadioViewElement *e, TQTabWidget *c)
         }
 
         elementConfigPages.push_back(ElementCfg(e, inf.page));
-        TQObject::connect(inf.page, TQT_SIGNAL(destroyed(TQObject *)),
-                         this, TQT_SLOT(slotElementConfigPageDeleted(TQObject *)));
+        TQObject::connect(inf.page, TQ_SIGNAL(destroyed(TQObject *)),
+                         this, TQ_SLOT(slotElementConfigPageDeleted(TQObject *)));
     }
 }
 
@@ -593,8 +593,8 @@ void RadioView::addCommonConfigurationTab(TQTabWidget *c)
     c->addTab(f, i18n("Common"));
 
     elementConfigPages.push_back(ElementCfg(f));
-    TQObject::connect(f,    TQT_SIGNAL(destroyed(TQObject *)),
-                     this, TQT_SLOT(slotElementConfigPageDeleted(TQObject *)));
+    TQObject::connect(f,    TQ_SIGNAL(destroyed(TQObject *)),
+                     this, TQ_SLOT(slotElementConfigPageDeleted(TQObject *)));
 }
 
 
diff --git a/plugins/gui-standard-display/radioview_frequencyseeker.cpp b/plugins/gui-standard-display/radioview_frequencyseeker.cpp
index 611c6a2..d043dd8 100644
--- a/plugins/gui-standard-display/radioview_frequencyseeker.cpp
+++ b/plugins/gui-standard-display/radioview_frequencyseeker.cpp
@@ -60,16 +60,16 @@ RadioViewFrequencySeeker::RadioViewFrequencySeeker(TQWidget *parent, const TQStr
     l->addWidget (m_btnStepRight);
     l->addWidget (m_btnSearchRight);
 
-    TQObject::connect(m_sldFrequency,   TQT_SIGNAL(valueChanged(int)),
-                     this,               TQT_SLOT(slotSliderChanged(int)));
-    TQObject::connect(m_btnSearchLeft,  TQT_SIGNAL(toggled(bool)),
-                     this,               TQT_SLOT(slotSearchLeft(bool)));
-    TQObject::connect(m_btnSearchRight, TQT_SIGNAL(toggled(bool)),
-                     this,               TQT_SLOT(slotSearchRight(bool)));
-    TQObject::connect(m_btnStepLeft,    TQT_SIGNAL(clicked()),
-                     m_sldFrequency,     TQT_SLOT(subtractStep()));
-    TQObject::connect(m_btnStepRight,   TQT_SIGNAL(clicked()),
-                     m_sldFrequency,     TQT_SLOT(addStep()));
+    TQObject::connect(m_sldFrequency,   TQ_SIGNAL(valueChanged(int)),
+                     this,               TQ_SLOT(slotSliderChanged(int)));
+    TQObject::connect(m_btnSearchLeft,  TQ_SIGNAL(toggled(bool)),
+                     this,               TQ_SLOT(slotSearchLeft(bool)));
+    TQObject::connect(m_btnSearchRight, TQ_SIGNAL(toggled(bool)),
+                     this,               TQ_SLOT(slotSearchRight(bool)));
+    TQObject::connect(m_btnStepLeft,    TQ_SIGNAL(clicked()),
+                     m_sldFrequency,     TQ_SLOT(subtractStep()));
+    TQObject::connect(m_btnStepRight,   TQ_SIGNAL(clicked()),
+                     m_sldFrequency,     TQ_SLOT(addStep()));
 
     // Tooltips
 
@@ -84,8 +84,8 @@ RadioViewFrequencySeeker::RadioViewFrequencySeeker(TQWidget *parent, const TQStr
     TQAccel *Accel = new TQAccel (this);
     Accel->insertItem (Key_Left,  100);
     Accel->insertItem (Key_Right, 101);
-    Accel->connectItem (100, m_sldFrequency, TQT_SLOT(subtractStep()));
-    Accel->connectItem (101, m_sldFrequency, TQT_SLOT(addStep()));
+    Accel->connectItem (100, m_sldFrequency, TQ_SLOT(subtractStep()));
+    Accel->connectItem (101, m_sldFrequency, TQ_SLOT(addStep()));
 }
 
 
diff --git a/plugins/gui-standard-display/radioview_seekinterface.ui.h b/plugins/gui-standard-display/radioview_seekinterface.ui.h
index c13c945..03c74d7 100644
--- a/plugins/gui-standard-display/radioview_seekinterface.ui.h
+++ b/plugins/gui-standard-display/radioview_seekinterface.ui.h
@@ -12,8 +12,8 @@ void RadioView_SeekerUI::init()
 	Accel = new TQAccel (this);
 	Accel->insertItem (Key_Left,  100);
 	Accel->insertItem (Key_Right, 101);
-	Accel->connectItem (100, sldRange, TQT_SLOT(subtractStep()));
-	Accel->connectItem (101, sldRange, TQT_SLOT(addStep()));
+	Accel->connectItem (100, sldRange, TQ_SLOT(subtractStep()));
+	Accel->connectItem (101, sldRange, TQ_SLOT(addStep()));
 }
 
 void RadioView_SeekerUI::destroy()
diff --git a/plugins/gui-standard-display/radioview_volume.cpp b/plugins/gui-standard-display/radioview_volume.cpp
index 11e00dd..a04bfcf 100644
--- a/plugins/gui-standard-display/radioview_volume.cpp
+++ b/plugins/gui-standard-display/radioview_volume.cpp
@@ -45,8 +45,8 @@ RadioViewVolume::RadioViewVolume(TQWidget *parent, const TQString &name)
                            getSlider4Volume(v),
                            TQt::Vertical, this);
 
-    TQObject::connect(m_slider, TQT_SIGNAL(valueChanged(int)),
-                     this,     TQT_SLOT(slotVolumeChanged(int)));
+    TQObject::connect(m_slider, TQ_SIGNAL(valueChanged(int)),
+                     this,     TQ_SLOT(slotVolumeChanged(int)));
 
     TQBoxLayout *l = new TQBoxLayout(this, TQBoxLayout::LeftToRight);
     l->addWidget(m_slider);
@@ -59,8 +59,8 @@ RadioViewVolume::RadioViewVolume(TQWidget *parent, const TQString &name)
     TQAccel *Accel = new TQAccel (this);
     Accel->insertItem (Key_Up,  100);
     Accel->insertItem (Key_Down, 101);
-    Accel->connectItem (100, m_slider, TQT_SLOT(subtractStep()));
-    Accel->connectItem (101, m_slider, TQT_SLOT(addStep()));
+    Accel->connectItem (100, m_slider, TQ_SLOT(subtractStep()));
+    Accel->connectItem (101, m_slider, TQ_SLOT(addStep()));
 
 }
 
diff --git a/plugins/lirc/lirc-configuration.cpp b/plugins/lirc/lirc-configuration.cpp
index 470b2ff..c0f00d4 100644
--- a/plugins/lirc/lirc-configuration.cpp
+++ b/plugins/lirc/lirc-configuration.cpp
@@ -85,7 +85,7 @@ LIRCConfiguration::LIRCConfiguration (TQWidget *parent, LircSupport *dev)
     m_ActionList->setColumnWidthMode(1, TQListView::Maximum);
     m_ActionList->setColumnWidthMode(2, TQListView::Maximum);
 
-    connect(m_ActionList, TQT_SIGNAL(itemRenamed(TQListViewItem*, int)), this, TQT_SLOT(slotSetDirty()));
+    connect(m_ActionList, TQ_SIGNAL(itemRenamed(TQListViewItem*, int)), this, TQ_SLOT(slotSetDirty()));
     slotCancel();
 }
 
@@ -140,10 +140,10 @@ void LIRCConfiguration::addKey(const TQString &descr, const TQString &key, const
 {
     ListViewItemLirc *item = new ListViewItemLirc(m_ActionList, m_ActionList->lastChild());
     if (item) {
-        TQObject::connect(item, TQT_SIGNAL(sigRenamingStarted (ListViewItemLirc *, int)),
-                         this, TQT_SLOT  (slotRenamingStarted(ListViewItemLirc *, int)));
-        TQObject::connect(item, TQT_SIGNAL(sigRenamingStopped (ListViewItemLirc *, int)),
-                         this, TQT_SLOT  (slotRenamingStopped(ListViewItemLirc *, int)));
+        TQObject::connect(item, TQ_SIGNAL(sigRenamingStarted (ListViewItemLirc *, int)),
+                         this, TQ_SLOT  (slotRenamingStarted(ListViewItemLirc *, int)));
+        TQObject::connect(item, TQ_SIGNAL(sigRenamingStopped (ListViewItemLirc *, int)),
+                         this, TQ_SLOT  (slotRenamingStopped(ListViewItemLirc *, int)));
         item->setText(0, descr);
         item->setText(1, key);
         item->setText(2, alt_key);
diff --git a/plugins/lirc/lircsupport.cpp b/plugins/lirc/lircsupport.cpp
index adb4bb1..0c74b86 100644
--- a/plugins/lirc/lircsupport.cpp
+++ b/plugins/lirc/lircsupport.cpp
@@ -79,7 +79,7 @@ LircSupport::LircSupport(const TQString &name)
         if (lirc_readconfig (NULL, &m_lircConfig, NULL) == 0) {
             m_lirc_notify = new TQSocketNotifier(m_fd_lirc, TQSocketNotifier::Read, this, "lirc_notifier");
             if (m_lirc_notify)
-                TQObject::connect(m_lirc_notify, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLIRC(int)));
+                TQObject::connect(m_lirc_notify, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLIRC(int)));
 
             // check config
             lirc_config_entry *found = NULL;
@@ -108,7 +108,7 @@ LircSupport::LircSupport(const TQString &name)
     }
 
     m_kbdTimer = new TQTimer (this);
-    TQObject::connect (m_kbdTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotKbdTimedOut()));
+    TQObject::connect (m_kbdTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotKbdTimedOut()));
 
     m_addIndex = 0;
 }
@@ -314,9 +314,9 @@ void   LircSupport::restoreState (TDEConfig *c)
 ConfigPageInfo LircSupport::createConfigurationPage()
 {
     LIRCConfiguration *conf = new LIRCConfiguration(NULL, this);
-    TQObject::connect(this, TQT_SIGNAL(sigUpdateConfig()), conf, TQT_SLOT(slotUpdateConfig()));
-    TQObject::connect(this, TQT_SIGNAL(sigRawLIRCSignal(const TQString &, int, bool &)),
-                     conf, TQT_SLOT  (slotRawLIRCSignal(const TQString &, int, bool &)));
+    TQObject::connect(this, TQ_SIGNAL(sigUpdateConfig()), conf, TQ_SLOT(slotUpdateConfig()));
+    TQObject::connect(this, TQ_SIGNAL(sigRawLIRCSignal(const TQString &, int, bool &)),
+                     conf, TQ_SLOT  (slotRawLIRCSignal(const TQString &, int, bool &)));
     return ConfigPageInfo (conf,
                            i18n("LIRC Support"),
                            i18n("LIRC Plugin"),
diff --git a/plugins/oss-sound/oss-sound-configuration.cpp b/plugins/oss-sound/oss-sound-configuration.cpp
index 2a0a783..ace3048 100644
--- a/plugins/oss-sound/oss-sound-configuration.cpp
+++ b/plugins/oss-sound/oss-sound-configuration.cpp
@@ -29,11 +29,11 @@ OSSSoundConfiguration::OSSSoundConfiguration (TQWidget *parent, OSSSoundDevice *
    m_dirty(true),
    m_ignore_gui_updates(false)
 {
-    connect(editDSPDevice,      TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSetDirty()));
-    connect(editMixerDevice,    TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotSetDirty()));
-    connect(editBufferSize,     TQT_SIGNAL(valueChanged(int)),            this, TQT_SLOT(slotSetDirty()));
-    connect(chkDisablePlayback, TQT_SIGNAL(toggled(bool)),                this, TQT_SLOT(slotSetDirty()));
-    connect(chkDisableCapture,  TQT_SIGNAL(toggled(bool)),                this, TQT_SLOT(slotSetDirty()));
+    connect(editDSPDevice,      TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSetDirty()));
+    connect(editMixerDevice,    TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotSetDirty()));
+    connect(editBufferSize,     TQ_SIGNAL(valueChanged(int)),            this, TQ_SLOT(slotSetDirty()));
+    connect(chkDisablePlayback, TQ_SIGNAL(toggled(bool)),                this, TQ_SLOT(slotSetDirty()));
+    connect(chkDisableCapture,  TQ_SIGNAL(toggled(bool)),                this, TQ_SLOT(slotSetDirty()));
     slotCancel();
 }
 
diff --git a/plugins/oss-sound/oss-sound.cpp b/plugins/oss-sound/oss-sound.cpp
index 00801c0..c0033f3 100644
--- a/plugins/oss-sound/oss-sound.cpp
+++ b/plugins/oss-sound/oss-sound.cpp
@@ -64,7 +64,7 @@ OSSSoundDevice::OSSSoundDevice(const TQString &name)
       m_EnablePlayback(true),
       m_EnableCapture(true)
 {
-    TQObject::connect(&m_PollingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPoll()));
+    TQObject::connect(&m_PollingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPoll()));
 }
 
 
@@ -167,7 +167,7 @@ void OSSSoundDevice::setMixerDeviceName(const TQString &dev_name)
 ConfigPageInfo  OSSSoundDevice::createConfigurationPage()
 {
     OSSSoundConfiguration *conf = new OSSSoundConfiguration(NULL, this);
-    TQObject::connect(this, TQT_SIGNAL(sigUpdateConfig()), conf, TQT_SLOT(slotUpdateConfig()));
+    TQObject::connect(this, TQ_SIGNAL(sigUpdateConfig()), conf, TQ_SLOT(slotUpdateConfig()));
     return ConfigPageInfo (conf,
                            i18n("OSS Sound"),
                            i18n("OSS Sound Device Options"),
diff --git a/plugins/radio/radio-configuration.cpp b/plugins/radio/radio-configuration.cpp
index a08d458..d0d237a 100644
--- a/plugins/radio/radio-configuration.cpp
+++ b/plugins/radio/radio-configuration.cpp
@@ -55,55 +55,55 @@ RadioConfiguration::RadioConfiguration (TQWidget *parent, const IErrorLogClient
       m_logger(logger),
       m_dirty(true)
 {
-    TQObject::connect(listStations, TQT_SIGNAL(sigCurrentStationChanged(int)),
-                     this, TQT_SLOT(slotStationSelectionChanged(int)));
-    TQObject::connect(buttonSelectPixmapFile, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotSelectPixmap()));
-    TQObject::connect(buttonNewStation, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotNewStation()));
-    TQObject::connect(buttonDeleteStation, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotDeleteStation()));
-    TQObject::connect(editPixmapFile, TQT_SIGNAL(textChanged(const TQString &)),
-                     this, TQT_SLOT(slotPixmapChanged(const TQString &)));
-    TQObject::connect(editStationName, TQT_SIGNAL(textChanged(const TQString &)),
-                     this, TQT_SLOT(slotStationNameChanged(const TQString &)));
-    TQObject::connect(editStationShortName, TQT_SIGNAL(textChanged(const TQString &)),
-                     this, TQT_SLOT(slotStationShortNameChanged(const TQString &)));
-    TQObject::connect(editVolumePreset, TQT_SIGNAL(valueChanged(int)),
-                     this, TQT_SLOT(slotVolumePresetChanged(int)));
-    TQObject::connect(buttonStationUp, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotStationUp()));
-    TQObject::connect(buttonStationDown, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotStationDown()));
-    TQObject::connect(listStations, TQT_SIGNAL(sigStationActivated(int)),
-                     this, TQT_SLOT(slotActivateStation( int )));
-    TQObject::connect(buttonLoadPresets, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotLoadPresets()));
-    TQObject::connect(buttonStorePresets, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotStorePresets()));
-    TQObject::connect(buttonLastChangeNow, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotLastChangeNow()));
-
-    connect(editMaintainer, TQT_SIGNAL(textChanged(const TQString &)),    TQT_SLOT(slotSetDirty()));
-    connect(editLastChange, TQT_SIGNAL(valueChanged(const TQDateTime &)), TQT_SLOT(slotSetDirty()));
-    connect(editCountry,    TQT_SIGNAL(textChanged(const TQString &)),    TQT_SLOT(slotSetDirty()));
-    connect(editCity,       TQT_SIGNAL(textChanged(const TQString &)),    TQT_SLOT(slotSetDirty()));
-    connect(editMedia,      TQT_SIGNAL(textChanged(const TQString &)),    TQT_SLOT(slotSetDirty()));
-    connect(editComment,    TQT_SIGNAL(textChanged(const TQString &)),    TQT_SLOT(slotSetDirty()));
-    connect(editPresetFile, TQT_SIGNAL(textChanged(const TQString &)),    TQT_SLOT(slotSetDirty()));
+    TQObject::connect(listStations, TQ_SIGNAL(sigCurrentStationChanged(int)),
+                     this, TQ_SLOT(slotStationSelectionChanged(int)));
+    TQObject::connect(buttonSelectPixmapFile, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(slotSelectPixmap()));
+    TQObject::connect(buttonNewStation, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(slotNewStation()));
+    TQObject::connect(buttonDeleteStation, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(slotDeleteStation()));
+    TQObject::connect(editPixmapFile, TQ_SIGNAL(textChanged(const TQString &)),
+                     this, TQ_SLOT(slotPixmapChanged(const TQString &)));
+    TQObject::connect(editStationName, TQ_SIGNAL(textChanged(const TQString &)),
+                     this, TQ_SLOT(slotStationNameChanged(const TQString &)));
+    TQObject::connect(editStationShortName, TQ_SIGNAL(textChanged(const TQString &)),
+                     this, TQ_SLOT(slotStationShortNameChanged(const TQString &)));
+    TQObject::connect(editVolumePreset, TQ_SIGNAL(valueChanged(int)),
+                     this, TQ_SLOT(slotVolumePresetChanged(int)));
+    TQObject::connect(buttonStationUp, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(slotStationUp()));
+    TQObject::connect(buttonStationDown, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(slotStationDown()));
+    TQObject::connect(listStations, TQ_SIGNAL(sigStationActivated(int)),
+                     this, TQ_SLOT(slotActivateStation( int )));
+    TQObject::connect(buttonLoadPresets, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(slotLoadPresets()));
+    TQObject::connect(buttonStorePresets, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(slotStorePresets()));
+    TQObject::connect(buttonLastChangeNow, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(slotLastChangeNow()));
+
+    connect(editMaintainer, TQ_SIGNAL(textChanged(const TQString &)),    TQ_SLOT(slotSetDirty()));
+    connect(editLastChange, TQ_SIGNAL(valueChanged(const TQDateTime &)), TQ_SLOT(slotSetDirty()));
+    connect(editCountry,    TQ_SIGNAL(textChanged(const TQString &)),    TQ_SLOT(slotSetDirty()));
+    connect(editCity,       TQ_SIGNAL(textChanged(const TQString &)),    TQ_SLOT(slotSetDirty()));
+    connect(editMedia,      TQ_SIGNAL(textChanged(const TQString &)),    TQ_SLOT(slotSetDirty()));
+    connect(editComment,    TQ_SIGNAL(textChanged(const TQString &)),    TQ_SLOT(slotSetDirty()));
+    connect(editPresetFile, TQ_SIGNAL(textChanged(const TQString &)),    TQ_SLOT(slotSetDirty()));
 
     mailLabel->setText("mailto:witte-presets@kawo1.rwth-aachen.de");
     mailLabel->setURL ("mailto:witte-presets@kawo1.rwth-aachen.de");
-    TQObject::connect(mailLabel, TQT_SIGNAL(leftClickedURL(const TQString &)),
-                     this, TQT_SLOT(slotSendPresetsByMail(const TQString &)));
+    TQObject::connect(mailLabel, TQ_SIGNAL(leftClickedURL(const TQString &)),
+                     this, TQ_SLOT(slotSendPresetsByMail(const TQString &)));
 
-    TQObject::connect(buttonSearchStations, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(slotSearchStations0()));
+    TQObject::connect(buttonSearchStations, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(slotSearchStations0()));
 
     devicePopup = new TQPopupMenu(buttonSearchStations);
     buttonSearchStations->setPopup(devicePopup);
-    TQObject::connect(devicePopup, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotSearchStations(int)));
+    TQObject::connect(devicePopup, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotSearchStations(int)));
 }
 
 
@@ -235,8 +235,8 @@ void RadioConfiguration::slotStationSelectionChanged(int idx)
             c = s->createEditor();
             if (c) {
                 c->reparent(this, TQPoint(0,0), true);
-                TQObject::connect(c, TQT_SIGNAL(changed(RadioStationConfig*)),
-                                 this, TQT_SLOT(slotStationEditorChanged(RadioStationConfig*)));
+                TQObject::connect(c, TQ_SIGNAL(changed(RadioStationConfig*)),
+                                 this, TQ_SLOT(slotStationEditorChanged(RadioStationConfig*)));
                 stationEditors.insert(s->getClassName(), c);
                 stackStationEdit->addWidget(c);
             }
diff --git a/plugins/recording/recording-configuration.cpp b/plugins/recording/recording-configuration.cpp
index f35f7dd..564248e 100644
--- a/plugins/recording/recording-configuration.cpp
+++ b/plugins/recording/recording-configuration.cpp
@@ -34,24 +34,24 @@ RecordingConfiguration::RecordingConfiguration (TQWidget *parent)
 {
     editDirectory->setMode(KFile::Directory | KFile::ExistingOnly);
 
-    TQObject::connect(editFileFormat, TQT_SIGNAL(activated(int)),
-                     this,           TQT_SLOT(slotFormatSelectionChanged()));
-    TQObject::connect(editBits,       TQT_SIGNAL(activated(int)),
-                     this,           TQT_SLOT(slotFormatSelectionChanged()));
-
-    connect(editRate,                     TQT_SIGNAL(activated(int)),               TQT_SLOT(slotSetDirty()));
-    connect(editBits,                     TQT_SIGNAL(activated(int)),               TQT_SLOT(slotSetDirty()));
-    connect(editSign,                     TQT_SIGNAL(activated(int)),               TQT_SLOT(slotSetDirty()));
-    connect(editEndianess,                TQT_SIGNAL(activated(int)),               TQT_SLOT(slotSetDirty()));
-    connect(editChannels,                 TQT_SIGNAL(activated(int)),               TQT_SLOT(slotSetDirty()));
-    connect(editFileFormat,               TQT_SIGNAL(activated(int)),               TQT_SLOT(slotSetDirty()));
-    connect(editMP3Quality,               TQT_SIGNAL(valueChanged(int)),            TQT_SLOT(slotSetDirty()));
-    connect(editOggQuality,               TQT_SIGNAL(valueChanged(int)),            TQT_SLOT(slotSetDirty()));
-    connect(editDirectory,                TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotSetDirty()));
-    connect(editBufferSize,               TQT_SIGNAL(valueChanged(int)),            TQT_SLOT(slotSetDirty()));
-    connect(editBufferCount,              TQT_SIGNAL(valueChanged(int)),            TQT_SLOT(slotSetDirty()));
-    connect(m_spinboxPreRecordingSeconds, TQT_SIGNAL(valueChanged(int)),            TQT_SLOT(slotSetDirty()));
-    connect(m_checkboxPreRecordingEnable, TQT_SIGNAL(toggled(bool)),                TQT_SLOT(slotSetDirty()));
+    TQObject::connect(editFileFormat, TQ_SIGNAL(activated(int)),
+                     this,           TQ_SLOT(slotFormatSelectionChanged()));
+    TQObject::connect(editBits,       TQ_SIGNAL(activated(int)),
+                     this,           TQ_SLOT(slotFormatSelectionChanged()));
+
+    connect(editRate,                     TQ_SIGNAL(activated(int)),               TQ_SLOT(slotSetDirty()));
+    connect(editBits,                     TQ_SIGNAL(activated(int)),               TQ_SLOT(slotSetDirty()));
+    connect(editSign,                     TQ_SIGNAL(activated(int)),               TQ_SLOT(slotSetDirty()));
+    connect(editEndianess,                TQ_SIGNAL(activated(int)),               TQ_SLOT(slotSetDirty()));
+    connect(editChannels,                 TQ_SIGNAL(activated(int)),               TQ_SLOT(slotSetDirty()));
+    connect(editFileFormat,               TQ_SIGNAL(activated(int)),               TQ_SLOT(slotSetDirty()));
+    connect(editMP3Quality,               TQ_SIGNAL(valueChanged(int)),            TQ_SLOT(slotSetDirty()));
+    connect(editOggQuality,               TQ_SIGNAL(valueChanged(int)),            TQ_SLOT(slotSetDirty()));
+    connect(editDirectory,                TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotSetDirty()));
+    connect(editBufferSize,               TQ_SIGNAL(valueChanged(int)),            TQ_SLOT(slotSetDirty()));
+    connect(editBufferCount,              TQ_SIGNAL(valueChanged(int)),            TQ_SLOT(slotSetDirty()));
+    connect(m_spinboxPreRecordingSeconds, TQ_SIGNAL(valueChanged(int)),            TQ_SLOT(slotSetDirty()));
+    connect(m_checkboxPreRecordingEnable, TQ_SIGNAL(toggled(bool)),                TQ_SLOT(slotSetDirty()));
 
 // attention: remove items with higher index first ;-) otherwise indexes are not valid
 #ifndef HAVE_OGG
diff --git a/plugins/recording/recording-monitor.cpp b/plugins/recording/recording-monitor.cpp
index ee1514b..3800da3 100644
--- a/plugins/recording/recording-monitor.cpp
+++ b/plugins/recording/recording-monitor.cpp
@@ -55,8 +55,8 @@ RecordingMonitor::RecordingMonitor(const TQString &name)
 
     TQPushButton *close     = new TQPushButton(i18n("&Close"), this);
     m_btnStartStop         = new TQPushButton(i18n("&Record"), this);
-    TQObject::connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(hide()));
-    TQObject::connect(m_btnStartStop, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartStopRecording()));
+    TQObject::connect(close, TQ_SIGNAL(clicked()), this, TQ_SLOT(hide()));
+    TQObject::connect(m_btnStartStop, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartStopRecording()));
 
     m_dataMonitor = new RecordingDataMonitor(this, NULL);
     m_dataMonitor->setEnabled(false);
@@ -72,7 +72,7 @@ RecordingMonitor::RecordingMonitor(const TQString &name)
 
 
     m_comboSoundStreamSelector->insertItem(i18n("nothing"));
-    TQObject::connect(m_comboSoundStreamSelector, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotStreamSelected(int)));
+    TQObject::connect(m_comboSoundStreamSelector, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotStreamSelected(int)));
 
     updateRecordingButton();
 }
diff --git a/plugins/streaming/streaming-configuration.cpp b/plugins/streaming/streaming-configuration.cpp
index ab57bea..1526efc 100644
--- a/plugins/streaming/streaming-configuration.cpp
+++ b/plugins/streaming/streaming-configuration.cpp
@@ -34,27 +34,27 @@ StreamingConfiguration::StreamingConfiguration (TQWidget *parent, StreamingDevic
    m_dirty(true),
    m_StreamingDevice(streamer)
 {
-    connect(m_pbNewPlaybackURL,    TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewPlaybackChannel()));
-    connect(m_pbDeletePlaybackURL, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeletePlaybackChannel()));
-    connect(m_pbUpPlaybackURL,     TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpPlaybackChannel()));
-    connect(m_pbDownPlaybackURL,   TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownPlaybackChannel()));
-    connect(m_ListPlaybackURLs,    TQT_SIGNAL(selectionChanged()),           this, TQT_SLOT(slotPlaybackSelectionChanged()));
-    connect(m_ListPlaybackURLs,    TQT_SIGNAL(itemRenamed(TQListViewItem *)), this, TQT_SLOT(slotSetDirty()));
-
-    connect(m_pbNewCaptureURL,     TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewCaptureChannel()));
-    connect(m_pbDeleteCaptureURL,  TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteCaptureChannel()));
-    connect(m_pbUpCaptureURL,      TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpCaptureChannel()));
-    connect(m_pbDownCaptureURL,    TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownCaptureChannel()));
-    connect(m_ListCaptureURLs,     TQT_SIGNAL(selectionChanged()),           this, TQT_SLOT(slotCaptureSelectionChanged()));
-    connect(m_ListCaptureURLs,     TQT_SIGNAL(itemRenamed(TQListViewItem *)), this, TQT_SLOT(slotSetDirty()));
-
-    connect(m_cbBits,       TQT_SIGNAL(activated(int)),    this, TQT_SLOT(slotUpdateSoundFormat()));
-    connect(m_cbChannels,   TQT_SIGNAL(activated(int)),    this, TQT_SLOT(slotUpdateSoundFormat()));
-    connect(m_cbEndianess,  TQT_SIGNAL(activated(int)),    this, TQT_SLOT(slotUpdateSoundFormat()));
-    connect(m_cbFormat,     TQT_SIGNAL(activated(int)),    this, TQT_SLOT(slotUpdateSoundFormat()));
-    connect(m_cbRate,       TQT_SIGNAL(activated(int)),    this, TQT_SLOT(slotUpdateSoundFormat()));
-    connect(m_cbSign,       TQT_SIGNAL(activated(int)),    this, TQT_SLOT(slotUpdateSoundFormat()));
-    connect(m_sbBufferSize, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotUpdateSoundFormat()));
+    connect(m_pbNewPlaybackURL,    TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewPlaybackChannel()));
+    connect(m_pbDeletePlaybackURL, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeletePlaybackChannel()));
+    connect(m_pbUpPlaybackURL,     TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpPlaybackChannel()));
+    connect(m_pbDownPlaybackURL,   TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownPlaybackChannel()));
+    connect(m_ListPlaybackURLs,    TQ_SIGNAL(selectionChanged()),           this, TQ_SLOT(slotPlaybackSelectionChanged()));
+    connect(m_ListPlaybackURLs,    TQ_SIGNAL(itemRenamed(TQListViewItem *)), this, TQ_SLOT(slotSetDirty()));
+
+    connect(m_pbNewCaptureURL,     TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewCaptureChannel()));
+    connect(m_pbDeleteCaptureURL,  TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteCaptureChannel()));
+    connect(m_pbUpCaptureURL,      TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpCaptureChannel()));
+    connect(m_pbDownCaptureURL,    TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownCaptureChannel()));
+    connect(m_ListCaptureURLs,     TQ_SIGNAL(selectionChanged()),           this, TQ_SLOT(slotCaptureSelectionChanged()));
+    connect(m_ListCaptureURLs,     TQ_SIGNAL(itemRenamed(TQListViewItem *)), this, TQ_SLOT(slotSetDirty()));
+
+    connect(m_cbBits,       TQ_SIGNAL(activated(int)),    this, TQ_SLOT(slotUpdateSoundFormat()));
+    connect(m_cbChannels,   TQ_SIGNAL(activated(int)),    this, TQ_SLOT(slotUpdateSoundFormat()));
+    connect(m_cbEndianess,  TQ_SIGNAL(activated(int)),    this, TQ_SLOT(slotUpdateSoundFormat()));
+    connect(m_cbFormat,     TQ_SIGNAL(activated(int)),    this, TQ_SLOT(slotUpdateSoundFormat()));
+    connect(m_cbRate,       TQ_SIGNAL(activated(int)),    this, TQ_SLOT(slotUpdateSoundFormat()));
+    connect(m_cbSign,       TQ_SIGNAL(activated(int)),    this, TQ_SLOT(slotUpdateSoundFormat()));
+    connect(m_sbBufferSize, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotUpdateSoundFormat()));
 
     m_ListPlaybackURLs->setAllColumnsShowFocus(true);
     m_ListPlaybackURLs->setSorting(-1);
diff --git a/plugins/streaming/streaming-job.cpp b/plugins/streaming/streaming-job.cpp
index 3318567..c3fb607 100644
--- a/plugins/streaming/streaming-job.cpp
+++ b/plugins/streaming/streaming-job.cpp
@@ -109,10 +109,10 @@ bool StreamingJob::startPutJob()
     if (!m_TDEIO_Job)
         return false;
     m_TDEIO_Job->setAsyncDataEnabled(true);
-    connect (m_TDEIO_Job, TQT_SIGNAL(dataReq(TDEIO::Job *job, TQByteArray &data)),
-        this, TQT_SLOT(slotWriteData  (TDEIO::Job *job, TQByteArray &data)));
-    connect (m_TDEIO_Job, TQT_SIGNAL(result(TDEIO::Job *)),
-        this, TQT_SLOT(slotIOJobResult(TDEIO::Job *)));
+    connect (m_TDEIO_Job, TQ_SIGNAL(dataReq(TDEIO::Job *job, TQByteArray &data)),
+        this, TQ_SLOT(slotWriteData  (TDEIO::Job *job, TQByteArray &data)));
+    connect (m_TDEIO_Job, TQ_SIGNAL(result(TDEIO::Job *)),
+        this, TQ_SLOT(slotIOJobResult(TDEIO::Job *)));
     return true;
 }
 
@@ -154,10 +154,10 @@ bool StreamingJob::startGetJob()
     if (!m_TDEIO_Job)
         return false;
     m_TDEIO_Job->setAsyncDataEnabled(true);
-    connect (m_TDEIO_Job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-                this, TQT_SLOT(slotReadData(TDEIO::Job *, const TQByteArray &)));
-    connect (m_TDEIO_Job, TQT_SIGNAL(result(TDEIO::Job *)),
-                this, TQT_SLOT(slotIOJobResult(TDEIO::Job *)));
+    connect (m_TDEIO_Job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                this, TQ_SLOT(slotReadData(TDEIO::Job *, const TQByteArray &)));
+    connect (m_TDEIO_Job, TQ_SIGNAL(result(TDEIO::Job *)),
+                this, TQ_SLOT(slotIOJobResult(TDEIO::Job *)));
     return true;
 }
 
diff --git a/plugins/streaming/streaming.cpp b/plugins/streaming/streaming.cpp
index fcbc0cb..2f6c3ea 100644
--- a/plugins/streaming/streaming.cpp
+++ b/plugins/streaming/streaming.cpp
@@ -167,7 +167,7 @@ void StreamingDevice::restoreState (TDEConfig *c)
 ConfigPageInfo  StreamingDevice::createConfigurationPage()
 {
     StreamingConfiguration *conf = new StreamingConfiguration(NULL, this);
-    TQObject::connect(this, TQT_SIGNAL(sigUpdateConfig()), conf, TQT_SLOT(slotUpdateConfig()));
+    TQObject::connect(this, TQ_SIGNAL(sigUpdateConfig()), conf, TQ_SLOT(slotUpdateConfig()));
     return ConfigPageInfo (conf,
                            i18n("Streaming"),
                            i18n("Streaming Device Options"),
@@ -498,8 +498,8 @@ void StreamingDevice::resetCaptureStreams(bool notification_enabled)
 void StreamingDevice::addPlaybackStream(const TQString &url, const SoundFormat &sf, size_t buffer_size, bool notification_enabled)
 {
     StreamingJob *x = new StreamingJob(url, sf, buffer_size);
-    connect(x,    TQT_SIGNAL(logStreamError(const KURL &, const TQString &)),
-            this, TQT_SLOT  (logStreamError(const KURL &, const TQString &)));
+    connect(x,    TQ_SIGNAL(logStreamError(const KURL &, const TQString &)),
+            this, TQ_SLOT  (logStreamError(const KURL &, const TQString &)));
 
     m_PlaybackChannelList.append(url);
     m_PlaybackChannels.insert(url, x);
@@ -512,8 +512,8 @@ void StreamingDevice::addPlaybackStream(const TQString &url, const SoundFormat &
 void StreamingDevice::addCaptureStream (const TQString &url, const SoundFormat &sf, size_t buffer_size, bool notification_enabled)
 {
     StreamingJob *x = new StreamingJob(url, sf, buffer_size);
-    connect(x,    TQT_SIGNAL(logStreamError(const KURL &, const TQString &)),
-            this, TQT_SLOT  (logStreamError(const KURL &, const TQString &)));
+    connect(x,    TQ_SIGNAL(logStreamError(const KURL &, const TQString &)),
+            this, TQ_SLOT  (logStreamError(const KURL &, const TQString &)));
 
     m_CaptureChannelList.append(url);
     m_CaptureChannels.insert(url, x);
diff --git a/plugins/timecontrol/timecontrol-configuration.cpp b/plugins/timecontrol/timecontrol-configuration.cpp
index db3a760..6183f7a 100644
--- a/plugins/timecontrol/timecontrol-configuration.cpp
+++ b/plugins/timecontrol/timecontrol-configuration.cpp
@@ -55,29 +55,29 @@ TimeControlConfiguration::TimeControlConfiguration (TQWidget *parent)
       m_dirty(false)
 {
 
-    TQObject::connect(checkboxAlarmDaily,    TQT_SIGNAL(toggled(bool)),               this, TQT_SLOT(slotDailyChanged(bool)));
-    TQObject::connect(listWeekdays,          TQT_SIGNAL(highlighted(int)),            this, TQT_SLOT(slotWeekdaysChanged()));
-    TQObject::connect(checkboxAlarmEnable,   TQT_SIGNAL(toggled(bool)),               this, TQT_SLOT(slotEnabledChanged(bool)));
-    TQObject::connect(comboStationSelection, TQT_SIGNAL(highlighted(int)),            this, TQT_SLOT(slotStationChanged(int)));
-    TQObject::connect(listAlarms,            TQT_SIGNAL(highlighted(int)),            this, TQT_SLOT(slotAlarmSelectChanged(int)));
-    TQObject::connect(editAlarmDate,         TQT_SIGNAL(valueChanged(const TQDate &)), this, TQT_SLOT(slotDateChanged(const TQDate &)));
-    TQObject::connect(editAlarmTime,         TQT_SIGNAL(valueChanged(const TQTime &)), this, TQT_SLOT(slotTimeChanged(const TQTime &)));
-    TQObject::connect(editAlarmVolume,       TQT_SIGNAL(valueChanged(int)),           this, TQT_SLOT(slotVolumeChanged(int)));
-    TQObject::connect(buttonAlarmNew,        TQT_SIGNAL(clicked()),                   this, TQT_SLOT(slotNewAlarm()));
-    TQObject::connect(buttonDeleteAlarm,     TQT_SIGNAL(clicked()),                   this, TQT_SLOT(slotDeleteAlarm()));
-    TQObject::connect(comboAlarmType,        TQT_SIGNAL(highlighted(int)),            this, TQT_SLOT(slotAlarmTypeChanged(int)));
-
-    TQObject::connect(checkboxAlarmDaily,    TQT_SIGNAL(toggled(bool)),               this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(listWeekdays,          TQT_SIGNAL(selectionChanged()),          this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(checkboxAlarmEnable,   TQT_SIGNAL(toggled(bool)),               this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(comboStationSelection, TQT_SIGNAL(activated(int)),              this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(editAlarmDate,         TQT_SIGNAL(valueChanged(const TQDate &)), this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(editAlarmTime,         TQT_SIGNAL(valueChanged(const TQTime &)), this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(editAlarmVolume,       TQT_SIGNAL(valueChanged(int)),           this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(buttonAlarmNew,        TQT_SIGNAL(clicked()),                   this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(buttonDeleteAlarm,     TQT_SIGNAL(clicked()),                   this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(comboAlarmType,        TQT_SIGNAL(activated(int)),              this, TQT_SLOT(slotSetDirty()));
-    TQObject::connect(editSleep,             TQT_SIGNAL(valueChanged(int)),           this, TQT_SLOT(slotSetDirty()));
+    TQObject::connect(checkboxAlarmDaily,    TQ_SIGNAL(toggled(bool)),               this, TQ_SLOT(slotDailyChanged(bool)));
+    TQObject::connect(listWeekdays,          TQ_SIGNAL(highlighted(int)),            this, TQ_SLOT(slotWeekdaysChanged()));
+    TQObject::connect(checkboxAlarmEnable,   TQ_SIGNAL(toggled(bool)),               this, TQ_SLOT(slotEnabledChanged(bool)));
+    TQObject::connect(comboStationSelection, TQ_SIGNAL(highlighted(int)),            this, TQ_SLOT(slotStationChanged(int)));
+    TQObject::connect(listAlarms,            TQ_SIGNAL(highlighted(int)),            this, TQ_SLOT(slotAlarmSelectChanged(int)));
+    TQObject::connect(editAlarmDate,         TQ_SIGNAL(valueChanged(const TQDate &)), this, TQ_SLOT(slotDateChanged(const TQDate &)));
+    TQObject::connect(editAlarmTime,         TQ_SIGNAL(valueChanged(const TQTime &)), this, TQ_SLOT(slotTimeChanged(const TQTime &)));
+    TQObject::connect(editAlarmVolume,       TQ_SIGNAL(valueChanged(int)),           this, TQ_SLOT(slotVolumeChanged(int)));
+    TQObject::connect(buttonAlarmNew,        TQ_SIGNAL(clicked()),                   this, TQ_SLOT(slotNewAlarm()));
+    TQObject::connect(buttonDeleteAlarm,     TQ_SIGNAL(clicked()),                   this, TQ_SLOT(slotDeleteAlarm()));
+    TQObject::connect(comboAlarmType,        TQ_SIGNAL(highlighted(int)),            this, TQ_SLOT(slotAlarmTypeChanged(int)));
+
+    TQObject::connect(checkboxAlarmDaily,    TQ_SIGNAL(toggled(bool)),               this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(listWeekdays,          TQ_SIGNAL(selectionChanged()),          this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(checkboxAlarmEnable,   TQ_SIGNAL(toggled(bool)),               this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(comboStationSelection, TQ_SIGNAL(activated(int)),              this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(editAlarmDate,         TQ_SIGNAL(valueChanged(const TQDate &)), this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(editAlarmTime,         TQ_SIGNAL(valueChanged(const TQTime &)), this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(editAlarmVolume,       TQ_SIGNAL(valueChanged(int)),           this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(buttonAlarmNew,        TQ_SIGNAL(clicked()),                   this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(buttonDeleteAlarm,     TQ_SIGNAL(clicked()),                   this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(comboAlarmType,        TQ_SIGNAL(activated(int)),              this, TQ_SLOT(slotSetDirty()));
+    TQObject::connect(editSleep,             TQ_SIGNAL(valueChanged(int)),           this, TQ_SLOT(slotSetDirty()));
 }
 
 TimeControlConfiguration::~TimeControlConfiguration ()
diff --git a/plugins/timecontrol/timecontrol.cpp b/plugins/timecontrol/timecontrol.cpp
index 1b56ff0..a5eaeeb 100644
--- a/plugins/timecontrol/timecontrol.cpp
+++ b/plugins/timecontrol/timecontrol.cpp
@@ -51,8 +51,8 @@ TimeControl::TimeControl (const TQString &n)
       m_alarmTimer(this),
       m_countdownTimer(this)
 {
-    TQObject::connect(&m_alarmTimer,     TQT_SIGNAL(timeout()), this, TQT_SLOT(slotQTimerAlarmTimeout()));
-    TQObject::connect(&m_countdownTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotQTimerCountdownTimeout()));
+    TQObject::connect(&m_alarmTimer,     TQ_SIGNAL(timeout()), this, TQ_SLOT(slotQTimerAlarmTimeout()));
+    TQObject::connect(&m_countdownTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotQTimerCountdownTimeout()));
 }
 
 
diff --git a/plugins/timeshifter/timeshifter-configuration.cpp b/plugins/timeshifter/timeshifter-configuration.cpp
index 1974ae7..0d928f8 100644
--- a/plugins/timeshifter/timeshifter-configuration.cpp
+++ b/plugins/timeshifter/timeshifter-configuration.cpp
@@ -45,15 +45,15 @@ TimeShifterConfiguration::TimeShifterConfiguration (TQWidget *parent, TimeShifte
     m_Shifter(shifter),
     m_dirty(true)
 {
-    TQObject::connect(buttonSelectTempFile, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(selectTempFile()));
-    TQObject::connect(comboPlaybackMixerDevice, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotComboPlaybackMixerSelected(int)));
-
-    connect(editTempFile,              TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotSetDirty()));
-    connect(editTempFileSize,          TQT_SIGNAL(valueChanged(int)),           this, TQT_SLOT(slotSetDirty()));
-    connect(comboPlaybackMixerChannel, TQT_SIGNAL(activated( int )),            this, TQT_SLOT(slotSetDirty()));
-    connect(comboPlaybackMixerDevice,  TQT_SIGNAL(activated( int )),            this, TQT_SLOT(slotSetDirty()));
+    TQObject::connect(buttonSelectTempFile, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(selectTempFile()));
+    TQObject::connect(comboPlaybackMixerDevice, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotComboPlaybackMixerSelected(int)));
+
+    connect(editTempFile,              TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotSetDirty()));
+    connect(editTempFileSize,          TQ_SIGNAL(valueChanged(int)),           this, TQ_SLOT(slotSetDirty()));
+    connect(comboPlaybackMixerChannel, TQ_SIGNAL(activated( int )),            this, TQ_SLOT(slotSetDirty()));
+    connect(comboPlaybackMixerDevice,  TQ_SIGNAL(activated( int )),            this, TQ_SLOT(slotSetDirty()));
     slotCancel();
 }
 
diff --git a/plugins/timeshifter/timeshifter.cpp b/plugins/timeshifter/timeshifter.cpp
index 146e530..794b679 100644
--- a/plugins/timeshifter/timeshifter.cpp
+++ b/plugins/timeshifter/timeshifter.cpp
@@ -116,7 +116,7 @@ void   TimeShifter::restoreState (TDEConfig *config)
 ConfigPageInfo  TimeShifter::createConfigurationPage()
 {
     TimeShifterConfiguration *conf = new TimeShifterConfiguration(NULL, this);
-    TQObject::connect(this, TQT_SIGNAL(sigUpdateConfig()), conf, TQT_SLOT(slotUpdateConfig()));
+    TQObject::connect(this, TQ_SIGNAL(sigUpdateConfig()), conf, TQ_SLOT(slotUpdateConfig()));
     return ConfigPageInfo (conf,
                            i18n("Timeshifter"),
                            i18n("Timeshifter Options"),
diff --git a/plugins/v4lradio/v4lradio-configuration.cpp b/plugins/v4lradio/v4lradio-configuration.cpp
index ba041b9..0aedcb6 100644
--- a/plugins/v4lradio/v4lradio-configuration.cpp
+++ b/plugins/v4lradio/v4lradio-configuration.cpp
@@ -53,36 +53,36 @@ V4LRadioConfiguration::V4LRadioConfiguration (TQWidget *parent, SoundStreamID ss
     m_PlaybackChannelHelper(comboPlaybackMixerChannel),
     m_CaptureChannelHelper (comboCaptureMixerChannel)
 {
-    TQObject::connect(buttonSelectRadioDevice, TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(selectRadioDevice()));
+    TQObject::connect(buttonSelectRadioDevice, TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(selectRadioDevice()));
     editRadioDevice->installEventFilter(this);
-    TQObject::connect(editMinFrequency, TQT_SIGNAL(valueChanged(int)),
-                     this, TQT_SLOT(guiMinFrequencyChanged(int)));
-    TQObject::connect(editMaxFrequency, TQT_SIGNAL(valueChanged(int)),
-                     this, TQT_SLOT(guiMaxFrequencyChanged(int)));
-
-    TQObject::connect(editDeviceVolume, TQT_SIGNAL(valueChanged(double)),
-                     this, TQT_SLOT(slotDeviceVolumeChanged(double)));
-    TQObject::connect(editTreble, TQT_SIGNAL(valueChanged(double)),
-                     this, TQT_SLOT(slotTrebleChanged(double)));
-    TQObject::connect(editBass, TQT_SIGNAL(valueChanged(double)),
-                     this, TQT_SLOT(slotBassChanged(double)));
-    TQObject::connect(editBalance, TQT_SIGNAL(valueChanged(double)),
-                     this, TQT_SLOT(slotBalanceChanged(double)));
-
-    TQObject::connect(sliderDeviceVolume, TQT_SIGNAL(valueChanged(int)),
-                     this, TQT_SLOT(slotDeviceVolumeChanged(int)));
-    TQObject::connect(sliderTreble, TQT_SIGNAL(valueChanged(int)),
-                     this, TQT_SLOT(slotTrebleChanged(int)));
-    TQObject::connect(sliderBass, TQT_SIGNAL(valueChanged(int)),
-                     this, TQT_SLOT(slotBassChanged(int)));
-    TQObject::connect(sliderBalance, TQT_SIGNAL(valueChanged(int)),
-                     this, TQT_SLOT(slotBalanceChanged(int)));
-
-    TQObject::connect(comboPlaybackMixerDevice, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotComboPlaybackMixerSelected(int)));
-    TQObject::connect(comboCaptureMixerDevice, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotComboCaptureMixerSelected(int)));
+    TQObject::connect(editMinFrequency, TQ_SIGNAL(valueChanged(int)),
+                     this, TQ_SLOT(guiMinFrequencyChanged(int)));
+    TQObject::connect(editMaxFrequency, TQ_SIGNAL(valueChanged(int)),
+                     this, TQ_SLOT(guiMaxFrequencyChanged(int)));
+
+    TQObject::connect(editDeviceVolume, TQ_SIGNAL(valueChanged(double)),
+                     this, TQ_SLOT(slotDeviceVolumeChanged(double)));
+    TQObject::connect(editTreble, TQ_SIGNAL(valueChanged(double)),
+                     this, TQ_SLOT(slotTrebleChanged(double)));
+    TQObject::connect(editBass, TQ_SIGNAL(valueChanged(double)),
+                     this, TQ_SLOT(slotBassChanged(double)));
+    TQObject::connect(editBalance, TQ_SIGNAL(valueChanged(double)),
+                     this, TQ_SLOT(slotBalanceChanged(double)));
+
+    TQObject::connect(sliderDeviceVolume, TQ_SIGNAL(valueChanged(int)),
+                     this, TQ_SLOT(slotDeviceVolumeChanged(int)));
+    TQObject::connect(sliderTreble, TQ_SIGNAL(valueChanged(int)),
+                     this, TQ_SLOT(slotTrebleChanged(int)));
+    TQObject::connect(sliderBass, TQ_SIGNAL(valueChanged(int)),
+                     this, TQ_SLOT(slotBassChanged(int)));
+    TQObject::connect(sliderBalance, TQ_SIGNAL(valueChanged(int)),
+                     this, TQ_SLOT(slotBalanceChanged(int)));
+
+    TQObject::connect(comboPlaybackMixerDevice, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotComboPlaybackMixerSelected(int)));
+    TQObject::connect(comboCaptureMixerDevice, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotComboCaptureMixerSelected(int)));
 
     sliderBalance->installEventFilter(this);
 }
diff --git a/plugins/v4lradio/v4lradio.cpp b/plugins/v4lradio/v4lradio.cpp
index 963ec56..0f7ce01 100644
--- a/plugins/v4lradio/v4lradio.cpp
+++ b/plugins/v4lradio/v4lradio.cpp
@@ -95,7 +95,7 @@ V4LRadio::V4LRadio(const TQString &name)
     m_VolumeZeroOnPowerOff(false),
     m_restorePowerOn(false)
 {
-    TQObject::connect (&m_pollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(poll()));
+    TQObject::connect (&m_pollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(poll()));
     m_pollTimer.start(333);
 
     m_audio = new video_audio;