summaryrefslogtreecommitdiffstats
path: root/kdecore/network/ksockssocketdevice.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 08:24:43 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 08:24:43 +0000
commit96a33d90689a46ea58f812d76fdd2eaf93edecfa (patch)
tree756ca55bffdffc115088699dd1b76c61eb6f64bf /kdecore/network/ksockssocketdevice.cpp
parent5783baba4a547c443e4392f51c8023d38cb9fe6a (diff)
downloadtdelibs-96a33d90689a46ea58f812d76fdd2eaf93edecfa.tar.gz
tdelibs-96a33d90689a46ea58f812d76fdd2eaf93edecfa.zip
Additional TQt for Qt4 compilation fixes
This should not affect TQt for Qt3 per usual git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1215674 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/network/ksockssocketdevice.cpp')
-rw-r--r--kdecore/network/ksockssocketdevice.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kdecore/network/ksockssocketdevice.cpp b/kdecore/network/ksockssocketdevice.cpp
index b9fcb6cdd..3432ef84f 100644
--- a/kdecore/network/ksockssocketdevice.cpp
+++ b/kdecore/network/ksockssocketdevice.cpp
@@ -214,7 +214,7 @@ static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAdd
return 0;
}
-TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
+TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen)
{
resetError();
if (m_sockfd == -1)
@@ -235,7 +235,7 @@ TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
return retval;
}
-TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from)
+TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from)
{
resetError();
if (m_sockfd == -1)
@@ -298,12 +298,12 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddres
return retval;
}
-TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len)
+TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len)
{
- return writeBlock(data, len, KSocketAddress());
+ return tqwriteBlock(data, len, KSocketAddress());
}
-TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
{
resetError();
if (m_sockfd == -1)