summaryrefslogtreecommitdiffstats
path: root/kradio3/plugins/v4lradio
diff options
context:
space:
mode:
Diffstat (limited to 'kradio3/plugins/v4lradio')
-rw-r--r--kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui56
-rw-r--r--kradio3/plugins/v4lradio/v4lradio.cpp38
2 files changed, 47 insertions, 47 deletions
diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
index 06550c7..130d440 100644
--- a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
+++ b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>21</height>
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>21</height>
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>21</height>
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>21</height>
@@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>21</height>
@@ -154,7 +154,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>152</width>
<height>21</height>
@@ -292,7 +292,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>5</width>
<height>5</height>
@@ -374,7 +374,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="2">
<property name="name">
- <cstring>tqlayout37</cstring>
+ <cstring>layout37</cstring>
</property>
<hbox>
<property name="name">
@@ -549,7 +549,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>5</height>
@@ -574,7 +574,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout35</cstring>
+ <cstring>layout35</cstring>
</property>
<vbox>
<property name="name">
@@ -593,13 +593,13 @@
<property name="text">
<string>volume</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout34</cstring>
+ <cstring>layout34</cstring>
</property>
<hbox>
<property name="name">
@@ -615,7 +615,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -643,7 +643,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -664,7 +664,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout35_2</cstring>
+ <cstring>layout35_2</cstring>
</property>
<vbox>
<property name="name">
@@ -683,13 +683,13 @@
<property name="text">
<string>treble</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout34_2</cstring>
+ <cstring>layout34_2</cstring>
</property>
<hbox>
<property name="name">
@@ -705,7 +705,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -733,7 +733,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -754,7 +754,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="2">
<property name="name">
- <cstring>tqlayout35_2_2</cstring>
+ <cstring>layout35_2_2</cstring>
</property>
<vbox>
<property name="name">
@@ -773,13 +773,13 @@
<property name="text">
<string>bass</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout34_2_3</cstring>
+ <cstring>layout34_2_3</cstring>
</property>
<hbox>
<property name="name">
@@ -795,7 +795,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -823,7 +823,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -844,7 +844,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="3">
<property name="name">
- <cstring>tqlayout51</cstring>
+ <cstring>layout51</cstring>
</property>
<vbox>
<property name="name">
@@ -860,7 +860,7 @@
<property name="text">
<string>balance</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -874,7 +874,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>33</height>
@@ -911,7 +911,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>33</height>
diff --git a/kradio3/plugins/v4lradio/v4lradio.cpp b/kradio3/plugins/v4lradio/v4lradio.cpp
index dbfec2a..f39334f 100644
--- a/kradio3/plugins/v4lradio/v4lradio.cpp
+++ b/kradio3/plugins/v4lradio/v4lradio.cpp
@@ -31,7 +31,7 @@
#include <string.h> // memcpy needed
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfile.h>
#include <tqfileinfo.h>
#include <tqvaluelist.h>
@@ -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;
}
}