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, 39 insertions, 39 deletions

diff --git a/kradio3/src/include/soundstreamclient_interfaces.h b/kradio3/src/include/soundstreamclient_interfaces.h
index a3de4ca..310d42a 100644
--- a/kradio3/src/include/soundstreamclient_interfaces.h
+++ b/kradio3/src/include/soundstreamclient_interfaces.h
@@ -31,7 +31,7 @@
 #endif
 
 #include <kconfig.h>
-#include <qmap.h>
+#include <tqmap.h>
 
 #include "interfaces.h"
 #include "soundformat.h"
@@ -58,20 +58,20 @@ public:
     virtual void noticeConnectedI(cmplInterface *i, bool valid);
     virtual void noticeDisconnectedI(cmplInterface *i, bool valid);
 
-    virtual QMap<QString, ISoundStreamClient *> getPlaybackClients() const;
-    virtual QMap<QString, QString>              getPlaybackClientDescriptions() const;
-    virtual QMap<QString, ISoundStreamClient *> getCaptureClients() const;
-    virtual QMap<QString, QString>              getCaptureClientDescriptions() const;
-    virtual ISoundStreamClient                 *getSoundStreamClientWithID(const QString &id) const;
+    virtual TQMap<TQString, ISoundStreamClient *> getPlaybackClients() const;
+    virtual TQMap<TQString, TQString>              getPlaybackClientDescriptions() const;
+    virtual TQMap<TQString, ISoundStreamClient *> getCaptureClients() const;
+    virtual TQMap<TQString, TQString>              getCaptureClientDescriptions() const;
+    virtual ISoundStreamClient                 *getSoundStreamClientWithID(const TQString &id) const;
 
 ANSWERS:
-    virtual QPtrList<ISoundStreamClient>   getPlaybackMixers() const;
-    virtual QPtrList<ISoundStreamClient>   getCaptureMixers() const;
+    virtual TQPtrList<ISoundStreamClient>   getPlaybackMixers() const;
+    virtual TQPtrList<ISoundStreamClient>   getCaptureMixers() const;
 
 
 SENDERS:
-    IF_SENDER_FINE  (  notifyPlaybackChannelsChanged, (const QString &/*client_id*/, const QStringList &)                     )
-    IF_SENDER_FINE  (  notifyCaptureChannelsChanged, (const QString &/*client_id*/, const QStringList &)                      )
+    IF_SENDER_FINE  (  notifyPlaybackChannelsChanged, (const TQString &/*client_id*/, const TQStringList &)                     )
+    IF_SENDER_FINE  (  notifyCaptureChannelsChanged, (const TQString &/*client_id*/, const TQStringList &)                      )
 
     IF_SENDER_FINE  (  sendPlaybackVolume, (SoundStreamID /*id*/,  float /*volume*/)                  )
     IF_SENDER_FINE  (  sendCaptureVolume, (SoundStreamID /*id*/,   float /*volume*/)                  )
@@ -107,7 +107,7 @@ SENDERS:
     IF_SENDER_FINE  (  queryIsMuted, (SoundStreamID /*id*/, bool &)                               )
 
 
-    // sendPreparePlayback/sendPrepareCapture don't make sense for multiple receivers
+    // sendPreparePlayback/sendPrepareCapture don't make sense for multiple tqreceivers
     IF_SENDER_FINE  (  sendReleasePlayback, (SoundStreamID id)                                 )
     IF_SENDER_FINE  (  sendReleaseCapture,  (SoundStreamID id)                                 )
 
@@ -133,9 +133,9 @@ SENDERS:
     IF_SENDER_FINE  (  sendStopRecording, (SoundStreamID id)                                      )
     IF_SENDER_FINE  (  queryIsRecordingRunning, (SoundStreamID id, bool &running, SoundFormat &sf))
 
-    IF_SENDER_FINE  (  querySoundStreamDescription, (SoundStreamID id, QString &descr)         )
+    IF_SENDER_FINE  (  querySoundStreamDescription, (SoundStreamID id, TQString &descr)         )
     IF_SENDER_FINE  (  querySoundStreamRadioStation, (SoundStreamID id, const RadioStation *&rs))
-    IF_SENDER_FINE  (  queryEnumerateSoundStreams, (QMap<QString, SoundStreamID> &) )
+    IF_SENDER_FINE  (  queryEnumerateSoundStreams, (TQMap<TQString, SoundStreamID> &) )
 
     IF_SENDER_FINE  (  notifySoundStreamCreated, (SoundStreamID id)                            )
     IF_SENDER_FINE  (  notifySoundStreamClosed, (SoundStreamID id)                             )
@@ -171,8 +171,8 @@ public:
 // direct playback / capture device functions
 
 RECEIVERS:
-    IF_RECEIVER_EMPTY( preparePlayback(SoundStreamID /*id*/, const QString &/*channel*/, bool /*active_mode*/, bool /*start_immediately = false*/)   )
-    IF_RECEIVER_EMPTY( prepareCapture(SoundStreamID /*id*/, const QString &/*channel*/)                                                          )
+    IF_RECEIVER_EMPTY( preparePlayback(SoundStreamID /*id*/, const TQString &/*channel*/, bool /*active_mode*/, bool /*start_immediately = false*/)   )
+    IF_RECEIVER_EMPTY( prepareCapture(SoundStreamID /*id*/, const TQString &/*channel*/)                                                          )
     IF_RECEIVER_EMPTY( releasePlayback(SoundStreamID /*id*/)   )
     IF_RECEIVER_EMPTY( releaseCapture(SoundStreamID /*id*/)    )
 
@@ -180,29 +180,29 @@ ANSWERS:
     virtual bool supportsPlayback() const  { return false; }
     virtual bool supportsCapture()  const  { return false; }
 
-    virtual const QString &getSoundStreamClientID() const;
-    virtual       QString  getSoundStreamClientDescription() const { return QString::null; }
+    virtual const TQString &getSoundStreamClientID() const;
+    virtual       TQString  getSoundStreamClientDescription() const { return TQString(); }
 
-    virtual QMap<QString, ISoundStreamClient *> getPlaybackClients() const;
-    virtual QMap<QString, QString>              getPlaybackClientDescriptions() const;
-    virtual QMap<QString, ISoundStreamClient *> getCaptureClients() const;
-    virtual QMap<QString, QString>              getCaptureClientDescriptions() const;
-    virtual ISoundStreamClient                 *getSoundStreamClientWithID(const QString &id) const;
+    virtual TQMap<TQString, ISoundStreamClient *> getPlaybackClients() const;
+    virtual TQMap<TQString, TQString>              getPlaybackClientDescriptions() const;
+    virtual TQMap<TQString, ISoundStreamClient *> getCaptureClients() const;
+    virtual TQMap<TQString, TQString>              getCaptureClientDescriptions() const;
+    virtual ISoundStreamClient                 *getSoundStreamClientWithID(const TQString &id) const;
 
 // device mixer functions
 
-QUERIES:
-    IF_QUERY ( QPtrList<ISoundStreamClient>   queryPlaybackMixers()     );
-    IF_QUERY ( QPtrList<ISoundStreamClient>   queryCaptureMixers()      );
+TQUERIES:
+    IF_TQUERY ( TQPtrList<ISoundStreamClient>   queryPlaybackMixers()     );
+    IF_TQUERY ( TQPtrList<ISoundStreamClient>   queryCaptureMixers()      );
 
 
 ANSWERS:
-    virtual const QStringList &getPlaybackChannels() const;
-    virtual const QStringList &getCaptureChannels()  const;
+    virtual const TQStringList &getPlaybackChannels() const;
+    virtual const TQStringList &getCaptureChannels()  const;
 
 RECEIVERS:
-    IF_RECEIVER_EMPTY(  noticePlaybackChannelsChanged(const QString & /*client_id*/, const QStringList &/*channels*/) );
-    IF_RECEIVER_EMPTY(  noticeCaptureChannelsChanged (const QString & /*client_id*/, const QStringList &/*channels*/) );
+    IF_RECEIVER_EMPTY(  noticePlaybackChannelsChanged(const TQString & /*client_id*/, const TQStringList &/*channels*/) );
+    IF_RECEIVER_EMPTY(  noticeCaptureChannelsChanged (const TQString & /*client_id*/, const TQStringList &/*channels*/) );
 
 
 RECEIVERS:
@@ -262,10 +262,10 @@ RECEIVERS:
     IF_RECEIVER_EMPTY(  stopRecording(SoundStreamID /*id*/)                                             )
     IF_RECEIVER_EMPTY(  isRecordingRunning(SoundStreamID /*id*/, bool &/*running*/, SoundFormat &/*sf*/) const  )
 
-    IF_RECEIVER_EMPTY(  getSoundStreamDescription(SoundStreamID /*id*/, QString &/*descr*/) const     )
+    IF_RECEIVER_EMPTY(  getSoundStreamDescription(SoundStreamID /*id*/, TQString &/*descr*/) const     )
     IF_RECEIVER_EMPTY(  getSoundStreamRadioStation(SoundStreamID /*id*/, const RadioStation *&/*rs*/) const  )
 
-    IF_RECEIVER_EMPTY(  enumerateSoundStreams(QMap<QString, SoundStreamID> &/*list*/) const                   )
+    IF_RECEIVER_EMPTY(  enumerateSoundStreams(TQMap<TQString, SoundStreamID> &/*list*/) const                   )
 
     IF_RECEIVER_EMPTY(  noticeSoundStreamCreated(SoundStreamID /*id*/)                                )
     IF_RECEIVER_EMPTY(  noticeSoundStreamClosed(SoundStreamID /*id*/)                                 )
@@ -278,8 +278,8 @@ RECEIVERS:
     IF_RECEIVER_EMPTY(  noticeReadyForPlaybackData(SoundStreamID /*id*/, size_t /*size*/)           )
 
 SENDERS:
-    CALL_SNDSTR_SERVER  (  notifyPlaybackChannelsChanged, (const QString &client_id, const QStringList &map), (client_id, map)                     )
-    CALL_SNDSTR_SERVER  (  notifyCaptureChannelsChanged,  (const QString &client_id, const QStringList &map), (client_id, map)                     )
+    CALL_SNDSTR_SERVER  (  notifyPlaybackChannelsChanged, (const TQString &client_id, const TQStringList &map), (client_id, map)                     )
+    CALL_SNDSTR_SERVER  (  notifyCaptureChannelsChanged,  (const TQString &client_id, const TQStringList &map), (client_id, map)                     )
 
     CALL_SNDSTR_SERVER  (  sendPlaybackVolume, (SoundStreamID id,  float volume), (id, volume)                  )
     CALL_SNDSTR_SERVER  (  sendCaptureVolume, (SoundStreamID id,   float volume), (id, volume)                  )
@@ -315,7 +315,7 @@ SENDERS:
     CALL_SNDSTR_SERVER  (  queryIsMuted, (SoundStreamID id, bool &v), (id, v)                               )
 
 
-    // sendPreparePlayback/sendPrepareCapture don't make sense for multiple receivers
+    // sendPreparePlayback/sendPrepareCapture don't make sense for multiple tqreceivers
     CALL_SNDSTR_SERVER  (  sendReleasePlayback, (SoundStreamID id), (id)                                    )
     CALL_SNDSTR_SERVER  (  sendReleaseCapture,  (SoundStreamID id), (id)                                    )
 
@@ -339,10 +339,10 @@ SENDERS:
     CALL_SNDSTR_SERVER  (  sendStopRecording, (SoundStreamID id), (id)                                     )
     CALL_SNDSTR_SERVER  (  queryIsRecordingRunning, (SoundStreamID id, bool &b, SoundFormat &sf), (id, b, sf)                     )
 
-    CALL_SNDSTR_SERVER  (  querySoundStreamDescription, (SoundStreamID id, QString &descr), (id, descr)  )
+    CALL_SNDSTR_SERVER  (  querySoundStreamDescription, (SoundStreamID id, TQString &descr), (id, descr)  )
     CALL_SNDSTR_SERVER  (  querySoundStreamRadioStation,(SoundStreamID id, const RadioStation *&rs), (id, rs)  )
 
-    CALL_SNDSTR_SERVER  (  queryEnumerateSoundStreams, (QMap<QString, SoundStreamID> &list), (list)              )
+    CALL_SNDSTR_SERVER  (  queryEnumerateSoundStreams, (TQMap<TQString, SoundStreamID> &list), (list)              )
 
     CALL_SNDSTR_SERVER  (  notifySoundStreamCreated, (SoundStreamID id), (id)                            )
     CALL_SNDSTR_SERVER  (  notifySoundStreamClosed, (SoundStreamID id), (id)                             )
@@ -360,10 +360,10 @@ protected:
     SoundStreamID  createNewSoundStream(SoundStreamID old_id, bool notify = true) const;
     void           closeSoundStream(SoundStreamID id, bool notify = true);
 
-    static QString createNewSoundStreamClientID();
-    void           setSoundStreamClientID(const QString &s);
+    static TQString createNewSoundStreamClientID();
+    void           setSoundStreamClientID(const TQString &s);
 
-    QString        m_SoundStreamClientID;
+    TQString        m_SoundStreamClientID;
 
     cmplInterface  *m_Server;
 };