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, 19 insertions, 18 deletions

diff --git a/kradio3/plugins/recording/recording.h b/kradio3/plugins/recording/recording.h
index bef3a3a..9b8d41c 100644
--- a/kradio3/plugins/recording/recording.h
+++ b/kradio3/plugins/recording/recording.h
@@ -23,9 +23,9 @@
 #endif
 
 
-#include <qobject.h>
-#include <qstring.h>
-#include <qmap.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqmap.h>
 
 #include "../../src/include/plugins.h"
 #include "../../src/include/timecontrol_interfaces.h"
@@ -37,24 +37,25 @@
 
 class RadioStation;
 class StationList;
-class QSocketNotifier;
+class TQSocketNotifier;
 class RecordingEncoding;
 class FileRingBuffer;
 
-class Recording : public QObject,
+class Recording : public TQObject,
                   public PluginBase,
                   public ISoundStreamClient,
                   public IRecCfg
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    Recording(const QString &name);
+    Recording(const TQString &name);
     ~Recording();
 
-    virtual QString pluginClassName() const { return "Recording"; }
+    virtual TQString pluginClassName() const { return "Recording"; }
 
-    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 bool   connectI(Interface *i);
     virtual bool   disconnectI(Interface *i);
@@ -80,7 +81,7 @@ protected:
     bool   setSoundFormat       (const SoundFormat &sf);
     bool   setMP3Quality        (int q);
     bool   setOggQuality        (float q);
-    bool   setRecordingDirectory(const QString &dir);
+    bool   setRecordingDirectory(const TQString &dir);
     bool   setOutputFormat      (RecordingConfig::OutputFormat of);
     bool   setPreRecording      (bool enable, int seconds);
     bool   setRecordingConfig   (const RecordingConfig &cfg);
@@ -89,7 +90,7 @@ protected:
     const SoundFormat             &getSoundFormat () const;
     int                            getMP3Quality () const;
     float                          getOggQuality () const;
-    const QString                 &getRecordingDirectory() const;
+    const TQString                 &getRecordingDirectory() const;
     RecordingConfig::OutputFormat  getOutputFormat() const;
     bool                           getPreRecording(int &seconds) const;
     const RecordingConfig         &getRecordingConfig() const;
@@ -107,17 +108,17 @@ protected:
     bool stopRecording(SoundStreamID id);
     bool isRecordingRunning(SoundStreamID id, bool &b, SoundFormat &sf) const;
 
-    bool getSoundStreamDescription(SoundStreamID id, QString &descr)           const;
+    bool getSoundStreamDescription(SoundStreamID id, TQString &descr)           const;
     bool getSoundStreamRadioStation(SoundStreamID id, const RadioStation *&rs) const;
 
     bool noticeSoundStreamClosed(SoundStreamID id);
     bool noticeSoundStreamChanged(SoundStreamID id);
 
-    bool enumerateSoundStreams(QMap<QString, SoundStreamID> &list) const;
+    bool enumerateSoundStreams(TQMap<TQString, SoundStreamID> &list) const;
 
 protected slots:
 
-    bool event(QEvent *e);
+    bool event(TQEvent *e);
 
 protected:
 
@@ -127,11 +128,11 @@ protected:
 protected:
 
     RecordingConfig     m_config;
-    QMap<SoundStreamID, FileRingBuffer*>     m_PreRecordingBuffers;
+    TQMap<SoundStreamID, FileRingBuffer*>     m_PreRecordingBuffers;
 
-    QMap<SoundStreamID, RecordingEncoding*>  m_EncodingThreads;
-    QMap<SoundStreamID, SoundStreamID>       m_RawStreams2EncodedStreams;
-    QMap<SoundStreamID, SoundStreamID>       m_EncodedStreams2RawStreams;
+    TQMap<SoundStreamID, RecordingEncoding*>  m_EncodingThreads;
+    TQMap<SoundStreamID, SoundStreamID>       m_RawStreams2EncodedStreams;
+    TQMap<SoundStreamID, SoundStreamID>       m_EncodedStreams2RawStreams;
 };
 
 /* PreRecording Notes:  listen for startplayback, stopplayback, closestream