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/kclientsocketbase.cpp | |
| 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/kclientsocketbase.cpp')
| -rw-r--r-- | kdecore/network/kclientsocketbase.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kdecore/network/kclientsocketbase.cpp b/kdecore/network/kclientsocketbase.cpp index 2da802d56..7ac3ca3b1 100644 --- a/kdecore/network/kclientsocketbase.cpp +++ b/kdecore/network/kclientsocketbase.cpp @@ -278,7 +278,12 @@ void KClientSocketBase::close() } // This function is unlike all the others because it is const +#ifdef USE_QT3 Q_LONG KClientSocketBase::bytesAvailable() const +#endif +#ifdef USE_QT4 +qint64 KClientSocketBase::bytesAvailable() const +#endif { return socketDevice()->bytesAvailable(); } |