Remove additional unneeded tq method conversions

2 files changed, 22 insertions, 22 deletions

diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
index 9baedf3..9b7693a 100644
--- a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
+++ b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
@@ -593,7 +593,7 @@
                                 <property name="text">
                                     <string>volume</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
@@ -683,7 +683,7 @@
                                 <property name="text">
                                     <string>treble</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
@@ -773,7 +773,7 @@
                                 <property name="text">
                                     <string>bass</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
@@ -860,7 +860,7 @@
                                 <property name="text">
                                     <string>balance</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
diff --git a/kradio3/plugins/v4lradio/v4lradio.cpp b/kradio3/plugins/v4lradio/v4lradio.cpp
index dbfec2a..e149ccf 100644
--- a/kradio3/plugins/v4lradio/v4lradio.cpp
+++ b/kradio3/plugins/v4lradio/v4lradio.cpp
@@ -656,7 +656,7 @@ bool V4LRadio::setFrequency(float freq)
 
           if (freq > maxf || freq < minf) {
               logError("V4LRadio::setFrequency: " +
-                     i18n("invalid frequency %1").tqarg(TQString().setNum(freq)));
+                     i18n("invalid frequency %1").arg(TQString().setNum(freq)));
             if (!oldMute && !m_ActivePlayback)
                 unmute(m_SoundStreamID);
             return false;
@@ -678,14 +678,14 @@ bool V4LRadio::setFrequency(float freq)
         else {
             logError("V4LRadio::setFrequency: " +
                      i18n("don't known how to handle V4L-version %1")
-                     .tqarg(m_caps.version));
+                     .arg(m_caps.version));
         }
 
           if (r) {
               logError("V4LRadio::setFrequency: " +
                      i18n("error setting frequency to %1 (%2)")
-                     .tqarg(TQString().setNum(freq))
-                     .tqarg(TQString().setNum(r)));
+                     .arg(TQString().setNum(freq))
+                     .arg(TQString().setNum(r)));
             // unmute the old radio with the old radio station
             if (!oldMute && !m_ActivePlayback)
                 unmute(m_SoundStreamID);
@@ -1001,7 +1001,7 @@ void   V4LRadio::restoreState (KConfig *config)
             else {
                 if (found_devname.isNull())
                     found_devname = *it;
-                logWarning(i18n("Device %1 does exist but is not readable/writable. Please check device permissions.").tqarg(*it));
+                logWarning(i18n("Device %1 does exist but is not readable/writable. Please check device permissions.").arg(*it));
             }
         }
     }
@@ -1123,7 +1123,7 @@ void V4LRadio::radio_init()
         radio_done();
 
         logError("V4LRadio::radio_init: " +
-                 i18n("Cannot open mixer device %1").tqarg(m_mixerDev));
+                 i18n("Cannot open mixer device %1").arg(m_mixerDev));
         return;
     }
 */
@@ -1132,7 +1132,7 @@ void V4LRadio::radio_init()
         radio_done();
 
         logError("V4LRadio::radio_init: " +
-                 i18n("Cannot open radio device %1").tqarg(m_radioDev));
+                 i18n("Cannot open radio device %1").arg(m_radioDev));
         return;
     }
 
@@ -1183,7 +1183,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
 
     if (fd < 0) {
         logError("V4LRadio::readV4LCaps: " +
-                 i18n("cannot open %1").tqarg(device));
+                 i18n("cannot open %1").arg(device));
         return c;
     }
 
@@ -1207,7 +1207,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
         video_audio audiocaps;
         if (0 == ioctl(fd, VIDIOCGAUDIO, &audiocaps)) {
             logDebug("V4LRadio::readV4LCaps: " +
-                     i18n("audio caps = %1").tqarg(TQString().setNum(audiocaps.flags)));
+                     i18n("audio caps = %1").arg(TQString().setNum(audiocaps.flags)));
             if ((audiocaps.flags & VIDEO_AUDIO_MUTABLE)  != 0)
                 c.hasMute = true;
             if ((audiocaps.flags & VIDEO_AUDIO_VOLUME)  != 0)
@@ -1230,7 +1230,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
     if (r == 0) {
         c.version  = 2;
 
-        logDebug(i18n("V4L2 - Version: %1").tqarg(TQString().sprintf("%08X", caps2.version)));
+        logDebug(i18n("V4L2 - Version: %1").arg(TQString().sprintf("%08X", caps2.version)));
 
         size_t l = sizeof(caps.name);
         l = l < CAPS_NAME_LEN ? l : CAPS_NAME_LEN;
@@ -1289,7 +1289,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
     }
 #endif
     if (c.version > 0) {
-        logInfo(i18n("V4L %1 detected").tqarg(c.version));
+        logInfo(i18n("V4L %1 detected").arg(c.version));
     } else {
         logError(i18n("V4L not detected"));
     }
@@ -1356,13 +1356,13 @@ bool V4LRadio::readTunerInfo() const
         else {
             logError("V4LRadio::readTunerInfo: " +
                      i18n("don't known how to handle V4L-version %1")
-                     .tqarg(TQString().setNum(m_caps.version)));
+                     .arg(TQString().setNum(m_caps.version)));
         }
 
         if (r != 0) {
             m_signalQuality = 0;
             logError("V4LRadio::readTunerInfo: " +
-                     i18n("cannot get tuner info (error %1)").tqarg(TQString().setNum(r)));
+                     i18n("cannot get tuner info (error %1)").arg(TQString().setNum(r)));
         }
     } else {
         m_signalQuality = 0;
@@ -1406,7 +1406,7 @@ bool V4LRadio::readTunerInfo() const
     } \
     x = x ? x : r; \
     if (r) \
-        logError(i18n("error setting %1: %2").tqarg(#what).tqarg(TQString().setNum(r))); \
+        logError(i18n("error setting %1: %2").arg(#what).arg(TQString().setNum(r))); \
  }
 
 #define V4L2_G_CTRL(what) \
@@ -1414,7 +1414,7 @@ bool V4LRadio::readTunerInfo() const
     r = ioctl (m_radio_fd, VIDIOC_G_CTRL, &ctl); \
     x = x ? x : r; \
     if (r) \
-        logError(i18n("error reading %1: %2").tqarg(#what).tqarg(TQString().setNum(r))); \
+        logError(i18n("error reading %1: %2").arg(#what).arg(TQString().setNum(r))); \
  }
 
 
@@ -1505,14 +1505,14 @@ bool V4LRadio::updateAudioInfo(bool write) const
         else  {
             logError("V4LRadio::updateAudioInfo: " +
                      i18n("don't known how to handle V4L-version %1")
-                     .tqarg(TQString().setNum(m_caps.version)));
+                     .arg(TQString().setNum(m_caps.version)));
         }
 
         if (r) {
             logError("V4LRadio::updateAudioInfo: " +
                      i18n("error updating radio audio info (%1): %2")
-                     .tqarg(write ? i18n("write") : i18n("read"))
-                     .tqarg(TQString().setNum(r)));
+                     .arg(write ? i18n("write") : i18n("read"))
+                     .arg(TQString().setNum(r)));
             return false;
         }
     }