1 files changed, 17 insertions, 17 deletions

diff --git a/kradio3/plugins/recording/recording.cpp b/kradio3/plugins/recording/recording.cpp
index b85b22b..a430e02 100644
--- a/kradio3/plugins/recording/recording.cpp
+++ b/kradio3/plugins/recording/recording.cpp
@@ -310,7 +310,7 @@ bool Recording::setRecordingConfig(const RecordingConfig &c)
 // ISoundStreamClient
 bool Recording::startPlayback(SoundStreamID id)
 {
-    if (m_PreRecordingBuffers.tqcontains(id))
+    if (m_PreRecordingBuffers.contains(id))
         delete m_PreRecordingBuffers[id];
     m_PreRecordingBuffers[id] = NULL;
     if (m_config.m_PreRecordingEnable) {
@@ -323,7 +323,7 @@ bool Recording::startPlayback(SoundStreamID id)
 
 bool Recording::stopPlayback(SoundStreamID id)
 {
-    if (m_PreRecordingBuffers.tqcontains(id)) {
+    if (m_PreRecordingBuffers.contains(id)) {
         if (m_PreRecordingBuffers[id])
             delete m_PreRecordingBuffers[id];
         m_PreRecordingBuffers.remove(id);
@@ -377,10 +377,10 @@ bool Recording::startRecordingWithFormat(SoundStreamID id, const SoundFormat &sf
 
 bool Recording::stopRecording(SoundStreamID id)
 {
-    if (m_EncodingThreads.tqcontains(id)) {
+    if (m_EncodingThreads.contains(id)) {
         sendStopCapture(id);
         if (m_config.m_PreRecordingEnable) {
-            if (!m_PreRecordingBuffers.tqcontains(id)) {
+            if (!m_PreRecordingBuffers.contains(id)) {
                 if (m_PreRecordingBuffers[id] != NULL) {
                     delete m_PreRecordingBuffers[id];
                 }
@@ -406,7 +406,7 @@ bool Recording::noticeSoundStreamData(SoundStreamID id,
     const SoundMetaData &md
 )
 {
-    if (m_PreRecordingBuffers.tqcontains(id) && m_PreRecordingBuffers[id] != NULL) {
+    if (m_PreRecordingBuffers.contains(id) && m_PreRecordingBuffers[id] != NULL) {
 
         FileRingBuffer &fbuf = *m_PreRecordingBuffers[id];
         if (fbuf.getFreeSize() < size) {
@@ -427,7 +427,7 @@ bool Recording::noticeSoundStreamData(SoundStreamID id,
 //         fbuf.addData((char*)tmp, sizeof(tmp));
 //         //END DEBUG
 
-        if (m_EncodingThreads.tqcontains(id)) {
+        if (m_EncodingThreads.contains(id)) {
 
             //logDebug("recording packet: " + TQString::number(size));
 
@@ -464,7 +464,7 @@ bool Recording::noticeSoundStreamData(SoundStreamID id,
         return true;
     }
 
-    else if (m_EncodingThreads.tqcontains(id)) {
+    else if (m_EncodingThreads.contains(id)) {
 
         //logDebug("recording packet: " + TQString::number(size));
 
@@ -503,7 +503,7 @@ bool Recording::noticeSoundStreamData(SoundStreamID id,
 
 bool Recording::startEncoder(SoundStreamID ssid, const RecordingConfig &cfg)
 {
-    if (m_EncodingThreads.tqcontains(ssid))
+    if (m_EncodingThreads.contains(ssid))
         return false;
 
     SoundStreamID encID = createNewSoundStream(ssid, false);
@@ -527,7 +527,7 @@ bool Recording::startEncoder(SoundStreamID ssid, const RecordingConfig &cfg)
     const RadioStation *rs = NULL;
     querySoundStreamRadioStation(ssid, rs);
     TQString station = rs  ? rs->name() + "-" : "";
-    station.tqreplace(TQRegExp("[/*?]"), "_");
+    station.replace(TQRegExp("[/*?]"), "_");
 
     TQDate date = TQDate::tqcurrentDate();
     TQTime time = TQTime::currentTime();
@@ -579,7 +579,7 @@ bool Recording::startEncoder(SoundStreamID ssid, const RecordingConfig &cfg)
 
 void Recording::stopEncoder(SoundStreamID id)
 {
-    if (m_EncodingThreads.tqcontains(id)) {
+    if (m_EncodingThreads.contains(id)) {
 
         RecordingEncoding *thread = m_EncodingThreads[id];
 
@@ -627,7 +627,7 @@ bool Recording::event(TQEvent *_e)
         SoundStreamEvent *e = static_cast<SoundStreamEvent*>(_e);
         SoundStreamID id = e->getSoundStreamID();
 
-        if (m_EncodingThreads.tqcontains(id)) {
+        if (m_EncodingThreads.contains(id)) {
 
             RecordingEncoding *thread = m_EncodingThreads[id];
 
@@ -663,7 +663,7 @@ bool Recording::event(TQEvent *_e)
 
 bool Recording::getSoundStreamDescription(SoundStreamID id, TQString &descr) const
 {
-    if (m_EncodedStreams2RawStreams.tqcontains(id)) {
+    if (m_EncodedStreams2RawStreams.contains(id)) {
         if (querySoundStreamDescription(m_EncodedStreams2RawStreams[id], descr)) {
             descr = name() + " - " + descr;
             return true;
@@ -675,7 +675,7 @@ bool Recording::getSoundStreamDescription(SoundStreamID id, TQString &descr) con
 
 bool Recording::getSoundStreamRadioStation(SoundStreamID id, const RadioStation *&rs) const
 {
-    if (m_EncodedStreams2RawStreams.tqcontains(id)) {
+    if (m_EncodedStreams2RawStreams.contains(id)) {
         if (querySoundStreamRadioStation(m_EncodedStreams2RawStreams[id], rs)) {
             return true;
         }
@@ -698,7 +698,7 @@ bool Recording::enumerateSoundStreams(TQMap<TQString, SoundStreamID> &list) cons
 
 bool Recording::noticeSoundStreamChanged(SoundStreamID id)
 {
-    if (m_RawStreams2EncodedStreams.tqcontains(id)) {
+    if (m_RawStreams2EncodedStreams.contains(id)) {
         notifySoundStreamChanged(m_RawStreams2EncodedStreams[id]);
         return true;
     }
@@ -708,7 +708,7 @@ bool Recording::noticeSoundStreamChanged(SoundStreamID id)
 
 bool Recording::isRecordingRunning(SoundStreamID id, bool &b, SoundFormat &sf) const
 {
-    if (m_EncodingThreads.tqcontains(id)) {
+    if (m_EncodingThreads.contains(id)) {
         b  = m_EncodingThreads[id]->running();
         sf = getSoundFormat();
         return true;
@@ -719,13 +719,13 @@ bool Recording::isRecordingRunning(SoundStreamID id, bool &b, SoundFormat &sf) c
 
 bool Recording::noticeSoundStreamClosed(SoundStreamID id)
 {
-    if (m_PreRecordingBuffers.tqcontains(id)) {
+    if (m_PreRecordingBuffers.contains(id)) {
         if (m_PreRecordingBuffers[id])
             delete m_PreRecordingBuffers[id];
         m_PreRecordingBuffers.remove(id);
     }
 
-    if (m_EncodingThreads.tqcontains(id)) {
+    if (m_EncodingThreads.contains(id)) {
         sendStopRecording(id);
         return true;
     }