diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-05 21:54:32 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-05 21:54:32 +0000 |
| commit | 229a34d015564ecd61be45648f15044ea3e4ec8a (patch) | |
| tree | b58510cd03109802f5b2d1a7cd4ad429ea01ec88 /kdecore/network/kbufferedsocket.h | |
| parent | 6d1c49c8bd45ba0a096006fb2df45ce1e4ba901b (diff) | |
| download | tdelibs-229a34d015564ecd61be45648f15044ea3e4ec8a.tar.gz tdelibs-229a34d015564ecd61be45648f15044ea3e4ec8a.zip | |
Various compilation fixes.
Most are to specify types where ambiguity is present,
so for example 'T' becomes (QChar)'T'
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1159657 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/network/kbufferedsocket.h')
| -rw-r--r-- | kdecore/network/kbufferedsocket.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/kdecore/network/kbufferedsocket.h b/kdecore/network/kbufferedsocket.h index d99862781..bca034002 100644 --- a/kdecore/network/kbufferedsocket.h +++ b/kdecore/network/kbufferedsocket.h @@ -98,7 +98,12 @@ public: /** * Make use of the buffers. */ +#ifdef USE_QT3 virtual Q_LONG bytesAvailable() const; +#endif +#ifdef USE_QT4 + virtual qint64 bytesAvailable() const; +#endif /** * Make use of buffers. @@ -177,7 +182,12 @@ public: /** * Returns the length of the output buffer. */ +#ifdef USE_QT3 virtual Q_ULONG bytesToWrite() const; +#endif +#ifdef USE_QT4 + virtual qint64 bytesToWrite() const; +#endif /** * Closes the socket and discards any output data that had been buffered @@ -244,7 +254,12 @@ public: * which required a call to reset() in order to be able to connect again * using the same device. This is not necessary in KBufferedSocket any more. */ +#ifdef USE_QT3 inline void reset() +#endif +#ifdef USE_QT4 + inline bool reset() +#endif { closeNow(); } }; |