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/ksocketdevice.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'kdecore/network/ksocketdevice.cpp')

diff --git a/kdecore/network/ksocketdevice.cpp b/kdecore/network/ksocketdevice.cpp
index 2885efdb3..53a16ca0a 100644
--- a/kdecore/network/ksocketdevice.cpp
+++ b/kdecore/network/ksocketdevice.cpp
@@ -364,7 +364,12 @@ bool KSocketDevice::disconnect()
   return true;			// all is well
 }
 
+#ifdef USE_QT3
 Q_LONG KSocketDevice::bytesAvailable() const
+#endif
+#ifdef USE_QT4
+qint64 KSocketDevice::bytesAvailable() const
+#endif
 {
   if (m_sockfd == -1)
     return -1;			// there's nothing to read in a closed socket
-- 
cgit v1.2.1