diff options
Diffstat (limited to 'kradio3/plugins/streaming')
-rw-r--r-- | kradio3/plugins/streaming/streaming-job.cpp | 26 | ||||
-rw-r--r-- | kradio3/plugins/streaming/streaming-job.h | 8 | ||||
-rw-r--r-- | kradio3/plugins/streaming/streaming.cpp | 4 | ||||
-rw-r--r-- | kradio3/plugins/streaming/streaming.h | 4 |
4 files changed, 21 insertions, 21 deletions
diff --git a/kradio3/plugins/streaming/streaming-job.cpp b/kradio3/plugins/streaming/streaming-job.cpp index 3266618..77e5a55 100644 --- a/kradio3/plugins/streaming/streaming-job.cpp +++ b/kradio3/plugins/streaming/streaming-job.cpp @@ -105,14 +105,14 @@ void StreamingJob::setBufferSize(size_t buffer_size) bool StreamingJob::startPutJob() { - m_KIO_Job = KIO::put(m_URL, -1, true, false, false); + m_KIO_Job = TDEIO::put(m_URL, -1, true, false, false); if (!m_KIO_Job) return false; m_KIO_Job->setAsyncDataEnabled(true); - connect (m_KIO_Job, TQT_SIGNAL(dataReq(KIO::Job *job, TQByteArray &data)), - this, TQT_SLOT(slotWriteData (KIO::Job *job, TQByteArray &data))); - connect (m_KIO_Job, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotIOJobResult(KIO::Job *))); + connect (m_KIO_Job, TQT_SIGNAL(dataReq(TDEIO::Job *job, TQByteArray &data)), + this, TQT_SLOT(slotWriteData (TDEIO::Job *job, TQByteArray &data))); + connect (m_KIO_Job, TQT_SIGNAL(result(TDEIO::Job *)), + this, TQT_SLOT(slotIOJobResult(TDEIO::Job *))); return true; } @@ -150,14 +150,14 @@ bool StreamingJob::stopPlayback() bool StreamingJob::startGetJob() { - m_KIO_Job = KIO::get(m_URL, false, false); + m_KIO_Job = TDEIO::get(m_URL, false, false); if (!m_KIO_Job) return false; m_KIO_Job->setAsyncDataEnabled(true); - connect (m_KIO_Job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotReadData(KIO::Job *, const TQByteArray &))); - connect (m_KIO_Job, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotIOJobResult(KIO::Job *))); + connect (m_KIO_Job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotReadData(TDEIO::Job *, const TQByteArray &))); + connect (m_KIO_Job, TQT_SIGNAL(result(TDEIO::Job *)), + this, TQT_SLOT(slotIOJobResult(TDEIO::Job *))); return true; } @@ -196,7 +196,7 @@ bool StreamingJob::stopCapture() } -void StreamingJob::slotReadData (KIO::Job */*job*/, const TQByteArray &data) +void StreamingJob::slotReadData (TDEIO::Job */*job*/, const TQByteArray &data) { size_t free = m_Buffer.getFreeSize(); if (free < data.size()) { @@ -216,7 +216,7 @@ void StreamingJob::slotReadData (KIO::Job */*job*/, const TQByteArray &data) } -void StreamingJob::slotWriteData (KIO::Job */*job*/, TQByteArray &) +void StreamingJob::slotWriteData (TDEIO::Job */*job*/, TQByteArray &) { size_t size = m_Buffer.getFillSize(); if (size) { @@ -268,7 +268,7 @@ void StreamingJob::removeData(size_t size) } } -void StreamingJob::slotIOJobResult (KIO::Job *job) +void StreamingJob::slotIOJobResult (TDEIO::Job *job) { if (job && job->error()) { emit logStreamError(m_URL, job->errorString()); diff --git a/kradio3/plugins/streaming/streaming-job.h b/kradio3/plugins/streaming/streaming-job.h index f7025d0..190b146 100644 --- a/kradio3/plugins/streaming/streaming-job.h +++ b/kradio3/plugins/streaming/streaming-job.h @@ -65,9 +65,9 @@ public: protected slots: - void slotReadData (KIO::Job *job, const TQByteArray &data); - void slotWriteData (KIO::Job *job, TQByteArray &data); - void slotIOJobResult (KIO::Job *job); + void slotReadData (TDEIO::Job *job, const TQByteArray &data); + void slotWriteData (TDEIO::Job *job, TQByteArray &data); + void slotIOJobResult (TDEIO::Job *job); signals: @@ -92,7 +92,7 @@ protected: size_t m_SkipCount; - KIO::TransferJob *m_KIO_Job; + TDEIO::TransferJob *m_KIO_Job; bool m_capturing; }; diff --git a/kradio3/plugins/streaming/streaming.cpp b/kradio3/plugins/streaming/streaming.cpp index be464e2..9586eb5 100644 --- a/kradio3/plugins/streaming/streaming.cpp +++ b/kradio3/plugins/streaming/streaming.cpp @@ -90,7 +90,7 @@ void StreamingDevice::noticeConnectedI (ISoundStreamServer *s, bool pointer_vali // PluginBase -void StreamingDevice::saveState (KConfig *c) const +void StreamingDevice::saveState (TDEConfig *c) const { c->setGroup(TQString("streaming-") + PluginBase::name()); c->writeEntry("soundstreamclient-id", m_SoundStreamClientID); @@ -124,7 +124,7 @@ void StreamingDevice::saveState (KConfig *c) const } } -void StreamingDevice::restoreState (KConfig *c) +void StreamingDevice::restoreState (TDEConfig *c) { c->setGroup(TQString("streaming-") + PluginBase::name()); setSoundStreamClientID(c->readEntry("soundstreamclient-id", getSoundStreamClientID())); diff --git a/kradio3/plugins/streaming/streaming.h b/kradio3/plugins/streaming/streaming.h index 1c40528..df55ff8 100644 --- a/kradio3/plugins/streaming/streaming.h +++ b/kradio3/plugins/streaming/streaming.h @@ -56,8 +56,8 @@ public: // PluginBase public: - virtual void saveState (KConfig *) const; - virtual void restoreState (KConfig *); + virtual void saveState (TDEConfig *) const; + virtual void restoreState (TDEConfig *); virtual TQString pluginClassName() const { return "StreamingDevice"; } |