diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
| commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
| tree | 30834aa632d442019e14f88685001d94657d060b /kdecore/network/ksocketdevice.cpp | |
| parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
| download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip | |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/network/ksocketdevice.cpp')
| -rw-r--r-- | kdecore/network/ksocketdevice.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kdecore/network/ksocketdevice.cpp b/kdecore/network/ksocketdevice.cpp index 53a16ca0a..793642bf9 100644 --- a/kdecore/network/ksocketdevice.cpp +++ b/kdecore/network/ksocketdevice.cpp @@ -365,7 +365,7 @@ bool KSocketDevice::disconnect() } #ifdef USE_QT3 -Q_LONG KSocketDevice::bytesAvailable() const +TQ_LONG KSocketDevice::bytesAvailable() const #endif #ifdef USE_QT4 qint64 KSocketDevice::bytesAvailable() const @@ -381,7 +381,7 @@ qint64 KSocketDevice::bytesAvailable() const return nchars; } -Q_LONG KSocketDevice::waitForMore(int msecs, bool *timeout) +TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout) { if (m_sockfd == -1) return -1; // there won't ever be anything to read... @@ -393,7 +393,7 @@ Q_LONG KSocketDevice::waitForMore(int msecs, bool *timeout) return bytesAvailable(); } -static int do_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false) +static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false) { socklen_t len; if (from) @@ -419,7 +419,7 @@ static int do_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress return 0; } -Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen) +TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -440,7 +440,7 @@ Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen) return retval; } -Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen, KSocketAddress &from) +TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from) { resetError(); if (m_sockfd == -1) @@ -461,7 +461,7 @@ Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen, KSocketAddress &from return retval; } -Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen) +TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -482,7 +482,7 @@ Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen) return retval; } -Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) +TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) { resetError(); if (m_sockfd == -1) @@ -503,12 +503,12 @@ Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from return retval; } -Q_LONG KSocketDevice::writeBlock(const char *data, Q_ULONG len) +TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len) { return writeBlock(data, len, KSocketAddress()); } -Q_LONG KSocketDevice::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to) +TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) { resetError(); if (m_sockfd == -1) @@ -884,7 +884,7 @@ KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory) void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities) { TQMutexLocker locker(&defaultImplFactoryMutex); - if (factories.contains(capabilities)) + if (factories.tqcontains(capabilities)) delete factories[capabilities]; factories.insert(capabilities, factory); } |