From 70b9eea2ba01c3691497f49e4c45cb070c16193c Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 1 Jul 2011 03:43:07 +0000
Subject: 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
---
 kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp | 44 +++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp')

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
                 )
-- 
cgit v1.2.1