diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 03:43:07 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 03:43:07 +0000 |
commit | 70b9eea2ba01c3691497f49e4c45cb070c16193c (patch) | |
tree | 9a6df61aa247a27275aad9c5245e419e89c2c640 /kradio3/plugins/v4lradio | |
parent | 998c1384ace4ae4655997c181fa33242148cd0a4 (diff) | |
download | tderadio-70b9eea2ba01c3691497f49e4c45cb070c16193c.tar.gz tderadio-70b9eea2ba01c3691497f49e4c45cb070c16193c.zip |
TQt4 port kradio
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kradio@1238952 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kradio3/plugins/v4lradio')
-rw-r--r-- | kradio3/plugins/v4lradio/linux/videodev.h | 4 | ||||
-rw-r--r-- | kradio3/plugins/v4lradio/linux/videodev2.h | 24 | ||||
-rw-r--r-- | kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp | 44 | ||||
-rw-r--r-- | kradio3/plugins/v4lradio/v4lcfg_interfaces.h | 60 | ||||
-rw-r--r-- | kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui | 150 | ||||
-rw-r--r-- | kradio3/plugins/v4lradio/v4lradio-configuration.cpp | 132 | ||||
-rw-r--r-- | kradio3/plugins/v4lradio/v4lradio-configuration.h | 23 | ||||
-rw-r--r-- | kradio3/plugins/v4lradio/v4lradio.cpp | 122 | ||||
-rw-r--r-- | kradio3/plugins/v4lradio/v4lradio.h | 51 |
9 files changed, 306 insertions, 304 deletions
diff --git a/kradio3/plugins/v4lradio/linux/videodev.h b/kradio3/plugins/v4lradio/linux/videodev.h index e16a8a8..0d7a5c0 100644 --- a/kradio3/plugins/v4lradio/linux/videodev.h +++ b/kradio3/plugins/v4lradio/linux/videodev.h @@ -389,9 +389,9 @@ struct video_code #define VID_HARDWARE_BT848 1 -#define VID_HARDWARE_QCAM_BW 2 +#define VID_HARDWARE_TQCAM_BW 2 #define VID_HARDWARE_PMS 3 -#define VID_HARDWARE_QCAM_C 4 +#define VID_HARDWARE_TQCAM_C 4 #define VID_HARDWARE_PSEUDO 5 #define VID_HARDWARE_SAA5249 6 #define VID_HARDWARE_AZTECH 7 diff --git a/kradio3/plugins/v4lradio/linux/videodev2.h b/kradio3/plugins/v4lradio/linux/videodev2.h index c41831a..5977820 100644 --- a/kradio3/plugins/v4lradio/linux/videodev2.h +++ b/kradio3/plugins/v4lradio/linux/videodev2.h @@ -391,7 +391,7 @@ struct v4l2_buffer /* Flags for 'flags' field */ #define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */ -#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */ +#define V4L2_BUF_FLAG_TQUEUED 0x0002 /* Buffer is queued for processing */ #define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */ #define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */ #define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */ @@ -450,7 +450,7 @@ struct v4l2_captureparm __u32 reserved[4]; }; /* Flags for 'capability' and 'capturemode' fields */ -#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ +#define V4L2_MODE_HIGHTQUALITY 0x0001 /* High quality imaging mode */ #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ struct v4l2_outputparm @@ -623,7 +623,7 @@ struct v4l2_control __s32 value; }; -/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ +/* Used in the VIDIOC_TQUERYCTRL ioctl for querying controls */ struct v4l2_queryctrl { __u32 id; @@ -637,7 +637,7 @@ struct v4l2_queryctrl __u32 reserved[2]; }; -/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */ +/* Used in the VIDIOC_TQUERYMENU ioctl for querying menu items */ struct v4l2_querymenu { __u32 id; @@ -828,7 +828,7 @@ struct v4l2_streamparm * I O C T L C O D E S F O R V I D E O D E V I C E S * */ -#define VIDIOC_QUERYCAP _IOR ('V', 0, struct v4l2_capability) +#define VIDIOC_TQUERYCAP _IOR ('V', 0, struct v4l2_capability) #define VIDIOC_RESERVED _IO ('V', 1) #define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc) #define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format) @@ -837,13 +837,13 @@ struct v4l2_streamparm #define VIDIOC_G_COMP _IOR ('V', 6, struct v4l2_compression) #define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression) #endif -#define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) -#define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) +#define VIDIOC_RETQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) +#define VIDIOC_TQUERYBUF _IOWR ('V', 9, struct v4l2_buffer) #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) #define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) #define VIDIOC_OVERLAY _IOW ('V', 14, int) -#define VIDIOC_QBUF _IOWR ('V', 15, struct v4l2_buffer) -#define VIDIOC_DQBUF _IOWR ('V', 17, struct v4l2_buffer) +#define VIDIOC_TQBUF _IOWR ('V', 15, struct v4l2_buffer) +#define VIDIOC_DTQBUF _IOWR ('V', 17, struct v4l2_buffer) #define VIDIOC_STREAMON _IOW ('V', 18, int) #define VIDIOC_STREAMOFF _IOW ('V', 19, int) #define VIDIOC_G_PARM _IOWR ('V', 21, struct v4l2_streamparm) @@ -858,8 +858,8 @@ struct v4l2_streamparm #define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner) #define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio) #define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio) -#define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) -#define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) +#define VIDIOC_TQUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) +#define VIDIOC_TQUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) #define VIDIOC_G_INPUT _IOR ('V', 38, int) #define VIDIOC_S_INPUT _IOWR ('V', 39, int) #define VIDIOC_G_OUTPUT _IOR ('V', 46, int) @@ -876,7 +876,7 @@ struct v4l2_streamparm #define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop) #define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression) #define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression) -#define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id) +#define VIDIOC_TQUERYSTD _IOR ('V', 63, v4l2_std_id) #define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format) #define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio) #define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout) diff --git a/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp b/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp index c679c76..ea0d110 100644 --- a/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp +++ b/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp @@ -22,7 +22,7 @@ V4LCaps::V4LCaps() : version(0), - description(QString::null), + description(TQString()), hasMute(false), hasVolume(false), minVolume(0), @@ -62,13 +62,13 @@ V4LCaps::V4LCaps(const V4LCaps &c) // IV4LCfg -IF_IMPL_SENDER ( IV4LCfg::notifyRadioDeviceChanged(const QString &s), +IF_IMPL_SENDER ( IV4LCfg::notifyRadioDeviceChanged(const TQString &s), noticeRadioDeviceChanged(s) ) -IF_IMPL_SENDER ( IV4LCfg::notifyPlaybackMixerChanged(const QString &s, const QString &Channel), +IF_IMPL_SENDER ( IV4LCfg::notifyPlaybackMixerChanged(const TQString &s, const TQString &Channel), noticePlaybackMixerChanged(s, Channel) ) -IF_IMPL_SENDER ( IV4LCfg::notifyCaptureMixerChanged(const QString &s, const QString &Channel), +IF_IMPL_SENDER ( IV4LCfg::notifyCaptureMixerChanged(const TQString &s, const TQString &Channel), noticeCaptureMixerChanged(s, Channel) ) IF_IMPL_SENDER ( IV4LCfg::notifyDeviceVolumeChanged(float v), @@ -91,13 +91,13 @@ IF_IMPL_SENDER ( IV4LCfg::notifyVolumeZeroOnPowerOffChanged(bool a), ) // IV4LCfgClient -IF_IMPL_SENDER ( IV4LCfgClient::sendRadioDevice (const QString &s), +IF_IMPL_SENDER ( IV4LCfgClient::sendRadioDevice (const TQString &s), setRadioDevice(s) ) -IF_IMPL_SENDER ( IV4LCfgClient::sendPlaybackMixer(const QString &s, const QString &ch), +IF_IMPL_SENDER ( IV4LCfgClient::sendPlaybackMixer(const TQString &s, const TQString &ch), setPlaybackMixer(s, ch) ) -IF_IMPL_SENDER ( IV4LCfgClient::sendCaptureMixer(const QString &s, const QString &ch), +IF_IMPL_SENDER ( IV4LCfgClient::sendCaptureMixer(const TQString &s, const TQString &ch), setCaptureMixer(s, ch) ) IF_IMPL_SENDER ( IV4LCfgClient::sendDeviceVolume(float v), @@ -116,51 +116,51 @@ IF_IMPL_SENDER ( IV4LCfgClient::sendVolumeZeroOnPowerOff(bool a), setVolumeZeroOnPowerOff(a) ) -static QString defaultRDev("/dev/radio"); -// static QString defaultMDev("/dev/mixer"); +static TQString defaultRDev("/dev/radio"); +// static TQString defaultMDev("/dev/mixer"); -IF_IMPL_QUERY ( const QString &IV4LCfgClient::queryRadioDevice (), +IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryRadioDevice (), getRadioDevice(), defaultRDev ) -IF_IMPL_QUERY ( const QString &IV4LCfgClient::queryPlaybackMixerID (), +IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryPlaybackMixerID (), getPlaybackMixerID(), - QString::null + TQString() ) -IF_IMPL_QUERY ( const QString &IV4LCfgClient::queryCaptureMixerID (), +IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryCaptureMixerID (), getCaptureMixerID(), - QString::null + TQString() ) -static const QString channel_line("Line"); -IF_IMPL_QUERY ( const QString &IV4LCfgClient::queryPlaybackMixerChannel(), +static const TQString channel_line("Line"); +IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryPlaybackMixerChannel(), getPlaybackMixerChannel(), channel_line ) -IF_IMPL_QUERY ( const QString &IV4LCfgClient::queryCaptureMixerChannel(), +IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryCaptureMixerChannel(), getCaptureMixerChannel(), channel_line ) -IF_IMPL_QUERY ( float IV4LCfgClient::queryDeviceVolume (), +IF_IMPL_TQUERY ( float IV4LCfgClient::queryDeviceVolume (), getDeviceVolume(), 0.0 ) -IF_IMPL_QUERY ( V4LCaps IV4LCfgClient::queryCapabilities(QString dev), +IF_IMPL_TQUERY ( V4LCaps IV4LCfgClient::queryCapabilities(TQString dev), getCapabilities(dev), V4LCaps() ) -IF_IMPL_QUERY ( bool IV4LCfgClient::queryActivePlayback(), +IF_IMPL_TQUERY ( bool IV4LCfgClient::queryActivePlayback(), getActivePlayback(), false ) -IF_IMPL_QUERY ( bool IV4LCfgClient::queryMuteOnPowerOff(), +IF_IMPL_TQUERY ( bool IV4LCfgClient::queryMuteOnPowerOff(), getMuteOnPowerOff(), false ) -IF_IMPL_QUERY ( bool IV4LCfgClient::queryVolumeZeroOnPowerOff(), +IF_IMPL_TQUERY ( bool IV4LCfgClient::queryVolumeZeroOnPowerOff(), getVolumeZeroOnPowerOff(), false ) diff --git a/kradio3/plugins/v4lradio/v4lcfg_interfaces.h b/kradio3/plugins/v4lradio/v4lcfg_interfaces.h index f2e1032..2a099e1 100644 --- a/kradio3/plugins/v4lradio/v4lcfg_interfaces.h +++ b/kradio3/plugins/v4lradio/v4lcfg_interfaces.h @@ -24,7 +24,7 @@ struct V4LCaps { int version; - QString description; + TQString description; bool hasMute; @@ -74,18 +74,18 @@ public: IF_CON_DESTRUCTOR(IV4LCfg, -1) RECEIVERS: - IF_RECEIVER( setRadioDevice (const QString &s) ) - IF_RECEIVER( setPlaybackMixer(const QString &soundStreamClientID, const QString &ch) ) - IF_RECEIVER( setCaptureMixer (const QString &soundStreamClientID, const QString &ch) ) + IF_RECEIVER( setRadioDevice (const TQString &s) ) + IF_RECEIVER( setPlaybackMixer(const TQString &soundStreamClientID, const TQString &ch) ) + IF_RECEIVER( setCaptureMixer (const TQString &soundStreamClientID, const TQString &ch) ) IF_RECEIVER( setDeviceVolume(float v) ) IF_RECEIVER( setActivePlayback(bool a) ) IF_RECEIVER( setMuteOnPowerOff(bool m) ) IF_RECEIVER( setVolumeZeroOnPowerOff(bool m) ) SENDERS: - IF_SENDER ( notifyRadioDeviceChanged (const QString &s) ) - IF_SENDER ( notifyPlaybackMixerChanged(const QString &soundStreamClientID, const QString &Channel) ) - IF_SENDER ( notifyCaptureMixerChanged (const QString &soundStreamClientID, const QString &Channel) ) + IF_SENDER ( notifyRadioDeviceChanged (const TQString &s) ) + IF_SENDER ( notifyPlaybackMixerChanged(const TQString &soundStreamClientID, const TQString &Channel) ) + IF_SENDER ( notifyCaptureMixerChanged (const TQString &soundStreamClientID, const TQString &Channel) ) IF_SENDER ( notifyDeviceVolumeChanged (float v) ) IF_SENDER ( notifyCapabilitiesChanged (const V4LCaps &) ) IF_SENDER ( notifyActivePlaybackChanged (bool a) ) @@ -93,13 +93,13 @@ SENDERS: IF_SENDER ( notifyVolumeZeroOnPowerOffChanged (bool a) ) ANSWERS: - IF_ANSWER ( const QString &getRadioDevice () const ) - IF_ANSWER ( const QString &getPlaybackMixerID () const ) - IF_ANSWER ( const QString &getCaptureMixerID () const ) - IF_ANSWER ( const QString &getPlaybackMixerChannel() const ) - IF_ANSWER ( const QString &getCaptureMixerChannel() const ) + IF_ANSWER ( const TQString &getRadioDevice () const ) + IF_ANSWER ( const TQString &getPlaybackMixerID () const ) + IF_ANSWER ( const TQString &getCaptureMixerID () const ) + IF_ANSWER ( const TQString &getPlaybackMixerChannel() const ) + IF_ANSWER ( const TQString &getCaptureMixerChannel() const ) IF_ANSWER ( float getDeviceVolume() const ) - IF_ANSWER ( V4LCaps getCapabilities(QString dev = QString::null) const ) + IF_ANSWER ( V4LCaps getCapabilities(TQString dev = TQString()) const ) IF_ANSWER ( bool getActivePlayback() const ) IF_ANSWER ( bool getMuteOnPowerOff() const ) IF_ANSWER ( bool getVolumeZeroOnPowerOff() const ) @@ -113,35 +113,35 @@ public: IF_CON_DESTRUCTOR(IV4LCfgClient, 1) SENDERS: - IF_SENDER ( sendRadioDevice (const QString &s) ) - IF_SENDER ( sendPlaybackMixer(const QString &soundStreamClientID, const QString &ch) ) - IF_SENDER ( sendCaptureMixer (const QString &soundStreamClientID, const QString &ch) ) + IF_SENDER ( sendRadioDevice (const TQString &s) ) + IF_SENDER ( sendPlaybackMixer(const TQString &soundStreamClientID, const TQString &ch) ) + IF_SENDER ( sendCaptureMixer (const TQString &soundStreamClientID, const TQString &ch) ) IF_SENDER ( sendDeviceVolume(float v) ) IF_SENDER ( sendActivePlayback(bool a) ) IF_SENDER ( sendMuteOnPowerOff(bool a) ) IF_SENDER ( sendVolumeZeroOnPowerOff(bool a) ) RECEIVERS: - IF_RECEIVER( noticeRadioDeviceChanged(const QString &s) ) - IF_RECEIVER( noticePlaybackMixerChanged(const QString &soundStreamClientID, const QString &Channel) ) - IF_RECEIVER( noticeCaptureMixerChanged (const QString &soundStreamClientID, const QString &Channel) ) + IF_RECEIVER( noticeRadioDeviceChanged(const TQString &s) ) + IF_RECEIVER( noticePlaybackMixerChanged(const TQString &soundStreamClientID, const TQString &Channel) ) + IF_RECEIVER( noticeCaptureMixerChanged (const TQString &soundStreamClientID, const TQString &Channel) ) IF_RECEIVER( noticeDeviceVolumeChanged(float v) ) IF_RECEIVER( noticeCapabilitiesChanged(const V4LCaps &) ) IF_RECEIVER( noticeActivePlaybackChanged(bool a) ) IF_RECEIVER( noticeMuteOnPowerOffChanged(bool a) ) IF_RECEIVER( noticeVolumeZeroOnPowerOffChanged(bool a) ) -QUERIES: - IF_QUERY ( const QString &queryRadioDevice () ) - IF_QUERY ( const QString &queryPlaybackMixerID () ) - IF_QUERY ( const QString &queryCaptureMixerID () ) - IF_QUERY ( const QString &queryPlaybackMixerChannel() ) - IF_QUERY ( const QString &queryCaptureMixerChannel() ) - IF_QUERY ( float queryDeviceVolume() ) - IF_QUERY ( V4LCaps queryCapabilities(QString dev = QString::null) ) - IF_QUERY ( bool queryActivePlayback() ) - IF_QUERY ( bool queryMuteOnPowerOff() ) - IF_QUERY ( bool queryVolumeZeroOnPowerOff() ) +TQUERIES: + IF_TQUERY ( const TQString &queryRadioDevice () ) + IF_TQUERY ( const TQString &queryPlaybackMixerID () ) + IF_TQUERY ( const TQString &queryCaptureMixerID () ) + IF_TQUERY ( const TQString &queryPlaybackMixerChannel() ) + IF_TQUERY ( const TQString &queryCaptureMixerChannel() ) + IF_TQUERY ( float queryDeviceVolume() ) + IF_TQUERY ( V4LCaps queryCapabilities(TQString dev = TQString()) ) + IF_TQUERY ( bool queryActivePlayback() ) + IF_TQUERY ( bool queryMuteOnPowerOff() ) + IF_TQUERY ( bool queryVolumeZeroOnPowerOff() ) RECEIVERS: virtual void noticeConnectedI (cmplInterface *, bool /*pointer_valid*/); diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui index 2cc4cfd..165ebfa 100644 --- a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui +++ b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>V4LRadioConfigurationUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>V4LRadioConfigurationUI</cstring> </property> @@ -22,14 +22,14 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>kTabWidget1</cstring> </property> <property name="currentPage"> <number>0</number> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -53,14 +53,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>labelPlaybackMixerDevice</cstring> </property> @@ -68,7 +68,7 @@ <string>Playback Mixer Device</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>labelPlaybackMixerChannel</cstring> </property> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>21</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>21</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>21</height> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>21</height> @@ -154,14 +154,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>152</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>labelRadioDevice</cstring> </property> @@ -169,7 +169,7 @@ <string>Radio Device</string> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>buttonSelectRadioDevice</cstring> </property> @@ -188,7 +188,7 @@ <iconset>"fileopen"</iconset> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>labelCaptureMixerDevice</cstring> </property> @@ -196,7 +196,7 @@ <string>Capture Mixer Device</string> </property> </widget> - <widget class="QComboBox" row="5" column="1"> + <widget class="TQComboBox" row="5" column="1"> <property name="name"> <cstring>comboCaptureMixerChannel</cstring> </property> @@ -209,7 +209,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>labelCaptureMixerChannel</cstring> </property> @@ -217,7 +217,7 @@ <string>Capture Mixer Channel</string> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <property name="name"> <cstring>comboCaptureMixerDevice</cstring> </property> @@ -230,7 +230,7 @@ </sizepolicy> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <property name="name"> <cstring>comboPlaybackMixerChannel</cstring> </property> @@ -243,7 +243,7 @@ </sizepolicy> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>test</string> @@ -261,7 +261,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>labelDescription</cstring> </property> @@ -269,7 +269,7 @@ <string>unknown v4l device</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>editRadioDevice</cstring> </property> @@ -292,14 +292,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>5</width> <height>5</height> </size> </property> </spacer> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_checkboxActivePlayback</cstring> </property> @@ -318,7 +318,7 @@ <string>Alt+Y</string> </property> </widget> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_checkboxMuteOnPowerOff</cstring> </property> @@ -337,7 +337,7 @@ <string>Alt+B</string> </property> </widget> - <widget class="QCheckBox" row="8" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_checkboxVolumeZeroOnPowerOff</cstring> </property> @@ -358,7 +358,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -372,9 +372,9 @@ <property name="margin"> <number>11</number> </property> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout37</cstring> + <cstring>tqlayout37</cstring> </property> <hbox> <property name="name"> @@ -383,7 +383,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelFrequencyRange</cstring> </property> @@ -394,7 +394,7 @@ <string>to</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>editMaxFrequency</cstring> </property> @@ -427,7 +427,7 @@ </widget> </hbox> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>editScanStep</cstring> </property> @@ -452,7 +452,7 @@ <number>50</number> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>labelSignalMinQuality</cstring> </property> @@ -460,7 +460,7 @@ <string>minimum signal quality</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>editMinFrequency</cstring> </property> @@ -491,7 +491,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>labelScanStep</cstring> </property> @@ -499,7 +499,7 @@ <string>station scan step</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>labelMinMaxFrequency</cstring> </property> @@ -507,7 +507,7 @@ <string>allowed frequency range</string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -515,7 +515,7 @@ <string></string> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>editSignalMinQuality</cstring> </property> @@ -531,7 +531,7 @@ <number>75</number> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel1_4_2</cstring> </property> @@ -549,7 +549,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>5</height> @@ -558,7 +558,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -572,9 +572,9 @@ <property name="margin"> <number>11</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout35</cstring> + <cstring>tqlayout35</cstring> </property> <vbox> <property name="name"> @@ -586,20 +586,20 @@ <property name="spacing"> <number>3</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelDeviceVolume</cstring> </property> <property name="text"> <string>volume</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout34</cstring> + <cstring>tqlayout34</cstring> </property> <hbox> <property name="name"> @@ -615,14 +615,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>sliderDeviceVolume</cstring> </property> @@ -643,7 +643,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -662,9 +662,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout35_2</cstring> + <cstring>tqlayout35_2</cstring> </property> <vbox> <property name="name"> @@ -676,20 +676,20 @@ <property name="spacing"> <number>3</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelTreble</cstring> </property> <property name="text"> <string>treble</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout34_2</cstring> + <cstring>tqlayout34_2</cstring> </property> <hbox> <property name="name"> @@ -705,14 +705,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>sliderTreble</cstring> </property> @@ -733,7 +733,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -752,9 +752,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout35_2_2</cstring> + <cstring>tqlayout35_2_2</cstring> </property> <vbox> <property name="name"> @@ -766,20 +766,20 @@ <property name="spacing"> <number>3</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelBass</cstring> </property> <property name="text"> <string>bass</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout34_2_3</cstring> + <cstring>tqlayout34_2_3</cstring> </property> <hbox> <property name="name"> @@ -795,14 +795,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>sliderBass</cstring> </property> @@ -823,7 +823,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -842,9 +842,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="3"> + <widget class="TQLayoutWidget" row="0" column="3"> <property name="name"> - <cstring>layout51</cstring> + <cstring>tqlayout51</cstring> </property> <vbox> <property name="name"> @@ -853,14 +853,14 @@ <property name="spacing"> <number>3</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelBalance</cstring> </property> <property name="text"> <string>balance</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -874,14 +874,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>33</height> </size> </property> </spacer> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>sliderBalance</cstring> </property> @@ -911,7 +911,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>33</height> @@ -951,7 +951,7 @@ <include location="global" impldecl="in implementation">knuminput.h</include> </includes> <pixmapfunction>SmallIconSet</pixmapfunction> -<layoutdefaults spacing="6" margin="0"/> +<tqlayoutdefaults spacing="6" margin="0"/> <includehints> <includehint>ktabwidget.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration.cpp b/kradio3/plugins/v4lradio/v4lradio-configuration.cpp index f7472fc..ed8c61d 100644 --- a/kradio3/plugins/v4lradio/v4lradio-configuration.cpp +++ b/kradio3/plugins/v4lradio/v4lradio-configuration.cpp @@ -20,14 +20,14 @@ #include <unistd.h> #include <linux/soundcard.h> -#include <qspinbox.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qfile.h> -#include <qpushbutton.h> -#include <qslider.h> -#include <qcheckbox.h> +#include <tqspinbox.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqfile.h> +#include <tqpushbutton.h> +#include <tqslider.h> +#include <tqcheckbox.h> #include <kfiledialog.h> #include <knuminput.h> @@ -39,8 +39,8 @@ #include "v4lradio-configuration.h" #include "v4lradio.h" -V4LRadioConfiguration::V4LRadioConfiguration (QWidget *parent, SoundStreamID ssid) - : V4LRadioConfigurationUI(parent), +V4LRadioConfiguration::V4LRadioConfiguration (TQWidget *tqparent, SoundStreamID ssid) + : V4LRadioConfigurationUI(tqparent), m_SoundStreamID(ssid), m_ignoreGUIChanges(false), m_myControlChange(0), @@ -53,36 +53,36 @@ V4LRadioConfiguration::V4LRadioConfiguration (QWidget *parent, SoundStreamID ssi m_PlaybackChannelHelper(comboPlaybackMixerChannel), m_CaptureChannelHelper (comboCaptureMixerChannel) { - QObject::connect(buttonSelectRadioDevice, SIGNAL(clicked()), - this, SLOT(selectRadioDevice())); + TQObject::connect(buttonSelectRadioDevice, TQT_SIGNAL(clicked()), + this, TQT_SLOT(selectRadioDevice())); editRadioDevice->installEventFilter(this); - QObject::connect(editMinFrequency, SIGNAL(valueChanged(int)), - this, SLOT(guiMinFrequencyChanged(int))); - QObject::connect(editMaxFrequency, SIGNAL(valueChanged(int)), - this, SLOT(guiMaxFrequencyChanged(int))); - - QObject::connect(editDeviceVolume, SIGNAL(valueChanged(double)), - this, SLOT(slotDeviceVolumeChanged(double))); - QObject::connect(editTreble, SIGNAL(valueChanged(double)), - this, SLOT(slotTrebleChanged(double))); - QObject::connect(editBass, SIGNAL(valueChanged(double)), - this, SLOT(slotBassChanged(double))); - QObject::connect(editBalance, SIGNAL(valueChanged(double)), - this, SLOT(slotBalanceChanged(double))); - - QObject::connect(sliderDeviceVolume, SIGNAL(valueChanged(int)), - this, SLOT(slotDeviceVolumeChanged(int))); - QObject::connect(sliderTreble, SIGNAL(valueChanged(int)), - this, SLOT(slotTrebleChanged(int))); - QObject::connect(sliderBass, SIGNAL(valueChanged(int)), - this, SLOT(slotBassChanged(int))); - QObject::connect(sliderBalance, SIGNAL(valueChanged(int)), - this, SLOT(slotBalanceChanged(int))); - - QObject::connect(comboPlaybackMixerDevice, SIGNAL(activated(int)), - this, SLOT(slotComboPlaybackMixerSelected(int))); - QObject::connect(comboCaptureMixerDevice, SIGNAL(activated(int)), - this, SLOT(slotComboCaptureMixerSelected(int))); + TQObject::connect(editMinFrequency, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(guiMinFrequencyChanged(int))); + TQObject::connect(editMaxFrequency, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(guiMaxFrequencyChanged(int))); + + TQObject::connect(editDeviceVolume, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotDeviceVolumeChanged(double))); + TQObject::connect(editTreble, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotTrebleChanged(double))); + TQObject::connect(editBass, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotBassChanged(double))); + TQObject::connect(editBalance, TQT_SIGNAL(valueChanged(double)), + this, TQT_SLOT(slotBalanceChanged(double))); + + TQObject::connect(sliderDeviceVolume, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotDeviceVolumeChanged(int))); + TQObject::connect(sliderTreble, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotTrebleChanged(int))); + TQObject::connect(sliderBass, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotBassChanged(int))); + TQObject::connect(sliderBalance, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotBalanceChanged(int))); + + TQObject::connect(comboPlaybackMixerDevice, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotComboPlaybackMixerSelected(int))); + TQObject::connect(comboCaptureMixerDevice, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotComboCaptureMixerSelected(int))); sliderBalance->installEventFilter(this); } @@ -130,19 +130,19 @@ void V4LRadioConfiguration::noticeConnectedI (ISoundStreamServer *s, bool pointe void V4LRadioConfiguration::noticeConnectedSoundClient(ISoundStreamClient::thisInterface *i, bool pointer_valid) { if (i && pointer_valid && i->supportsPlayback()) { - const QString &org_mid = queryPlaybackMixerID(); - bool org_present = m_PlaybackMixerHelper.contains(org_mid); - const QString &mid = org_present ? m_PlaybackMixerHelper.getCurrentItem() : org_mid; - const QString &org_ch = queryPlaybackMixerChannel(); - const QString &ch = org_present ? m_PlaybackChannelHelper.getCurrentText() : org_ch; + const TQString &org_mid = queryPlaybackMixerID(); + bool org_present = m_PlaybackMixerHelper.tqcontains(org_mid); + const TQString &mid = org_present ? m_PlaybackMixerHelper.getCurrentItem() : org_mid; + const TQString &org_ch = queryPlaybackMixerChannel(); + const TQString &ch = org_present ? m_PlaybackChannelHelper.getCurrentText() : org_ch; noticePlaybackMixerChanged(mid, ch); } if (i && pointer_valid && i->supportsCapture()) { - const QString &org_mid = queryCaptureMixerID(); - bool org_present = m_CaptureMixerHelper.contains(org_mid); - const QString &mid = org_present ? m_CaptureMixerHelper.getCurrentItem() : org_mid; - const QString &org_ch = queryCaptureMixerChannel(); - const QString &ch = org_present ? m_CaptureChannelHelper.getCurrentText() : org_ch; + const TQString &org_mid = queryCaptureMixerID(); + bool org_present = m_CaptureMixerHelper.tqcontains(org_mid); + const TQString &mid = org_present ? m_CaptureMixerHelper.getCurrentItem() : org_mid; + const TQString &org_ch = queryCaptureMixerChannel(); + const TQString &ch = org_present ? m_CaptureChannelHelper.getCurrentText() : org_ch; noticeCaptureMixerChanged(mid, ch); } } @@ -160,7 +160,7 @@ void V4LRadioConfiguration::noticeDisconnectedSoundClient(ISoundStreamClient::th // IV4LCfgClient -bool V4LRadioConfiguration::noticeRadioDeviceChanged(const QString &s) +bool V4LRadioConfiguration::noticeRadioDeviceChanged(const TQString &s) { bool old = m_ignoreGUIChanges; m_ignoreGUIChanges = true; @@ -172,9 +172,9 @@ bool V4LRadioConfiguration::noticeRadioDeviceChanged(const QString &s) } -bool V4LRadioConfiguration::noticePlaybackMixerChanged(const QString &_mixer_id, const QString &Channel) +bool V4LRadioConfiguration::noticePlaybackMixerChanged(const TQString &_mixer_id, const TQString &Channel) { - QString mixer_id = _mixer_id; + TQString mixer_id = _mixer_id; bool old = m_ignoreGUIChanges; m_ignoreGUIChanges = true; @@ -185,7 +185,7 @@ bool V4LRadioConfiguration::noticePlaybackMixerChanged(const QString &_mixer_id, ISoundStreamClient *mixer = getSoundStreamClientWithID(mixer_id); if (mixer) { m_PlaybackChannelHelper.setData(mixer->getPlaybackChannels()); - m_PlaybackChannelHelper.setCurrentText(m_PlaybackChannelHelper.contains(Channel) ? Channel : queryPlaybackMixerChannel()); + m_PlaybackChannelHelper.setCurrentText(m_PlaybackChannelHelper.tqcontains(Channel) ? Channel : queryPlaybackMixerChannel()); } labelPlaybackMixerChannel->setEnabled(mixer != NULL); comboPlaybackMixerChannel->setEnabled(mixer != NULL); @@ -195,9 +195,9 @@ bool V4LRadioConfiguration::noticePlaybackMixerChanged(const QString &_mixer_id, } -bool V4LRadioConfiguration::noticeCaptureMixerChanged(const QString &_mixer_id, const QString &Channel) +bool V4LRadioConfiguration::noticeCaptureMixerChanged(const TQString &_mixer_id, const TQString &Channel) { - QString mixer_id = _mixer_id; + TQString mixer_id = _mixer_id; bool old = m_ignoreGUIChanges; m_ignoreGUIChanges = true; @@ -208,7 +208,7 @@ bool V4LRadioConfiguration::noticeCaptureMixerChanged(const QString &_mixer_id, ISoundStreamClient *mixer = getSoundStreamClientWithID(mixer_id); if (mixer) { m_CaptureChannelHelper.setData(mixer->getCaptureChannels()); - m_CaptureChannelHelper.setCurrentText(m_CaptureChannelHelper.contains(Channel) ? Channel : queryCaptureMixerChannel()); + m_CaptureChannelHelper.setCurrentText(m_CaptureChannelHelper.tqcontains(Channel) ? Channel : queryCaptureMixerChannel()); } labelCaptureMixerChannel->setEnabled(mixer != NULL); comboCaptureMixerChannel->setEnabled(mixer != NULL); @@ -315,7 +315,7 @@ bool V4LRadioConfiguration::noticeVolumeZeroOnPowerOffChanged(bool a) // IRadioDeviceClient -bool V4LRadioConfiguration::noticeDescriptionChanged (const QString &s, const IRadioDevice */*sender*/) +bool V4LRadioConfiguration::noticeDescriptionChanged (const TQString &s, const IRadioDevice */*sender*/) { labelDescription->setText(s); return true; @@ -447,18 +447,18 @@ void V4LRadioConfiguration::selectRadioDevice() fd.setMode(KFile::File | KFile::ExistingOnly); fd.setCaption (i18n("Select Radio Device")); - if (fd.exec() == QDialog::Accepted) { + if (fd.exec() == TQDialog::Accepted) { editRadioDevice->setText(fd.selectedFile()); } } -bool V4LRadioConfiguration::eventFilter(QObject *o, QEvent *e) +bool V4LRadioConfiguration::eventFilter(TQObject *o, TQEvent *e) { - if (e->type() == QEvent::FocusOut && o == editRadioDevice) { + if (e->type() == TQEvent::FocusOut && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editRadioDevice)) { slotEditRadioDeviceChanged(); } - if (e->type() == QEvent::MouseButtonDblClick && o == sliderBalance) { + if (e->type() == TQEvent::MouseButtonDblClick && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(sliderBalance)) { slotBalanceCenter(); } return false; @@ -468,7 +468,7 @@ bool V4LRadioConfiguration::eventFilter(QObject *o, QEvent *e) void V4LRadioConfiguration::slotEditRadioDeviceChanged() { if (m_ignoreGUIChanges) return; - const QString &s = editRadioDevice->text(); + const TQString &s = editRadioDevice->text(); if (s != queryRadioDevice() || !queryIsPowerOn()) { V4LCaps c = queryCapabilities(s); noticeDescriptionChanged(c.description); @@ -481,7 +481,7 @@ void V4LRadioConfiguration::slotEditRadioDeviceChanged() void V4LRadioConfiguration::slotComboPlaybackMixerSelected(int /*idx*/) { if (m_ignoreGUIChanges) return; - QString id = m_PlaybackMixerHelper.getCurrentItem(); + TQString id = m_PlaybackMixerHelper.getCurrentItem(); noticePlaybackMixerChanged(id, queryPlaybackMixerChannel()); } @@ -489,7 +489,7 @@ void V4LRadioConfiguration::slotComboPlaybackMixerSelected(int /*idx*/) void V4LRadioConfiguration::slotComboCaptureMixerSelected(int /*idx*/) { if (m_ignoreGUIChanges) return; - QString id = m_CaptureMixerHelper.getCurrentItem(); + TQString id = m_CaptureMixerHelper.getCurrentItem(); noticeCaptureMixerChanged(id, queryCaptureMixerChannel()); } @@ -626,7 +626,7 @@ void V4LRadioConfiguration::slotBalanceCenter() } -bool V4LRadioConfiguration::noticePlaybackChannelsChanged(const QString & client_id, const QStringList &/*channels*/) +bool V4LRadioConfiguration::noticePlaybackChannelsChanged(const TQString & client_id, const TQStringList &/*channels*/) { if (m_PlaybackMixerHelper.getCurrentItem() == client_id) { noticePlaybackMixerChanged(client_id, m_PlaybackChannelHelper.getCurrentText()); @@ -635,7 +635,7 @@ bool V4LRadioConfiguration::noticePlaybackChannelsChanged(const QString & client } -bool V4LRadioConfiguration::noticeCaptureChannelsChanged (const QString & client_id, const QStringList &/*channels*/) +bool V4LRadioConfiguration::noticeCaptureChannelsChanged (const TQString & client_id, const TQStringList &/*channels*/) { if (m_CaptureMixerHelper.getCurrentItem() == client_id) { noticeCaptureMixerChanged(client_id, m_CaptureChannelHelper.getCurrentText()); diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration.h b/kradio3/plugins/v4lradio/v4lradio-configuration.h index bf41b54..e6cf60b 100644 --- a/kradio3/plugins/v4lradio/v4lradio-configuration.h +++ b/kradio3/plugins/v4lradio/v4lradio-configuration.h @@ -30,7 +30,7 @@ #include "v4lcfg_interfaces.h" class V4LRadio; -class QWidget; +class TQWidget; class V4LRadioConfiguration : public V4LRadioConfigurationUI, public IV4LCfgClient, @@ -39,8 +39,9 @@ class V4LRadioConfiguration : public V4LRadioConfigurationUI, public IRadioDeviceClient { Q_OBJECT + TQ_OBJECT public : - V4LRadioConfiguration (QWidget *parent, SoundStreamID id); + V4LRadioConfiguration (TQWidget *tqparent, SoundStreamID id); ~V4LRadioConfiguration (); bool connectI (Interface *i); @@ -52,9 +53,9 @@ public : // IV4LCfgClient RECEIVERS: - bool noticeRadioDeviceChanged(const QString &s); - bool noticePlaybackMixerChanged(const QString &soundStreamClientID, const QString &Channel); - bool noticeCaptureMixerChanged (const QString &soundStreamClientID, const QString &Channel); + bool noticeRadioDeviceChanged(const TQString &s); + bool noticePlaybackMixerChanged(const TQString &soundStreamClientID, const TQString &Channel); + bool noticeCaptureMixerChanged (const TQString &soundStreamClientID, const TQString &Channel); bool noticeDeviceVolumeChanged(float v); bool noticeCapabilitiesChanged(const V4LCaps &c); bool noticeActivePlaybackChanged(bool a); @@ -66,7 +67,7 @@ RECEIVERS: RECEIVERS: bool noticePowerChanged (bool /*on*/, const IRadioDevice */*sender = NULL*/) { return false; } bool noticeStationChanged (const RadioStation &, const IRadioDevice */*sender = NULL*/) { return false; } - bool noticeDescriptionChanged (const QString &, const IRadioDevice *sender = NULL); + bool noticeDescriptionChanged (const TQString &, const IRadioDevice *sender = NULL); bool noticeCurrentSoundStreamIDChanged(SoundStreamID /*id*/, const IRadioDevice */*sender*/) { return false; } @@ -88,14 +89,14 @@ RECEIVERS: bool noticeBalanceChanged(SoundStreamID id, float b); bool noticeSignalMinQualityChanged(SoundStreamID id, float q); - bool noticePlaybackChannelsChanged(const QString & /*client_id*/, const QStringList &/*channels*/); - bool noticeCaptureChannelsChanged (const QString & /*client_id*/, const QStringList &/*channels*/); + bool noticePlaybackChannelsChanged(const TQString & /*client_id*/, const TQStringList &/*channels*/); + bool noticeCaptureChannelsChanged (const TQString & /*client_id*/, const TQStringList &/*channels*/); bool noticeSoundStreamCreated(SoundStreamID /*id*/); protected: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(TQObject *o, TQEvent *e); protected slots: @@ -135,8 +136,8 @@ protected: V4LCaps m_caps; - typedef GUIListHelper<QComboBox, QString> StringListHelper; - typedef GUISimpleListHelper<QComboBox> ChannelListHelper; + typedef GUIListHelper<TQComboBox, TQString> StringListHelper; + typedef GUISimpleListHelper<TQComboBox> ChannelListHelper; StringListHelper m_PlaybackMixerHelper, m_CaptureMixerHelper; diff --git a/kradio3/plugins/v4lradio/v4lradio.cpp b/kradio3/plugins/v4lradio/v4lradio.cpp index fb1ee9f..dbfec2a 100644 --- a/kradio3/plugins/v4lradio/v4lradio.cpp +++ b/kradio3/plugins/v4lradio/v4lradio.cpp @@ -1,7 +1,7 @@ /*************************************************************************** v4lradio.cpp - description ------------------- - begin : Don Mär 8 21:57:17 CET 2001 + begin : Don M�r 8 21:57:17 CET 2001 copyright : (C) 2002-2005 by Ernst Martin Witte email : witte@kawo1.rwth-aachen.de ***************************************************************************/ @@ -31,10 +31,10 @@ #include <string.h> // memcpy needed -#include <qlayout.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qvaluelist.h> +#include <tqlayout.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqvaluelist.h> #include <kconfig.h> #include <kiconloader.h> @@ -57,7 +57,7 @@ PLUGIN_LIBRARY_FUNCTIONS(V4LRadio, "kradio-v4lradio", i18n("Support for V4L(2) R /////////////////////////////////////////////////////////////////////// -V4LRadio::V4LRadio(const QString &name) +V4LRadio::V4LRadio(const TQString &name) : PluginBase(name, i18n("Video For Linux Plugin")), m_treble(0.5), m_bass(0.5), @@ -85,16 +85,16 @@ V4LRadio::V4LRadio(const QString &name) m_blockReadAudio(false), m_SoundStreamID(createNewSoundStream(false)), - m_PlaybackMixerID(QString::null), - m_CaptureMixerID(QString::null), - m_PlaybackMixerChannel(QString::null), - m_CaptureMixerChannel(QString::null), + m_PlaybackMixerID(TQString()), + m_CaptureMixerID(TQString()), + m_PlaybackMixerChannel(TQString()), + m_CaptureMixerChannel(TQString()), m_ActivePlayback(false), m_MuteOnPowerOff(false), m_VolumeZeroOnPowerOff(false), m_restorePowerOn(false) { - QObject::connect (&m_pollTimer, SIGNAL(timeout()), this, SLOT(poll())); + TQObject::connect (&m_pollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(poll())); m_pollTimer.start(333); m_audio = new video_audio; @@ -212,7 +212,7 @@ void V4LRadio::searchMixers(ISoundStreamClient **playback_mixer, ISoundStreamCli if (playback_mixer) { *playback_mixer = getSoundStreamClientWithID(m_PlaybackMixerID); if (!*playback_mixer) { - QPtrList<ISoundStreamClient> playback_mixers = queryPlaybackMixers(); + TQPtrList<ISoundStreamClient> playback_mixers = queryPlaybackMixers(); if (!playback_mixers.isEmpty()) *playback_mixer = playback_mixers.first(); } @@ -220,7 +220,7 @@ void V4LRadio::searchMixers(ISoundStreamClient **playback_mixer, ISoundStreamCli if (capture_mixer) { *capture_mixer = getSoundStreamClientWithID(m_CaptureMixerID); if (!*capture_mixer) { - QPtrList<ISoundStreamClient> capture_mixers = queryCaptureMixers(); + TQPtrList<ISoundStreamClient> capture_mixers = queryCaptureMixers(); if (!capture_mixers.isEmpty()) *capture_mixer = capture_mixers.first(); } @@ -336,7 +336,7 @@ const RadioStation &V4LRadio::getCurrentStation() const } -const QString &V4LRadio::getDescription() const +const TQString &V4LRadio::getDescription() const { return m_caps.description; } @@ -656,7 +656,7 @@ bool V4LRadio::setFrequency(float freq) if (freq > maxf || freq < minf) { logError("V4LRadio::setFrequency: " + - i18n("invalid frequency %1").arg(QString().setNum(freq))); + i18n("invalid frequency %1").tqarg(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") - .arg(m_caps.version)); + .tqarg(m_caps.version)); } if (r) { logError("V4LRadio::setFrequency: " + i18n("error setting frequency to %1 (%2)") - .arg(QString().setNum(freq)) - .arg(QString().setNum(r))); + .tqarg(TQString().setNum(freq)) + .tqarg(TQString().setNum(r))); // unmute the old radio with the old radio station if (!oldMute && !m_ActivePlayback) unmute(m_SoundStreamID); @@ -788,7 +788,7 @@ float V4LRadio::getScanStep() const // IV4LCfg methods -bool V4LRadio::setRadioDevice(const QString &s) +bool V4LRadio::setRadioDevice(const TQString &s) { if (m_radioDev != s) { bool p = isPowerOn(); @@ -805,7 +805,7 @@ bool V4LRadio::setRadioDevice(const QString &s) } -bool V4LRadio::setPlaybackMixer(const QString &soundStreamClientID, const QString &ch) +bool V4LRadio::setPlaybackMixer(const TQString &soundStreamClientID, const TQString &ch) { bool change = m_PlaybackMixerID != soundStreamClientID || m_PlaybackMixerChannel != ch; m_PlaybackMixerID = soundStreamClientID; @@ -839,7 +839,7 @@ bool V4LRadio::setPlaybackMixer(const QString &soundStreamClientID, const QStri } -bool V4LRadio::setCaptureMixer(const QString &soundStreamClientID, const QString &ch) +bool V4LRadio::setCaptureMixer(const TQString &soundStreamClientID, const TQString &ch) { bool change = m_PlaybackMixerID != soundStreamClientID || m_PlaybackMixerChannel != ch; m_CaptureMixerID = soundStreamClientID; @@ -873,7 +873,7 @@ bool V4LRadio::setCaptureMixer(const QString &soundStreamClientID, const QStrin } -V4LCaps V4LRadio::getCapabilities(QString dev) const +V4LCaps V4LRadio::getCapabilities(TQString dev) const { if (dev.isNull()) { return m_caps; @@ -942,7 +942,7 @@ bool V4LRadio::setVolumeZeroOnPowerOff(bool a) void V4LRadio::saveState (KConfig *config) const { - config->setGroup(QString("v4lradio-") + name()); + config->setGroup(TQString("v4lradio-") + name()); config->writeEntry("RadioDev", m_radioDev); @@ -981,19 +981,19 @@ void V4LRadio::restoreState (KConfig *config) { BlockProfiler p("V4LRadio::restoreState"); - config->setGroup(QString("v4lradio-") + name()); + config->setGroup(TQString("v4lradio-") + name()); - QString base_devname = "/dev/radio"; + TQString base_devname = "/dev/radio"; - QStringList testlist (base_devname ); + TQStringList testlist (base_devname ); for (int i = 0; i < 9; ++i) - testlist.append(base_devname + QString::number(i)); + testlist.append(base_devname + TQString::number(i)); - QString found_devname(QString::null); - for (QValueListConstIterator<QString> it = testlist.begin(); it != testlist.end(); ++it) { - QFile f(*it); + TQString found_devname(TQString::null); + for (TQValueListConstIterator<TQString> it = testlist.begin(); it != testlist.end(); ++it) { + TQFile f(*it); if (f.exists()) { - QFileInfo info(f); + TQFileInfo info(f); if (info.isReadable() && info.isWritable()) { found_devname = *it; break; @@ -1001,14 +1001,14 @@ 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.").arg(*it)); + logWarning(i18n("Device %1 does exist but is not readable/writable. Please check device permissions.").tqarg(*it)); } } } - QString default_devname = found_devname.isNull() ? base_devname : found_devname; + TQString default_devname = found_devname.isNull() ? base_devname : found_devname; - QString devname = config->readEntry ("RadioDev", default_devname); + TQString devname = config->readEntry ("RadioDev", default_devname); if (found_devname.isNull() && devname == default_devname) { logError(i18n("Could not find an accessible v4l(2) radio device.")); @@ -1016,11 +1016,11 @@ void V4LRadio::restoreState (KConfig *config) setRadioDevice(devname); - QString PlaybackMixerID = config->readEntry ("PlaybackMixerID", QString::null); - QString PlaybackMixerChannel = config->readEntry ("PlaybackMixerChannel", "Line"); + TQString PlaybackMixerID = config->readEntry ("PlaybackMixerID", TQString()); + TQString PlaybackMixerChannel = config->readEntry ("PlaybackMixerChannel", "Line"); - QString CaptureMixerID = config->readEntry ("CaptureMixerID", QString::null); - QString CaptureMixerChannel = config->readEntry ("CaptureMixerChannel", "Line"); + TQString CaptureMixerID = config->readEntry ("CaptureMixerID", TQString()); + TQString CaptureMixerChannel = config->readEntry ("CaptureMixerChannel", "Line"); m_ActivePlayback = config->readBoolEntry("ActivePlayback", false); m_MuteOnPowerOff = config->readBoolEntry("MuteOnPowerOff", false); @@ -1123,7 +1123,7 @@ void V4LRadio::radio_init() radio_done(); logError("V4LRadio::radio_init: " + - i18n("Cannot open mixer device %1").arg(m_mixerDev)); + i18n("Cannot open mixer device %1").tqarg(m_mixerDev)); return; } */ @@ -1132,7 +1132,7 @@ void V4LRadio::radio_init() radio_done(); logError("V4LRadio::radio_init: " + - i18n("Cannot open radio device %1").arg(m_radioDev)); + i18n("Cannot open radio device %1").tqarg(m_radioDev)); return; } @@ -1170,7 +1170,7 @@ void V4LRadio::radio_done() #define CAPS_NAME_LEN 127 -V4LCaps V4LRadio::readV4LCaps(const QString &device) const +V4LCaps V4LRadio::readV4LCaps(const TQString &device) const { char buffer[CAPS_NAME_LEN+1]; int r; @@ -1183,7 +1183,7 @@ V4LCaps V4LRadio::readV4LCaps(const QString &device) const if (fd < 0) { logError("V4LRadio::readV4LCaps: " + - i18n("cannot open %1").arg(device)); + i18n("cannot open %1").tqarg(device)); return c; } @@ -1207,7 +1207,7 @@ V4LCaps V4LRadio::readV4LCaps(const QString &device) const video_audio audiocaps; if (0 == ioctl(fd, VIDIOCGAUDIO, &audiocaps)) { logDebug("V4LRadio::readV4LCaps: " + - i18n("audio caps = %1").arg(QString().setNum(audiocaps.flags))); + i18n("audio caps = %1").tqarg(TQString().setNum(audiocaps.flags))); if ((audiocaps.flags & VIDEO_AUDIO_MUTABLE) != 0) c.hasMute = true; if ((audiocaps.flags & VIDEO_AUDIO_VOLUME) != 0) @@ -1226,11 +1226,11 @@ V4LCaps V4LRadio::readV4LCaps(const QString &device) const #ifdef HAVE_V4L2 v4l2_capability caps2; - r = ioctl(fd, VIDIOC_QUERYCAP, &caps2); + r = ioctl(fd, VIDIOC_TQUERYCAP, &caps2); if (r == 0) { c.version = 2; - logDebug(i18n("V4L2 - Version: %1").arg(QString().sprintf("%08X", caps2.version))); + logDebug(i18n("V4L2 - Version: %1").tqarg(TQString().sprintf("%08X", caps2.version))); size_t l = sizeof(caps.name); l = l < CAPS_NAME_LEN ? l : CAPS_NAME_LEN; @@ -1247,13 +1247,13 @@ V4LCaps V4LRadio::readV4LCaps(const QString &device) const c.unsetBalance(); ctrl.id = V4L2_CID_AUDIO_MUTE; - if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) + if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) c.hasMute = !(ctrl.flags & V4L2_CTRL_FLAG_DISABLED); else logError(i18n("V4L2: Querying mute control failed")); ctrl.id = V4L2_CID_AUDIO_VOLUME; - if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) { + if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) { if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED)) c.setVolume(ctrl.minimum, ctrl.maximum); } else { @@ -1261,7 +1261,7 @@ V4LCaps V4LRadio::readV4LCaps(const QString &device) const } ctrl.id = V4L2_CID_AUDIO_TREBLE; - if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) { + if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) { if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED)) c.setTreble(ctrl.minimum, ctrl.maximum); } else { @@ -1269,7 +1269,7 @@ V4LCaps V4LRadio::readV4LCaps(const QString &device) const } ctrl.id = V4L2_CID_AUDIO_BASS; - if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) { + if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) { if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED)) c.setBass(ctrl.minimum, c.maxBass = ctrl.maximum); } else { @@ -1277,7 +1277,7 @@ V4LCaps V4LRadio::readV4LCaps(const QString &device) const } ctrl.id = V4L2_CID_AUDIO_BALANCE; - if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) { + if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) { if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED)) c.setBalance(ctrl.minimum, ctrl.maximum); } else { @@ -1289,7 +1289,7 @@ V4LCaps V4LRadio::readV4LCaps(const QString &device) const } #endif if (c.version > 0) { - logInfo(i18n("V4L %1 detected").arg(c.version)); + logInfo(i18n("V4L %1 detected").tqarg(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") - .arg(QString().setNum(m_caps.version))); + .tqarg(TQString().setNum(m_caps.version))); } if (r != 0) { m_signalQuality = 0; logError("V4LRadio::readTunerInfo: " + - i18n("cannot get tuner info (error %1)").arg(QString().setNum(r))); + i18n("cannot get tuner info (error %1)").tqarg(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").arg(#what).arg(QString().setNum(r))); \ + logError(i18n("error setting %1: %2").tqarg(#what).tqarg(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").arg(#what).arg(QString().setNum(r))); \ + logError(i18n("error reading %1: %2").tqarg(#what).tqarg(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") - .arg(QString().setNum(m_caps.version))); + .tqarg(TQString().setNum(m_caps.version))); } if (r) { logError("V4LRadio::updateAudioInfo: " + i18n("error updating radio audio info (%1): %2") - .arg(write ? i18n("write") : i18n("read")) - .arg(QString().setNum(r))); + .tqarg(write ? i18n("write") : i18n("read")) + .tqarg(TQString().setNum(r))); return false; } } @@ -1573,7 +1573,7 @@ bool V4LRadio::getPlaybackVolume(SoundStreamID id, float &volume) const -bool V4LRadio::getSoundStreamDescription(SoundStreamID id, QString &descr) const +bool V4LRadio::getSoundStreamDescription(SoundStreamID id, TQString &descr) const { if (id == m_SoundStreamID) { descr = name() + " - " + m_currentStation.name(); @@ -1597,10 +1597,10 @@ bool V4LRadio::getSoundStreamRadioStation(SoundStreamID id, const RadioStation * } -bool V4LRadio::enumerateSoundStreams(QMap<QString, SoundStreamID> &list) const +bool V4LRadio::enumerateSoundStreams(TQMap<TQString, SoundStreamID> &list) const { if (m_SoundStreamID.isValid()) { - QString tmp = QString::null; + TQString tmp = TQString(); getSoundStreamDescription(m_SoundStreamID, tmp); list[tmp] = m_SoundStreamID; return true; diff --git a/kradio3/plugins/v4lradio/v4lradio.h b/kradio3/plugins/v4lradio/v4lradio.h index 4b86cb5..e02f976 100644 --- a/kradio3/plugins/v4lradio/v4lradio.h +++ b/kradio3/plugins/v4lradio/v4lradio.h @@ -22,7 +22,7 @@ #include <config.h> #endif -#include <qtimer.h> +#include <tqtimer.h> #include "../../src/include/radiodevice_interfaces.h" #include "../../src/include/plugins.h" @@ -38,7 +38,7 @@ struct video_audio; struct v4l2_tuner; #endif -class V4LRadio : public QObject, +class V4LRadio : public TQObject, public PluginBase, public IRadioDevice, // public IRadioSound, @@ -48,17 +48,18 @@ class V4LRadio : public QObject, public IV4LCfg { Q_OBJECT + TQ_OBJECT public: - V4LRadio (const QString &name); + V4LRadio (const TQString &name); virtual ~V4LRadio (); virtual bool connectI (Interface *); virtual bool disconnectI (Interface *); - virtual QString pluginClassName() const { return "V4LRadio"; } + virtual TQString pluginClassName() const { return "V4LRadio"; } - virtual const QString &name() const { return PluginBase::name(); } - virtual QString &name() { return PluginBase::name(); } + virtual const TQString &name() const { return PluginBase::name(); } + virtual TQString &name() { return PluginBase::name(); } // PluginBase @@ -83,7 +84,7 @@ ANSWERS: virtual bool isPowerOff() const; virtual SoundStreamID getSoundStreamID() const; virtual const RadioStation & getCurrentStation() const; - virtual const QString & getDescription() const; + virtual const TQString & getDescription() const; virtual SoundStreamID getCurrentSoundStreamID() const; @@ -149,18 +150,18 @@ RECEIVERS: RECEIVERS: - bool getSoundStreamDescription(SoundStreamID id, QString &descr) const; + bool getSoundStreamDescription(SoundStreamID id, TQString &descr) const; bool getSoundStreamRadioStation(SoundStreamID id, const RadioStation *&rs) const; - bool enumerateSoundStreams(QMap<QString, SoundStreamID> &list) const; + bool enumerateSoundStreams(TQMap<TQString, SoundStreamID> &list) const; // bool stopCapture(SoundStreamID id); // if active playback also call stopPlayback // IV4LCfg RECEIVERS: - bool setRadioDevice (const QString &s); - bool setPlaybackMixer(const QString &soundStreamClientID, const QString &ch); - bool setCaptureMixer (const QString &soundStreamClientID, const QString &ch); + bool setRadioDevice (const TQString &s); + bool setPlaybackMixer(const TQString &soundStreamClientID, const TQString &ch); + bool setCaptureMixer (const TQString &soundStreamClientID, const TQString &ch); bool setDeviceVolume (float v); bool setActivePlayback(bool a); bool setMuteOnPowerOff(bool a); @@ -171,13 +172,13 @@ RECEIVERS: bool getPlaybackVolume(SoundStreamID id, float &volume) const; ANSWERS: - const QString &getRadioDevice () const { return m_radioDev; } - const QString &getPlaybackMixerID () const { return m_PlaybackMixerID; } - const QString &getCaptureMixerID () const { return m_CaptureMixerID; } - const QString &getPlaybackMixerChannel() const { return m_PlaybackMixerChannel; } - const QString &getCaptureMixerChannel () const { return m_CaptureMixerChannel; } + const TQString &getRadioDevice () const { return m_radioDev; } + const TQString &getPlaybackMixerID () const { return m_PlaybackMixerID; } + const TQString &getCaptureMixerID () const { return m_CaptureMixerID; } + const TQString &getPlaybackMixerChannel() const { return m_PlaybackMixerChannel; } + const TQString &getCaptureMixerChannel () const { return m_CaptureMixerChannel; } float getDeviceVolume () const; - V4LCaps getCapabilities(QString dev = QString::null) const; + V4LCaps getCapabilities(TQString dev = TQString()) const; bool getActivePlayback() const { return m_ActivePlayback; } bool getMuteOnPowerOff() const { return m_MuteOnPowerOff; } @@ -189,7 +190,7 @@ protected slots: void poll(); protected: - V4LCaps readV4LCaps(const QString &device) const; + V4LCaps readV4LCaps(const TQString &device) const; void radio_init(); void radio_done(); @@ -223,7 +224,7 @@ protected: float m_scanStep; V4LCaps m_caps; - QString m_radioDev; + TQString m_radioDev; int m_radio_fd; mutable bool m_useOldV4L2Calls; @@ -235,7 +236,7 @@ protected: mutable struct v4l2_tuner *m_tuner2; #endif - QTimer m_pollTimer; + TQTimer m_pollTimer; struct TunerCache { bool valid; @@ -250,10 +251,10 @@ protected: m_blockReadAudio; SoundStreamID m_SoundStreamID; - QString m_PlaybackMixerID; - QString m_CaptureMixerID; - QString m_PlaybackMixerChannel; - QString m_CaptureMixerChannel; + TQString m_PlaybackMixerID; + TQString m_CaptureMixerID; + TQString m_PlaybackMixerChannel; + TQString m_CaptureMixerChannel; bool m_ActivePlayback; bool m_MuteOnPowerOff; |