Rename old tq methods that no longer need a unique name

7 files changed, 24 insertions, 24 deletions

diff --git a/kradio3/plugins/recording/encoder_mp3.cpp b/kradio3/plugins/recording/encoder_mp3.cpp
index 8d76fe2..15bc06c 100644
--- a/kradio3/plugins/recording/encoder_mp3.cpp
+++ b/kradio3/plugins/recording/encoder_mp3.cpp
@@ -126,7 +126,7 @@ bool RecordingEncodingMP3::openOutput(const TQString &output)
             if (!m_error) {
                 id3tag_init(m_LAMEFlags);
                 id3tag_add_v2(m_LAMEFlags);
-                TQString title  = m_RadioStation->name() + TQString().sprintf(" - %s", (TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)).ascii());
+                TQString title  = m_RadioStation->name() + TQString().sprintf(" - %s", (TQDateTime::currentDateTime().toString(Qt::ISODate)).ascii());
                 TQString comment = i18n("Recorded by KRadio");
                 size_t l = title.length() + comment.length() + 10;
                 m_ID3Tags = new char[l];
diff --git a/kradio3/plugins/recording/encoder_ogg.cpp b/kradio3/plugins/recording/encoder_ogg.cpp
index b51eedd..110238a 100644
--- a/kradio3/plugins/recording/encoder_ogg.cpp
+++ b/kradio3/plugins/recording/encoder_ogg.cpp
@@ -176,7 +176,7 @@ bool RecordingEncodingOgg::openOutput(const TQString &output)
     vorbis_comment_init (&vc);
     vorbis_comment_add_tag_new(&vc, "creator", "KRadio" VERSION);
     vorbis_comment_add_tag_new(&vc, "title",   m_RadioStation->longName().utf8());
-    vorbis_comment_add_tag_new(&vc, "date",    TQDateTime::tqcurrentDateTime().toString(Qt::ISODate));
+    vorbis_comment_add_tag_new(&vc, "date",    TQDateTime::currentDateTime().toString(Qt::ISODate));
 
     vorbis_analysis_headerout(&m_VorbisDSP, &vc,
                               &header_main, &header_comments, &header_codebooks);
diff --git a/kradio3/plugins/recording/recording-configuration-ui.ui b/kradio3/plugins/recording/recording-configuration-ui.ui
index e5ba41c..1c6ece2 100644
--- a/kradio3/plugins/recording/recording-configuration-ui.ui
+++ b/kradio3/plugins/recording/recording-configuration-ui.ui
@@ -66,7 +66,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>141</width>
                                                 <height>20</height>
@@ -107,7 +107,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>141</width>
                                                 <height>20</height>
@@ -222,7 +222,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>5</height>
@@ -263,7 +263,7 @@
                                 <property name="sizeType">
                                     <enum>Minimum</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>225</width>
                                         <height>20</height>
@@ -321,7 +321,7 @@
                                 <property name="sizeType">
                                     <enum>Minimum</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>225</width>
                                         <height>20</height>
@@ -454,7 +454,7 @@
                                 <property name="sizeType">
                                     <enum>Minimum</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>225</width>
                                         <height>20</height>
@@ -473,7 +473,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>5</height>
@@ -563,7 +563,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -623,7 +623,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>380</width>
                                                 <height>20</height>
@@ -688,7 +688,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
diff --git a/kradio3/plugins/recording/recording-datamonitor.cpp b/kradio3/plugins/recording/recording-datamonitor.cpp
index 8f22b1a..00b4755 100644
--- a/kradio3/plugins/recording/recording-datamonitor.cpp
+++ b/kradio3/plugins/recording/recording-datamonitor.cpp
@@ -50,7 +50,7 @@ RecordingDataMonitor::RecordingDataMonitor(TQWidget *parent, const char *name)
     setColors(TQColor(20, 244, 20),
               TQColor(10, 117, 10));
 
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+    setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 }
 
 
@@ -107,10 +107,10 @@ void RecordingDataMonitor::internalDrawContents(TQPainter &painter, bool repaint
     if (m_channels <= 0) return;
     TQRect r = contentsRect();
 
-    TQPen   activePen      (tqcolorGroup().color(TQColorGroup::Text), 1);
-    TQPen   inactivePen    (tqcolorGroup().color(TQColorGroup::Mid),  1);
-    TQBrush activeBrush   = tqcolorGroup().brush(TQColorGroup::Text);
-    TQBrush inactiveBrush = tqcolorGroup().brush(TQColorGroup::Mid);
+    TQPen   activePen      (colorGroup().color(TQColorGroup::Text), 1);
+    TQPen   inactivePen    (colorGroup().color(TQColorGroup::Mid),  1);
+    TQBrush activeBrush   = colorGroup().brush(TQColorGroup::Text);
+    TQBrush inactiveBrush = colorGroup().brush(TQColorGroup::Mid);
     TQBrush yellowBrush(TQColor(255,255,0));
     TQBrush orangeBrush(TQColor(255,192,0));
     TQBrush redBrush   (TQColor(255,0, 0));
@@ -223,11 +223,11 @@ bool RecordingDataMonitor::setColors(const TQColor &activeText,
     if (parentWidget() && parentWidget()->backgroundPixmap() ){
         KPixmapIO io;
         TQImage  i = io.convertToImage(*parentWidget()->backgroundPixmap());
-        KImageEffect::fade(i, 0.5, tqcolorGroup().color(TQColorGroup::Dark));
+        KImageEffect::fade(i, 0.5, colorGroup().color(TQColorGroup::Dark));
         setPaletteBackgroundPixmap(io.convertToPixmap(i));
         setBackgroundOrigin(WindowOrigin);
     } else {
-        setBackgroundColor(tqcolorGroup().color(TQColorGroup::Button));
+        setBackgroundColor(colorGroup().color(TQColorGroup::Button));
     }
 
     return true;
diff --git a/kradio3/plugins/recording/recording-monitor.cpp b/kradio3/plugins/recording/recording-monitor.cpp
index 063a095..24c2e05 100644
--- a/kradio3/plugins/recording/recording-monitor.cpp
+++ b/kradio3/plugins/recording/recording-monitor.cpp
@@ -43,7 +43,7 @@ RecordingMonitor::RecordingMonitor(const TQString &name)
     l0->addWidget(                      new TQLabel(i18n("SoundStream"),    this), 0, 0);
     l0->addWidget(m_comboSoundStreamSelector = new KComboBox(              this), 0, 1);
     l0->addWidget(                      new TQLabel(i18n("Status"),         this), 1, 0);
-    l0->addWidget(m_labeltqStatus       = new TQLabel(i18n("<undefined>"),    this), 1, 1);
+    l0->addWidget(m_labelStatus       = new TQLabel(i18n("<undefined>"),    this), 1, 1);
     l0->addWidget(                      new TQLabel(i18n("Recording File"), this), 2, 0);
     l0->addWidget(m_labelFileName     = new TQLabel(i18n("<undefined>"),    this), 2, 1);
     l0->addWidget(                      new TQLabel(i18n("File Size"),      this), 3, 0);
@@ -369,7 +369,7 @@ void RecordingMonitor::slotStreamSelected(int idx)
         m_labelTime     ->setEnabled(true);
         m_labelRate     ->setEnabled(true);
         m_labelFileName ->setEnabled(true);
-        m_labeltqStatus   ->setEnabled(true);
+        m_labelStatus   ->setEnabled(true);
     } else {
         m_dataMonitor   ->setEnabled(false);
         m_labelSize     ->setEnabled(false);
@@ -377,7 +377,7 @@ void RecordingMonitor::slotStreamSelected(int idx)
         m_labelTime     ->setEnabled(false);
         m_labelRate     ->setEnabled(false);
         m_labelFileName ->setEnabled(false);
-        m_labeltqStatus   ->setEnabled(false);
+        m_labelStatus   ->setEnabled(false);
     }
     m_currentStream = id;
     m_recording = false;
diff --git a/kradio3/plugins/recording/recording-monitor.h b/kradio3/plugins/recording/recording-monitor.h
index a979c02..5f9247a 100644
--- a/kradio3/plugins/recording/recording-monitor.h
+++ b/kradio3/plugins/recording/recording-monitor.h
@@ -105,7 +105,7 @@ protected:
     TQLabel               *m_labelTime;
     TQLabel               *m_labelRate;
     TQLabel               *m_labelFileName;
-    TQLabel               *m_labeltqStatus;
+    TQLabel               *m_labelStatus;
     TQPushButton          *m_btnStartStop;
 
     KComboBox               *m_comboSoundStreamSelector;
diff --git a/kradio3/plugins/recording/recording.cpp b/kradio3/plugins/recording/recording.cpp
index ca11bfe..9707de9 100644
--- a/kradio3/plugins/recording/recording.cpp
+++ b/kradio3/plugins/recording/recording.cpp
@@ -529,7 +529,7 @@ bool Recording::startEncoder(SoundStreamID ssid, const RecordingConfig &cfg)
     TQString station = rs  ? rs->name() + "-" : "";
     station.replace(TQRegExp("[/*?]"), "_");
 
-    TQDate date = TQDate::tqcurrentDate();
+    TQDate date = TQDate::currentDate();
     TQTime time = TQTime::currentTime();
     TQString sdate;