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 --- tdecore/kbufferedio.cpp | 44 ++++++++++++------------- tdecore/kbufferedio.h | 12 +++---- tdecore/kdebug.areas | 2 +- tdecore/kextsock.cpp | 4 +-- tdecore/kextsock.h | 4 +-- tdecore/kprotocolinfo_tdecore.cpp | 4 +-- tdecore/ksimpledirwatch.h | 2 +- tdecore/network/kbufferedsocket.cpp | 64 ++++++++++++++++++------------------- tdecore/network/kbufferedsocket.h | 24 +++++++------- tdecore/network/kclientsocketbase.h | 2 +- tdecore/network/kiobuffer.h | 14 ++++---- tdecore/network/kserversocket.cpp | 10 +++--- tdecore/network/kserversocket.h | 8 ++--- tdecore/network/kstreamsocket.h | 8 ++--- tdecore/network/tdesocketbuffer.cpp | 4 +-- tdecore/network/tdesocketbuffer_p.h | 4 +-- tdecore/tdelibs_export.h | 6 ++-- 17 files changed, 108 insertions(+), 108 deletions(-) (limited to 'tdecore') diff --git a/tdecore/kbufferedio.cpp b/tdecore/kbufferedio.cpp index 951c41244..2424c95e9 100644 --- a/tdecore/kbufferedio.cpp +++ b/tdecore/kbufferedio.cpp @@ -29,7 +29,7 @@ /** * @section impldetails Implementation Details * - * The KBufferedIO class has two purposes: first, it defines an API on how + * The TDEBufferedIO class has two purposes: first, it defines an API on how * that classes providing buffered I/O should provide. Next, it implements on * top of that API a generic buffering, that should suffice for most cases. * @@ -86,7 +86,7 @@ */ // constructor -KBufferedIO::KBufferedIO() : +TDEBufferedIO::TDEBufferedIO() : inBufIndex(0), outBufIndex(0) { inBuf.setAutoDelete(true); @@ -94,14 +94,14 @@ KBufferedIO::KBufferedIO() : } // destructor -KBufferedIO::~KBufferedIO() +TDEBufferedIO::~TDEBufferedIO() { } // sets the buffer sizes // this implementation doesn't support setting the buffer sizes // if any parameter is different than -1 or -2, fail -bool KBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) +bool TDEBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) { if (wsize != -2 && wsize != -1) return false; @@ -112,27 +112,27 @@ bool KBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */) } #ifdef USE_QT3 -int KBufferedIO::bytesAvailable() const +int TDEBufferedIO::bytesAvailable() const #endif // USE_QT3 #ifdef USE_QT4 -qint64 KBufferedIO::bytesAvailable() const +qint64 TDEBufferedIO::bytesAvailable() const #endif // USE_QT4 { return readBufferSize(); } #ifdef USE_QT3 -int KBufferedIO::bytesToWrite() const +int TDEBufferedIO::bytesToWrite() const #endif // USE_QT3 #ifdef USE_QT4 -qint64 KBufferedIO::bytesToWrite() const +qint64 TDEBufferedIO::bytesToWrite() const #endif // USE_QT4 { return writeBufferSize(); } // This function will scan the read buffer for a '\n' -bool KBufferedIO::canReadLine() const +bool TDEBufferedIO::canReadLine() const { if (bytesAvailable() == 0) return false; // no new line in here @@ -140,7 +140,7 @@ bool KBufferedIO::canReadLine() const TQByteArray* buf; // scan each TQByteArray for the occurrence of '\n' - TQPtrList &buflist = ((KBufferedIO*)this)->inBuf; + TQPtrList &buflist = ((TDEBufferedIO*)this)->inBuf; buf = buflist.first(); char *p = buf->data() + inBufIndex; int n = buf->size() - inBufIndex; @@ -162,7 +162,7 @@ bool KBufferedIO::canReadLine() const // unreads the current data // that is, writes into the read buffer, at the beginning -int KBufferedIO::unreadBlock(const char *data, uint len) +int TDEBufferedIO::unreadBlock(const char *data, uint len) { return feedReadBuffer(len, data, true); } @@ -171,7 +171,7 @@ int KBufferedIO::unreadBlock(const char *data, uint len) // protected member functions // -unsigned KBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool discard) +unsigned TDEBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool discard) { { register unsigned u = readBufferSize(); @@ -221,7 +221,7 @@ unsigned KBufferedIO::consumeReadBuffer(unsigned nbytes, char *destbuffer, bool return copied; } -void KBufferedIO::consumeWriteBuffer(unsigned nbytes) +void TDEBufferedIO::consumeWriteBuffer(unsigned nbytes) { TQByteArray *buf = outBuf.first(); if (buf == NULL) @@ -250,7 +250,7 @@ void KBufferedIO::consumeWriteBuffer(unsigned nbytes) } } -unsigned KBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool atBeginning) +unsigned TDEBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool atBeginning) { if (nbytes == 0) return 0; @@ -266,7 +266,7 @@ unsigned KBufferedIO::feedReadBuffer(unsigned nbytes, const char *buffer, bool a return nbytes; } -unsigned KBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer) +unsigned TDEBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer) { if (nbytes == 0) return 0; @@ -277,33 +277,33 @@ unsigned KBufferedIO::feedWriteBuffer(unsigned nbytes, const char *buffer) return nbytes; } -unsigned KBufferedIO::readBufferSize() const +unsigned TDEBufferedIO::readBufferSize() const { unsigned count = 0; - TQByteArray *buf = ((KBufferedIO*)this)->inBuf.first(); + TQByteArray *buf = ((TDEBufferedIO*)this)->inBuf.first(); while (buf != NULL) { count += buf->size(); - buf = ((KBufferedIO*)this)->inBuf.next(); + buf = ((TDEBufferedIO*)this)->inBuf.next(); } return count - inBufIndex; } -unsigned KBufferedIO::writeBufferSize() const +unsigned TDEBufferedIO::writeBufferSize() const { unsigned count = 0; - TQByteArray *buf = ((KBufferedIO*)this)->outBuf.first(); + TQByteArray *buf = ((TDEBufferedIO*)this)->outBuf.first(); while (buf != NULL) { count += buf->size(); - buf = (const_cast(this))->outBuf.next(); + buf = (const_cast(this))->outBuf.next(); } return count - outBufIndex; } -void KBufferedIO::virtual_hook( int id, void* data ) +void TDEBufferedIO::virtual_hook( int id, void* data ) { KAsyncIO::virtual_hook( id, data ); } #include "kbufferedio.moc" diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h index 78bccc9ef..f00ab52b6 100644 --- a/tdecore/kbufferedio.h +++ b/tdecore/kbufferedio.h @@ -25,7 +25,7 @@ #include #include "kasyncio.h" -class KBufferedIOPrivate; +class TDEBufferedIOPrivate; /** * This abstract class implements basic functionality for buffered * input/output. @@ -39,7 +39,7 @@ class KBufferedIOPrivate; * written using QSocket's buffering characteristics will be more easily * ported to the more powerful KExtendedSocket class. * - * KBufferedIO already provides a powerful internal buffering algorithm. However, + * TDEBufferedIO already provides a powerful internal buffering algorithm. However, * this does not include the I/O itself, which must be implemented in * derived classes. Thus, to implement a class that does some I/O, you must * override, in addition to the pure virtual TQIODevice methods, these two: @@ -53,14 +53,14 @@ class KBufferedIOPrivate; * @author Thiago Macieira * @short Buffered I/O */ -class TDECORE_EXPORT KBufferedIO: public KAsyncIO +class TDECORE_EXPORT TDEBufferedIO: public KAsyncIO { Q_OBJECT protected: // no default public constructor - KBufferedIO(); + TDEBufferedIO(); public: /** @@ -79,7 +79,7 @@ public: * Destroys this class. The flushing of the buffers is implementation dependant. * The default implementation discards the contents */ - virtual ~KBufferedIO(); + virtual ~TDEBufferedIO(); /** * Closes the stream now, discarding the contents of the @@ -294,7 +294,7 @@ protected: protected: virtual void virtual_hook( int id, void* data ); private: - KBufferedIOPrivate *d; + TDEBufferedIOPrivate *d; }; #endif // KBUFFEREDIO_H diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas index 9813a0e16..ab08d0ed2 100644 --- a/tdecore/kdebug.areas +++ b/tdecore/kdebug.areas @@ -228,7 +228,7 @@ 7004 kio (KDirListerCache) 7005 kio (Filter) 7006 kio (Scheduler) -7007 kio (KIOJob) +7007 kio (TDEIOJob) 7009 kio (KMimeType) 7010 kio (KRun) 7011 kio (KSycoca) diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp index d77d2c561..de1735382 100644 --- a/tdecore/kextsock.cpp +++ b/tdecore/kextsock.cpp @@ -1570,7 +1570,7 @@ qint64 KExtendedSocket::bytesAvailable() const // as of now, we don't do any extra processing // we only work in input-buffered sockets if (d->flags & inputBufferedSocket) - return KBufferedIO::bytesAvailable(); + return TDEBufferedIO::bytesAvailable(); return 0; // TODO: FIONREAD ioctl } @@ -2246,6 +2246,6 @@ const char* KAddressInfo::canonname() const } void KExtendedSocket::virtual_hook( int id, void* data ) -{ KBufferedIO::virtual_hook( id, data ); } +{ TDEBufferedIO::virtual_hook( id, data ); } #include "kextsock.moc" diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h index 6327d51dc..fad502c04 100644 --- a/tdecore/kextsock.h +++ b/tdecore/kextsock.h @@ -92,7 +92,7 @@ class KExtendedSocketPrivate; * @author Thiago Macieira * @short an extended socket */ -class TDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice +class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public QIODevice { Q_OBJECT @@ -582,7 +582,7 @@ public: * @li #closed() will only be sent if we are indeed reading from the input * stream. That is, if this socket is buffering the input. See setBufferSize * - * Note that, in general, functions inherited/overridden from KBufferedIO will only + * Note that, in general, functions inherited/overridden from TDEBufferedIO will only * work on buffered sockets, like bytesAvailable and bytesToWrite. * @return The return values are: * @li 0: success diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index 943ad1b9a..1c6232068 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -17,8 +17,8 @@ */ #ifdef MAKE_TDECORE_LIB //needed for proper linkage (win32) -#undef KIO_EXPORT -#define KIO_EXPORT KDE_EXPORT +#undef TDEIO_EXPORT +#define TDEIO_EXPORT KDE_EXPORT #endif #define KPROTOCOLINFO_TDECORE diff --git a/tdecore/ksimpledirwatch.h b/tdecore/ksimpledirwatch.h index 36ceafba6..4dcae30b7 100644 --- a/tdecore/ksimpledirwatch.h +++ b/tdecore/ksimpledirwatch.h @@ -63,7 +63,7 @@ class KSimpleDirWatchPrivate; * @short Class for watching directory and file changes. * @author Sven Radej */ -class KIO_EXPORT KSimpleDirWatch : public TQObject +class TDEIO_EXPORT KSimpleDirWatch : public TQObject { Q_OBJECT diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp index 1b08d121e..3e9462922 100644 --- a/tdecore/network/kbufferedsocket.cpp +++ b/tdecore/network/kbufferedsocket.cpp @@ -35,28 +35,28 @@ using namespace KNetwork; using namespace KNetwork::Internal; -class KNetwork::KBufferedSocketPrivate +class KNetwork::TDEBufferedSocketPrivate { public: mutable TDESocketBuffer *input, *output; - KBufferedSocketPrivate() + TDEBufferedSocketPrivate() { input = 0L; output = 0L; } }; -KBufferedSocket::KBufferedSocket(const TQString& host, const TQString& service, +TDEBufferedSocket::TDEBufferedSocket(const TQString& host, const TQString& service, TQObject *parent, const char *name) : KStreamSocket(host, service, parent, name), - d(new KBufferedSocketPrivate) + d(new TDEBufferedSocketPrivate) { setInputBuffering(true); setOutputBuffering(true); } -KBufferedSocket::~KBufferedSocket() +TDEBufferedSocket::~TDEBufferedSocket() { closeNow(); delete d->input; @@ -64,13 +64,13 @@ KBufferedSocket::~KBufferedSocket() delete d; } -void KBufferedSocket::setSocketDevice(TDESocketDevice* device) +void TDEBufferedSocket::setSocketDevice(TDESocketDevice* device) { KStreamSocket::setSocketDevice(device); device->setBlocking(false); } -bool KBufferedSocket::setSocketOptions(int opts) +bool TDEBufferedSocket::setSocketOptions(int opts) { if (opts == Blocking) return false; @@ -79,7 +79,7 @@ bool KBufferedSocket::setSocketOptions(int opts) return KStreamSocket::setSocketOptions(opts); } -void KBufferedSocket::close() +void TDEBufferedSocket::close() { if (!d->output || d->output->isEmpty()) closeNow(); @@ -94,10 +94,10 @@ void KBufferedSocket::close() } #ifdef USE_QT3 -TQ_LONG KBufferedSocket::bytesAvailable() const +TQ_LONG TDEBufferedSocket::bytesAvailable() const #endif #ifdef USE_QT4 -qint64 KBufferedSocket::bytesAvailable() const +qint64 TDEBufferedSocket::bytesAvailable() const #endif { if (!d->input) @@ -106,7 +106,7 @@ qint64 KBufferedSocket::bytesAvailable() const return d->input->length(); } -TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout) +TQ_LONG TDEBufferedSocket::waitForMore(int msecs, bool *timeout) { TQ_LONG retval = KStreamSocket::waitForMore(msecs, timeout); if (d->input) @@ -118,7 +118,7 @@ TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout) return retval; } -TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) +TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) { if (d->input) { @@ -134,13 +134,13 @@ TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen) return KStreamSocket::tqreadBlock(data, maxlen); } -TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) +TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) { from = peerAddress(); return tqreadBlock(data, maxlen); } -TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) +TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) { if (d->input) { @@ -156,13 +156,13 @@ TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) return KStreamSocket::peekBlock(data, maxlen); } -TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) +TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) { from = peerAddress(); return peekBlock(data, maxlen); } -TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) +TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len) { if (state() != Connected) { @@ -192,14 +192,14 @@ TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len return KStreamSocket::tqwriteBlock(data, len); } -TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen, +TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen, const TDESocketAddress&) { // ignore the third parameter return tqwriteBlock(data, maxlen); } -void KBufferedSocket::enableRead(bool enable) +void TDEBufferedSocket::enableRead(bool enable) { KStreamSocket::enableRead(enable); if (!enable && d->input) @@ -216,7 +216,7 @@ void KBufferedSocket::enableRead(bool enable) TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity())); } -void KBufferedSocket::enableWrite(bool enable) +void TDEBufferedSocket::enableWrite(bool enable) { KStreamSocket::enableWrite(enable); if (!enable && d->output && !d->output->isEmpty()) @@ -228,7 +228,7 @@ void KBufferedSocket::enableWrite(bool enable) } } -void KBufferedSocket::stateChanging(SocketState newState) +void TDEBufferedSocket::stateChanging(SocketState newState) { if (newState == Connecting || newState == Connected) { @@ -246,7 +246,7 @@ void KBufferedSocket::stateChanging(SocketState newState) KStreamSocket::stateChanging(newState); } -void KBufferedSocket::setInputBuffering(bool enable) +void TDEBufferedSocket::setInputBuffering(bool enable) { TQMutexLocker locker(mutex()); if (!enable) @@ -260,12 +260,12 @@ void KBufferedSocket::setInputBuffering(bool enable) } } -KIOBufferBase* KBufferedSocket::inputBuffer() +TDEIOBufferBase* TDEBufferedSocket::inputBuffer() { return d->input; } -void KBufferedSocket::setOutputBuffering(bool enable) +void TDEBufferedSocket::setOutputBuffering(bool enable) { TQMutexLocker locker(mutex()); if (!enable) @@ -279,16 +279,16 @@ void KBufferedSocket::setOutputBuffering(bool enable) } } -KIOBufferBase* KBufferedSocket::outputBuffer() +TDEIOBufferBase* TDEBufferedSocket::outputBuffer() { return d->output; } #ifdef USE_QT3 -TQ_ULONG KBufferedSocket::bytesToWrite() const +TQ_ULONG TDEBufferedSocket::bytesToWrite() const #endif #ifdef USE_QT4 -qint64 KBufferedSocket::bytesToWrite() const +qint64 TDEBufferedSocket::bytesToWrite() const #endif { if (!d->output) @@ -297,14 +297,14 @@ qint64 KBufferedSocket::bytesToWrite() const return d->output->length(); } -void KBufferedSocket::closeNow() +void TDEBufferedSocket::closeNow() { KStreamSocket::close(); if (d->output) d->output->clear(); } -bool KBufferedSocket::canReadLine() const +bool TDEBufferedSocket::canReadLine() const { if (!d->input) return false; @@ -312,12 +312,12 @@ bool KBufferedSocket::canReadLine() const return d->input->canReadLine(); } -TQCString KBufferedSocket::readLine() +TQCString TDEBufferedSocket::readLine() { return d->input->readLine(); } -void KBufferedSocket::waitForConnect() +void TDEBufferedSocket::waitForConnect() { if (state() != Connecting) return; // nothing to be waited on @@ -327,7 +327,7 @@ void KBufferedSocket::waitForConnect() KStreamSocket::setSocketOptions(socketOptions() & ~Blocking); } -void KBufferedSocket::slotReadActivity() +void TDEBufferedSocket::slotReadActivity() { if (d->input && state() == Connected) { @@ -374,7 +374,7 @@ void KBufferedSocket::slotReadActivity() } } -void KBufferedSocket::slotWriteActivity() +void TDEBufferedSocket::slotWriteActivity() { if (d->output && !d->output->isEmpty() && (state() == Connected || state() == Closing)) diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h index 158a5a434..60ad3e81d 100644 --- a/tdecore/network/kbufferedsocket.h +++ b/tdecore/network/kbufferedsocket.h @@ -31,12 +31,12 @@ #include "kstreamsocket.h" #include -class KIOBufferBase; +class TDEIOBufferBase; namespace KNetwork { -class KBufferedSocketPrivate; -/** @class KBufferedSocket kbufferedsocket.h kbufferedsocket.h +class TDEBufferedSocketPrivate; +/** @class TDEBufferedSocket kbufferedsocket.h kbufferedsocket.h * @brief Buffered stream sockets. * * This class allows the user to create and operate buffered stream sockets @@ -55,7 +55,7 @@ class KBufferedSocketPrivate; * @see KNetwork::KStreamSocket, KNetwork::TDEServerSocket * @author Thiago Macieira */ -class TDECORE_EXPORT KBufferedSocket: public KStreamSocket +class TDECORE_EXPORT TDEBufferedSocket: public KStreamSocket { Q_OBJECT @@ -68,13 +68,13 @@ public: * @param parent the parent object for this object * @param name the internal name for this object */ - KBufferedSocket(const TQString& node = TQString::null, const TQString& service = TQString::null, + TDEBufferedSocket(const TQString& node = TQString::null, const TQString& service = TQString::null, TQObject* parent = 0L, const char *name = 0L); /** * Destructor. */ - virtual ~KBufferedSocket(); + virtual ~TDEBufferedSocket(); /** * Be sure to catch new devices. @@ -168,7 +168,7 @@ public: /** * Retrieves the input buffer object. */ - KIOBufferBase* inputBuffer(); + TDEIOBufferBase* inputBuffer(); /** * Sets the use of output buffering. @@ -178,7 +178,7 @@ public: /** * Retrieves the output buffer object. */ - KIOBufferBase* outputBuffer(); + TDEIOBufferBase* outputBuffer(); /** * Returns the length of the output buffer. @@ -240,10 +240,10 @@ signals: void bytesWritten(int bytes); private: - KBufferedSocket(const KBufferedSocket&); - KBufferedSocket& operator=(const KBufferedSocket&); + TDEBufferedSocket(const TDEBufferedSocket&); + TDEBufferedSocket& operator=(const TDEBufferedSocket&); - KBufferedSocketPrivate *d; + TDEBufferedSocketPrivate *d; public: // KDE4: remove this function @@ -253,7 +253,7 @@ public: * * This function is provided to ease porting from KExtendedSocket, * which required a call to reset() in order to be able to connect again - * using the same device. This is not necessary in KBufferedSocket any more. + * using the same device. This is not necessary in TDEBufferedSocket any more. */ #ifdef USE_QT3 inline void reset() diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h index 68c45dd28..27da219a9 100644 --- a/tdecore/network/kclientsocketbase.h +++ b/tdecore/network/kclientsocketbase.h @@ -46,7 +46,7 @@ class KClientSocketBasePrivate; * such as, and especially, name resolution and signals. * * @note This class is abstract. If you're looking for a normal, - * client socket class, see @ref KStreamSocket and KBufferedSocket + * client socket class, see @ref KStreamSocket and TDEBufferedSocket * * @author Thiago Macieira */ diff --git a/tdecore/network/kiobuffer.h b/tdecore/network/kiobuffer.h index ac1352a4d..c79daaa70 100644 --- a/tdecore/network/kiobuffer.h +++ b/tdecore/network/kiobuffer.h @@ -32,41 +32,41 @@ class TQIODevice; /** - * @class KIOBufferBase kiobuffer.h kiobuffer.h + * @class TDEIOBufferBase kiobuffer.h kiobuffer.h * @brief base for I/O buffer implementation * * This class declares the base methods to interface with an I/O buffer. * Most applications will not need to access this class directly, since - * it is all handled by @ref KNetwork::KBufferedSocket and other buffering + * it is all handled by @ref KNetwork::TDEBufferedSocket and other buffering * classes. * * @author Thiago Macieira */ -class KIOBufferBase +class TDEIOBufferBase { public: /** * Default constructor. Does nothing. */ - KIOBufferBase() + TDEIOBufferBase() { } /** * Copy constructor. Does nothing here. */ - KIOBufferBase(const KIOBufferBase& ) + TDEIOBufferBase(const TDEIOBufferBase& ) { } /** * Virtual destructor. Does nothing. */ - virtual ~KIOBufferBase() + virtual ~TDEIOBufferBase() { } /** * Assignment operator. Does nothing. */ - KIOBufferBase& operator=(const KIOBufferBase& ) + TDEIOBufferBase& operator=(const TDEIOBufferBase& ) { return *this; } /** diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp index d5a1b90bb..16a48cdf2 100644 --- a/tdecore/network/kserversocket.cpp +++ b/tdecore/network/kserversocket.cpp @@ -47,11 +47,11 @@ public: int backlog; int timeout; - bool bindWhenFound : 1, listenWhenBound : 1, useKBufferedSocket : 1; + bool bindWhenFound : 1, listenWhenBound : 1, useTDEBufferedSocket : 1; TDEServerSocketPrivate() : state(None), timeout(0), bindWhenFound(false), listenWhenBound(false), - useKBufferedSocket(true) + useTDEBufferedSocket(true) { resolver.setFlags(KResolver::Passive); resolver.setFamily(KResolver::KnownFamily); @@ -277,7 +277,7 @@ void TDEServerSocket::close() void TDEServerSocket::setAcceptBuffered(bool enable) { - d->useKBufferedSocket = enable; + d->useTDEBufferedSocket = enable; } KActiveSocketBase* TDEServerSocket::accept() @@ -319,8 +319,8 @@ KActiveSocketBase* TDEServerSocket::accept() } KStreamSocket* streamsocket; - if (d->useKBufferedSocket) - streamsocket = new KBufferedSocket(); + if (d->useTDEBufferedSocket) + streamsocket = new TDEBufferedSocket(); else streamsocket = new KStreamSocket(); streamsocket->setSocketDevice(accepted); diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h index 6821a886a..edb86d0b2 100644 --- a/tdecore/network/kserversocket.h +++ b/tdecore/network/kserversocket.h @@ -95,13 +95,13 @@ class TDEServerSocketPrivate; * * It is important to note that @ref accept can return either an * object of type KNetwork::KStreamSocket or - * KNetwork::KBufferedSocket (default). If you want to accept a + * KNetwork::TDEBufferedSocket (default). If you want to accept a * non-buffered socket, you must first call setAcceptBuffered. * * @warning If you use TDEServerSocket in an auxiliary (non-GUI) thread, * you need to accept only KNetwork::KStreamSocket objects. * - * @see KNetwork::KStreamSocket, KNetwork::KBufferedSocket + * @see KNetwork::KStreamSocket, KNetwork::TDEBufferedSocket * @author Thiago Macieira */ class TDECORE_EXPORT TDEServerSocket: public TQObject, public KPassiveSocketBase @@ -338,7 +338,7 @@ public: * Toggles whether the accepted socket will be buffered or not. * That is, the @ref accept function will always return a KStreamSocket * object or descended from it. If buffering is enabled, the class - * to be returned will be KBufferedSocket. + * to be returned will be TDEBufferedSocket. * * By default, this flag is set to true. * @@ -361,7 +361,7 @@ public: * the base class for active sockets, but it is guaranteed * that the object will be a KStreamSocket or derived from it. * - * @sa KBufferedSocket + * @sa TDEBufferedSocket * @sa setAcceptBuffered */ virtual KActiveSocketBase* accept(); diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h index d077296c1..c1f9e5848 100644 --- a/tdecore/network/kstreamsocket.h +++ b/tdecore/network/kstreamsocket.h @@ -35,7 +35,7 @@ namespace KNetwork { class KResolverEntry; class KResolverResults; class TDEServerSocket; -class KBufferedSocket; +class TDEBufferedSocket; class KStreamSocketPrivate; /** @class KStreamSocket kstreamsocket.h kstreamsocket.h @@ -50,7 +50,7 @@ class KStreamSocketPrivate; * * KStreamSocket objects are thread-safe and can be used in auxiliary * threads (i.e., not the thread in which the Qt event loop runs in). - * Note that KBufferedSocket cannot be used reliably in an auxiliary thread. + * Note that TDEBufferedSocket cannot be used reliably in an auxiliary thread. * * Sample usage: * \code @@ -91,7 +91,7 @@ class KStreamSocketPrivate; * } * \endcode * - * @see KNetwork::KBufferedSocket, KNetwork::TDEServerSocket + * @see KNetwork::TDEBufferedSocket, KNetwork::TDEServerSocket * @author Thiago Macieira */ class TDECORE_EXPORT KStreamSocket: public KClientSocketBase @@ -242,7 +242,7 @@ private: KStreamSocketPrivate *d; friend class TDEServerSocket; - friend class KBufferedSocket; + friend class TDEBufferedSocket; }; } // namespace KNetwork diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp index 52988d344..33b8fe776 100644 --- a/tdecore/network/tdesocketbuffer.cpp +++ b/tdecore/network/tdesocketbuffer.cpp @@ -39,7 +39,7 @@ TDESocketBuffer::TDESocketBuffer(TQ_LONG size) } TDESocketBuffer::TDESocketBuffer(const TDESocketBuffer& other) - : KIOBufferBase(other), m_mutex(true) + : TDEIOBufferBase(other), m_mutex(true) { *this = other; } @@ -54,7 +54,7 @@ TDESocketBuffer& TDESocketBuffer::operator=(const TDESocketBuffer& other) TQMutexLocker locker1(&m_mutex); TQMutexLocker locker2(&other.m_mutex); - KIOBufferBase::operator=(other); + TDEIOBufferBase::operator=(other); m_list = other.m_list; // copy-on-write m_offset = other.m_offset; diff --git a/tdecore/network/tdesocketbuffer_p.h b/tdecore/network/tdesocketbuffer_p.h index be71f462e..0fa5d4e37 100644 --- a/tdecore/network/tdesocketbuffer_p.h +++ b/tdecore/network/tdesocketbuffer_p.h @@ -41,11 +41,11 @@ class KActiveSocketBase; * @class TDESocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h * @brief generic socket buffering code * - * This class implements generic buffering used by @ref KBufferedSocket. + * This class implements generic buffering used by @ref TDEBufferedSocket. * * @author Thiago Macieira */ -class TDESocketBuffer: public KIOBufferBase +class TDESocketBuffer: public TDEIOBufferBase { public: /** diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h index 767752689..a226eac94 100644 --- a/tdecore/tdelibs_export.h +++ b/tdecore/tdelibs_export.h @@ -37,7 +37,7 @@ #define TDEFX_EXPORT KDE_EXPORT #define TDEPRINT_EXPORT KDE_EXPORT #define KDNSSD_EXPORT KDE_EXPORT -#define KIO_EXPORT KDE_EXPORT +#define TDEIO_EXPORT KDE_EXPORT #define DCOP_EXPORT KDE_EXPORT #define KPARTS_EXPORT KDE_EXPORT #define KTEXTEDITOR_EXPORT KDE_EXPORT @@ -73,8 +73,8 @@ # ifndef TDECORE_EXPORT_DEPRECATED # define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT # endif -# ifndef KIO_EXPORT_DEPRECATED -# define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT +# ifndef TDEIO_EXPORT_DEPRECATED +# define TDEIO_EXPORT_DEPRECATED KDE_DEPRECATED TDEIO_EXPORT # endif # ifndef TDEUI_EXPORT_DEPRECATED # define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT -- cgit v1.2.1