From 229a34d015564ecd61be45648f15044ea3e4ec8a Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 5 Aug 2010 21:54:32 +0000
Subject: 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
---
 kdecore/network/kclientsocketbase.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'kdecore/network/kclientsocketbase.h')

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.
-- 
cgit v1.2.1