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

1 files changed, 25 insertions, 24 deletions

diff --git a/kradio3/plugins/oss-sound/oss-sound.h b/kradio3/plugins/oss-sound/oss-sound.h
index 139ee64..c8dadfd 100644
--- a/kradio3/plugins/oss-sound/oss-sound.h
+++ b/kradio3/plugins/oss-sound/oss-sound.h
@@ -26,8 +26,8 @@
 #include "../../src/include/plugins.h"
 #include "../../src/include/soundstreamclient_interfaces.h"
 
-#include <qobject.h>
-#include <qtimer.h>
+#include <tqobject.h>
+#include <tqtimer.h>
 
 enum DUPLEX_MODE { DUPLEX_UNKNOWN, DUPLEX_FULL, DUPLEX_HALF };
 
@@ -58,14 +58,15 @@ struct SoundStreamConfig
 };
 
 
-class OSSSoundDevice : public QObject,
+class OSSSoundDevice : public TQObject,
                        public PluginBase,
                        public ISoundStreamClient
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-    OSSSoundDevice (const QString &name);
+    OSSSoundDevice (const TQString &name);
     virtual ~OSSSoundDevice ();
 
     virtual bool   connectI(Interface *i);
@@ -77,10 +78,10 @@ public:
     virtual void   saveState (KConfig *) const;
     virtual void   restoreState (KConfig *);
 
-    virtual QString pluginClassName() const { return "OSSSoundDevice"; }
+    virtual TQString pluginClassName() const { return "OSSSoundDevice"; }
 
-    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(); }
 
     virtual ConfigPageInfo  createConfigurationPage();
     virtual AboutPageInfo   createAboutPage();
@@ -89,8 +90,8 @@ public:
 
 RECEIVERS:
     void noticeConnectedI (ISoundStreamServer *s, bool pointer_valid);
-    bool preparePlayback(SoundStreamID id, const QString &channel, bool active_mode, bool start_immediately);
-    bool prepareCapture(SoundStreamID id,  const QString &channel);
+    bool preparePlayback(SoundStreamID id, const TQString &channel, bool active_mode, bool start_immediately);
+    bool prepareCapture(SoundStreamID id,  const TQString &channel);
     bool releasePlayback(SoundStreamID id);
     bool releaseCapture(SoundStreamID id);
 
@@ -98,16 +99,16 @@ ANSWERS:
     bool supportsPlayback() const;
     bool supportsCapture()  const;
 
-    QString getSoundStreamClientDescription() const;
+    TQString getSoundStreamClientDescription() const;
 
     // ISoundStreamClient: mixer access
 
 protected:
-    void getMixerChannels(int query_playback_or_rec_mask, QStringList &retval, QMap<QString, int> &revmap) const;
+    void getMixerChannels(int query_playback_or_rec_tqmask, TQStringList &retval, TQMap<TQString, int> &revmap) const;
 
 ANSWERS:
-    const QStringList &getPlaybackChannels() const;
-    const QStringList &getCaptureChannels() const;
+    const TQStringList &getPlaybackChannels() const;
+    const TQStringList &getCaptureChannels() const;
 
 RECEIVERS:
     bool setPlaybackVolume(SoundStreamID id, float volume);
@@ -145,14 +146,14 @@ RECEIVERS:
     int            getBufferSize()      const { return m_BufferSize; }
     bool           isPlaybackEnabled()  const { return m_EnablePlayback; }
     bool           isCaptureEnabled()   const { return m_EnableCapture;  }
-    const QString &getDSPDeviceName()   const { return m_DSPDeviceName; }
-    const QString &getMixerDeviceName() const { return m_MixerDeviceName; }
+    const TQString &getDSPDeviceName()   const { return m_DSPDeviceName; }
+    const TQString &getMixerDeviceName() const { return m_MixerDeviceName; }
 
     void           setBufferSize(int s);
     void           enablePlayback(bool on);
     void           enableCapture(bool on);
-    void           setDSPDeviceName(const QString &s);
-    void           setMixerDeviceName(const QString &dev_name);
+    void           setDSPDeviceName(const TQString &s);
+    void           setMixerDeviceName(const TQString &dev_name);
 
     // own functions
 
@@ -180,23 +181,23 @@ protected:
 
     void   selectCaptureChannel (int channel);
 
-    QString         m_DSPDeviceName,
+    TQString         m_DSPDeviceName,
                     m_MixerDeviceName;
     int             m_DSP_fd,
                     m_Mixer_fd;
     DUPLEX_MODE     m_DuplexMode;
     SoundFormat     m_DSPFormat;
 
-    QStringList          m_PlaybackChannels,
+    TQStringList          m_PlaybackChannels,
                          m_CaptureChannels;
-    QMap<QString, int>   m_revPlaybackChannels,
+    TQMap<TQString, int>   m_revPlaybackChannels,
                          m_revCaptureChannels;
 
-    QMap<SoundStreamID, SoundStreamConfig>
+    TQMap<SoundStreamID, SoundStreamConfig>
                     m_PlaybackStreams,
                     m_CaptureStreams;
 
-    QValueList<SoundStreamID>
+    TQValueList<SoundStreamID>
                     m_PassivePlaybackStreams;
     SoundStreamID   m_PlaybackStreamID,
                     m_CaptureStreamID;
@@ -206,7 +207,7 @@ protected:
                     m_CaptureBuffer;
 
     unsigned        m_CaptureRequestCounter;
-    Q_UINT64        m_CapturePos;
+    TQ_UINT64        m_CapturePos;
     time_t          m_CaptureStartTime;
 
 
@@ -216,7 +217,7 @@ protected:
     bool            m_EnablePlayback,
                     m_EnableCapture;
 
-    QTimer          m_PollingTimer;
+    TQTimer          m_PollingTimer;
 };