diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:15:51 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:15:51 -0600 |
commit | d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e (patch) | |
tree | ecd8c94dc36cb35dd4810a2b05d1b78bb969e143 /tdecore/network/tdesocketbuffer.cpp | |
parent | 703fb0c89c2eee56a1e613e67a446db9d4287929 (diff) | |
download | tdelibs-d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e.tar.gz tdelibs-d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e.zip |
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/network/tdesocketbuffer.cpp')
-rw-r--r-- | tdecore/network/tdesocketbuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |