Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

3 files changed, 31 insertions, 31 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"),