diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdecore/network/ksocketdevice.cpp | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-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/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 793642bf9..53a16ca0a 100644 --- a/kdecore/network/ksocketdevice.cpp +++ b/kdecore/network/ksocketdevice.cpp @@ -365,7 +365,7 @@ bool KSocketDevice::disconnect() } #ifdef USE_QT3 -TQ_LONG KSocketDevice::bytesAvailable() const +Q_LONG KSocketDevice::bytesAvailable() const #endif #ifdef USE_QT4 qint64 KSocketDevice::bytesAvailable() const @@ -381,7 +381,7 @@ qint64 KSocketDevice::bytesAvailable() const return nchars; } -TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout) +Q_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 @@ TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout) return bytesAvailable(); } -static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false) +static int do_read_common(int sockfd, char *data, Q_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, TQ_ULONG maxlen, KSocketAddres return 0; } -TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen) +Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -440,7 +440,7 @@ TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen) return retval; } -TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from) +Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen, KSocketAddress &from) { resetError(); if (m_sockfd == -1) @@ -461,7 +461,7 @@ TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &fr return retval; } -TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen) +Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -482,7 +482,7 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen) return retval; } -TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) +Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) { resetError(); if (m_sockfd == -1) @@ -503,12 +503,12 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& fr return retval; } -TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len) +Q_LONG KSocketDevice::writeBlock(const char *data, Q_ULONG len) { return writeBlock(data, len, KSocketAddress()); } -TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) +Q_LONG KSocketDevice::writeBlock(const char *data, Q_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.tqcontains(capabilities)) + if (factories.contains(capabilities)) delete factories[capabilities]; factories.insert(capabilities, factory); } |