Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

3 files changed, 34 insertions, 34 deletions

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);