summaryrefslogtreecommitdiffstats
path: root/kdecore/network/kbufferedsocket.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdecore/network/kbufferedsocket.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/network/kbufferedsocket.cpp')
-rw-r--r--kdecore/network/kbufferedsocket.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/kdecore/network/kbufferedsocket.cpp b/kdecore/network/kbufferedsocket.cpp
index 85b433193..04115c051 100644
--- a/kdecore/network/kbufferedsocket.cpp
+++ b/kdecore/network/kbufferedsocket.cpp
@@ -94,7 +94,7 @@ void KBufferedSocket::close()
}
#ifdef USE_QT3
-TQ_LONG KBufferedSocket::bytesAvailable() const
+Q_LONG KBufferedSocket::bytesAvailable() const
#endif
#ifdef USE_QT4
qint64 KBufferedSocket::bytesAvailable() const
@@ -106,9 +106,9 @@ qint64 KBufferedSocket::bytesAvailable() const
return d->input->length();
}
-TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
+Q_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
{
- TQ_LONG retval = KStreamSocket::waitForMore(msecs, timeout);
+ Q_LONG retval = KStreamSocket::waitForMore(msecs, timeout);
if (d->input)
{
resetError();
@@ -118,7 +118,7 @@ TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
return retval;
}
-TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KBufferedSocket::readBlock(char *data, Q_ULONG maxlen)
{
if (d->input)
{
@@ -134,13 +134,13 @@ TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen)
return KStreamSocket::readBlock(data, maxlen);
}
-TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+Q_LONG KBufferedSocket::readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
{
from = peerAddress();
return readBlock(data, maxlen);
}
-TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
+Q_LONG KBufferedSocket::peekBlock(char *data, Q_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, KSocketAddress& from)
+Q_LONG KBufferedSocket::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from)
{
from = peerAddress();
return peekBlock(data, maxlen);
}
-TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG len)
+Q_LONG KBufferedSocket::writeBlock(const char *data, Q_ULONG len)
{
if (state() != Connected)
{
@@ -192,7 +192,7 @@ TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG len)
return KStreamSocket::writeBlock(data, len);
}
-TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG maxlen,
+Q_LONG KBufferedSocket::writeBlock(const char *data, Q_ULONG maxlen,
const KSocketAddress&)
{
// ignore the third parameter
@@ -285,7 +285,7 @@ KIOBufferBase* KBufferedSocket::outputBuffer()
}
#ifdef USE_QT3
-TQ_ULONG KBufferedSocket::bytesToWrite() const
+Q_ULONG KBufferedSocket::bytesToWrite() const
#endif
#ifdef USE_QT4
qint64 KBufferedSocket::bytesToWrite() const
@@ -332,7 +332,7 @@ void KBufferedSocket::slotReadActivity()
if (d->input && state() == Connected)
{
mutex()->lock();
- TQ_LONG len = d->input->receiveFrom(socketDevice());
+ Q_LONG len = d->input->receiveFrom(socketDevice());
if (len == -1)
{
@@ -380,7 +380,7 @@ void KBufferedSocket::slotWriteActivity()
(state() == Connected || state() == Closing))
{
mutex()->lock();
- TQ_LONG len = d->output->sendTo(socketDevice());
+ Q_LONG len = d->output->sendTo(socketDevice());
if (len == -1)
{