summaryrefslogtreecommitdiffstats
path: root/kdecore/network/kclientsocketbase.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-05 21:54:32 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-05 21:54:32 +0000
commit229a34d015564ecd61be45648f15044ea3e4ec8a (patch)
treeb58510cd03109802f5b2d1a7cd4ad429ea01ec88 /kdecore/network/kclientsocketbase.h
parent6d1c49c8bd45ba0a096006fb2df45ce1e4ba901b (diff)
downloadtdelibs-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/kclientsocketbase.h')
-rw-r--r--kdecore/network/kclientsocketbase.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/kdecore/network/kclientsocketbase.h b/kdecore/network/kclientsocketbase.h
index 1a6d3b8b1..d4e31b6b3 100644
--- a/kdecore/network/kclientsocketbase.h
+++ b/kdecore/network/kclientsocketbase.h
@@ -292,7 +292,12 @@ public:
* Returns the number of bytes available on this socket.
* Reimplemented from KSocketBase.
*/
+#ifdef USE_QT3
virtual Q_LONG bytesAvailable() const;
+#endif
+#ifdef USE_QT4
+ virtual qint64 bytesAvailable() const;
+#endif
/**
* Waits for more data. Reimplemented from KSocketBase.