From d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 13:15:51 -0600 Subject: Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4 --- arts/kde/artskde.idl | 2 +- arts/kde/kaudioconverter.cc | 6 +++--- arts/kde/kioinputstream_impl.cpp | 34 +++++++++++++++++----------------- arts/kde/kioinputstream_impl.h | 6 +++--- arts/kde/kiotest.cc | 2 +- arts/kde/kiotestslow.cc | 2 +- arts/kde/kplayobject.h | 2 +- arts/kde/kplayobjectcreator.cc | 4 ++-- arts/kde/kplayobjectcreator.h | 2 +- arts/kde/kplayobjectfactory.cc | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) (limited to 'arts') diff --git a/arts/kde/artskde.idl b/arts/kde/artskde.idl index f31b49ed4..f1de50924 100644 --- a/arts/kde/artskde.idl +++ b/arts/kde/artskde.idl @@ -12,7 +12,7 @@ interface KFloatWatchProxy { /* * used for deliviering MCOP data to the playobjects */ -interface KIOInputStream : InputStream { +interface TDEIOInputStream : InputStream { boolean openURL(string url); attribute long bufferPackets; diff --git a/arts/kde/kaudioconverter.cc b/arts/kde/kaudioconverter.cc index adda3033a..c5a526db6 100644 --- a/arts/kde/kaudioconverter.cc +++ b/arts/kde/kaudioconverter.cc @@ -81,12 +81,12 @@ void KAudioConverter::requestPlayObject(const KURL &url) { string queryInterface = "Arts::PlayObject"; - Arts::KIOInputStream inputStream; + Arts::TDEIOInputStream inputStream; if(!url.isLocalFile()) { - Arts::KIOInputStream_impl *inputStreamImpl = new Arts::KIOInputStream_impl(); - inputStream = Arts::KIOInputStream::_from_base(inputStreamImpl); + Arts::TDEIOInputStream_impl *inputStreamImpl = new Arts::TDEIOInputStream_impl(); + inputStream = Arts::TDEIOInputStream::_from_base(inputStreamImpl); TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &))); diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index ab215a585..4ff509980 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -41,9 +41,9 @@ using namespace Arts; -const unsigned int KIOInputStream_impl::PACKET_COUNT = 10; +const unsigned int TDEIOInputStream_impl::PACKET_COUNT = 10; -KIOInputStream_impl::KIOInputStream_impl() : m_packetSize(2048) +TDEIOInputStream_impl::TDEIOInputStream_impl() : m_packetSize(2048) { m_job = 0; m_finished = false; @@ -55,13 +55,13 @@ KIOInputStream_impl::KIOInputStream_impl() : m_packetSize(2048) m_size = 0; } -KIOInputStream_impl::~KIOInputStream_impl() +TDEIOInputStream_impl::~TDEIOInputStream_impl() { if(m_job != 0) m_job->kill(); } -void KIOInputStream_impl::streamStart() +void TDEIOInputStream_impl::streamStart() { // prevent kill/reconnect if (m_streamStarted) { @@ -92,7 +92,7 @@ void KIOInputStream_impl::streamStart() m_streamStarted = true; } -void KIOInputStream_impl::streamEnd() +void TDEIOInputStream_impl::streamEnd() { kdDebug( 400 ) << "streamEnd()\n"; @@ -117,14 +117,14 @@ void KIOInputStream_impl::streamEnd() m_streamStarted = false; } -bool KIOInputStream_impl::openURL(const std::string& url) +bool TDEIOInputStream_impl::openURL(const std::string& url) { m_url = KURL(url.c_str()); m_size = 0; return true; } -void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data) +void TDEIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data) { if(m_finished) m_finished = false; @@ -136,7 +136,7 @@ void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data) processQueue(); } -void KIOInputStream_impl::slotResult(TDEIO::Job *job) +void TDEIOInputStream_impl::slotResult(TDEIO::Job *job) { // jobs delete themselves after emitting their result m_finished = true; @@ -151,38 +151,38 @@ void KIOInputStream_impl::slotResult(TDEIO::Job *job) } } -void KIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype) +void TDEIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype) { kdDebug( 400 ) << "got mimetype: " << mimetype << endl; emit mimeTypeFound(mimetype); } -void KIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size) +void TDEIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size) { m_size = size; } -bool KIOInputStream_impl::eof() +bool TDEIOInputStream_impl::eof() { return (m_finished && m_data.size() == 0); } -bool KIOInputStream_impl::seekOk() +bool TDEIOInputStream_impl::seekOk() { return false; } -long KIOInputStream_impl::size() +long TDEIOInputStream_impl::size() { return m_size ? m_size : m_data.size(); } -long KIOInputStream_impl::seek(long) +long TDEIOInputStream_impl::seek(long) { return -1; } -void KIOInputStream_impl::processQueue() +void TDEIOInputStream_impl::processQueue() { if(m_job != 0) { @@ -210,7 +210,7 @@ void KIOInputStream_impl::processQueue() } } -void KIOInputStream_impl::request_outdata(DataPacket *packet) +void TDEIOInputStream_impl::request_outdata(DataPacket *packet) { processQueue(); packet->size = std::min(m_packetSize, (unsigned int)m_data.size()); @@ -233,4 +233,4 @@ void KIOInputStream_impl::request_outdata(DataPacket *packet) packet->send(); } -REGISTER_IMPLEMENTATION(KIOInputStream_impl); +REGISTER_IMPLEMENTATION(TDEIOInputStream_impl); diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h index 06052e04b..d0a872881 100644 --- a/arts/kde/kioinputstream_impl.h +++ b/arts/kde/kioinputstream_impl.h @@ -31,14 +31,14 @@ namespace Arts { -class KIOInputStream_impl : public TQObject, virtual public KIOInputStream_skel, +class TDEIOInputStream_impl : public TQObject, virtual public TDEIOInputStream_skel, virtual public InputStream_skel, virtual public StdSynthModule { Q_OBJECT public: - KIOInputStream_impl(); - ~KIOInputStream_impl(); + TDEIOInputStream_impl(); + ~TDEIOInputStream_impl(); void streamStart(); void streamEnd(); diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc index 826a3b165..f838c4f77 100644 --- a/arts/kde/kiotest.cc +++ b/arts/kde/kiotest.cc @@ -27,7 +27,7 @@ int main(int argc, char **argv) TDEApplication app; QIOManager qiomanager; Dispatcher dispatcher(&qiomanager); - KIOInputStream stream; + TDEIOInputStream stream; StdoutWriter writer; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index e367ea924..ffb71d8b1 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -96,7 +96,7 @@ int main(int argc, char **argv) QIOManager qiomanager; Dispatcher dispatcher(&qiomanager); #ifndef USE_FILEINPUTSTREAM - KIOInputStream stream; + TDEIOInputStream stream; #else FileInputStream stream; #endif diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h index 4aafe0b58..f5bd849be 100644 --- a/arts/kde/kplayobject.h +++ b/arts/kde/kplayobject.h @@ -126,7 +126,7 @@ class PlayObjectFactory; * This class acts as a general interface to the KDE multimedia framework. * You basically point the Playobject to an URL and say "play", and it will * automatically decode and play and / or display the file or stream. - * For non-local media, it will make extensive use of KIOInputStream to + * For non-local media, it will make extensive use of TDEIOInputStream to * directly play the content from the remote location without having to * download it to a temporary local file first. * diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cc index b1969718e..2e8187e67 100644 --- a/arts/kde/kplayobjectcreator.cc +++ b/arts/kde/kplayobjectcreator.cc @@ -53,8 +53,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj m_createBUS = createBUS; // This is the RightWay(tm) according to stw - Arts::KIOInputStream_impl* instream_impl = new Arts::KIOInputStream_impl(); - m_instream = Arts::KIOInputStream::_from_base(instream_impl); + Arts::TDEIOInputStream_impl* instream_impl = new Arts::TDEIOInputStream_impl(); + m_instream = Arts::TDEIOInputStream::_from_base(instream_impl); // signal will be called once the ioslave knows the mime-type of the stream connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)), diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h index d52e18a1e..74e571c8e 100644 --- a/arts/kde/kplayobjectcreator.h +++ b/arts/kde/kplayobjectcreator.h @@ -46,7 +46,7 @@ private slots: private: Arts::SoundServerV2 m_server; - Arts::KIOInputStream m_instream; + Arts::TDEIOInputStream m_instream; Arts::PlayObject playObject; bool m_createBUS; }; diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc index c09692946..db4110792 100644 --- a/arts/kde/kplayobjectfactory.cc +++ b/arts/kde/kplayobjectfactory.cc @@ -75,7 +75,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQStri { if(mimetype == "application/octet-stream" && m_allowStreaming) { - Arts::KIOInputStream instream; + Arts::TDEIOInputStream instream; instream.openURL(url.url().latin1()); m_stream = true; -- cgit v1.2.3