summaryrefslogtreecommitdiffstats
path: root/kdecore/network
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-29 00:07:20 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-29 00:07:20 +0000
commit9ee4144afedd77175dd068e60ef09399c684dcee (patch)
treeea89d4e804b738146dca0bbded08cdc06d9817dd /kdecore/network
parent0d772cdcb1100285ecb0d9867fc9b795d3c8a707 (diff)
downloadtdelibs-9ee4144afedd77175dd068e60ef09399c684dcee.tar.gz
tdelibs-9ee4144afedd77175dd068e60ef09399c684dcee.zip
Restored qt_cast()
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1217837 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/network')
-rw-r--r--kdecore/network/kclientsocketbase.h2
-rw-r--r--kdecore/network/kresolverstandardworkers.cpp2
-rw-r--r--kdecore/network/ksocketdevice.cpp2
-rw-r--r--kdecore/network/ksocketdevice.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/kdecore/network/kclientsocketbase.h b/kdecore/network/kclientsocketbase.h
index bf1c8c04e..7ec934483 100644
--- a/kdecore/network/kclientsocketbase.h
+++ b/kdecore/network/kclientsocketbase.h
@@ -281,7 +281,7 @@ public:
*
* You should not call this function; instead, use @ref connect
*/
- virtual inline bool open(int)
+ virtual inline bool open(OpenMode)
{ return connect(); }
/**
diff --git a/kdecore/network/kresolverstandardworkers.cpp b/kdecore/network/kresolverstandardworkers.cpp
index 08bd57121..185879841 100644
--- a/kdecore/network/kresolverstandardworkers.cpp
+++ b/kdecore/network/kresolverstandardworkers.cpp
@@ -667,7 +667,7 @@ KResolver::ErrorCodes KStandardWorker::addUnix()
if (!m_encodedName.isEmpty())
return KResolver::AddrFamily; // non local hostname
- if (protocol() || static_cast<const char *>(protocolName()))
+ if (protocol() || !protocolName().isEmpty())
return KResolver::BadFlags; // cannot have Unix sockets with protocols
TQString pathname = serviceName();
diff --git a/kdecore/network/ksocketdevice.cpp b/kdecore/network/ksocketdevice.cpp
index 8b4789e02..54c15b156 100644
--- a/kdecore/network/ksocketdevice.cpp
+++ b/kdecore/network/ksocketdevice.cpp
@@ -171,7 +171,7 @@ bool KSocketDevice::setSocketOptions(int opts)
return true; // all went well
}
-bool KSocketDevice::open(int)
+bool KSocketDevice::open(OpenMode)
{
resetError();
return false;
diff --git a/kdecore/network/ksocketdevice.h b/kdecore/network/ksocketdevice.h
index 5409335aa..4e7c6353d 100644
--- a/kdecore/network/ksocketdevice.h
+++ b/kdecore/network/ksocketdevice.h
@@ -142,7 +142,7 @@ public:
/**
* Reimplementation from TQIODevice. You should not call this function in sockets.
*/
- virtual bool open(int mode);
+ virtual bool open(OpenMode mode);
/**
* Closes the socket. Reimplemented from TQIODevice.