summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2010-07-26 09:41:23 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2010-09-01 12:24:42 (GMT)
commit0920ee7d257dd644256187dceab629015398933d (patch)
tree32715dc4d66eced0ea0dd0b17acd1a13c1fb9309 /src/network
parent11cb9c94db6e7c4d494faa071368179e1b4b4b4d (diff)
downloadQt-0920ee7d257dd644256187dceab629015398933d.zip
Qt-0920ee7d257dd644256187dceab629015398933d.tar.gz
Qt-0920ee7d257dd644256187dceab629015398933d.tar.bz2
Rename doMulticast() to multicastMembershipHelper()
This is a simple rename done for clarity.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/socket/qnativesocketengine_unix.cpp34
-rw-r--r--src/network/socket/qnativesocketengine_win.cpp34
2 files changed, 34 insertions, 34 deletions
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index f9061f8..737e35a 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -597,11 +597,11 @@ int QNativeSocketEnginePrivate::nativeAccept()
}
-static bool doMulticast(QNativeSocketEnginePrivate *d,
- int how6,
- int how4,
- const QHostAddress &groupAddress,
- const QNetworkInterface &interface)
+static bool multicastMembershipHelper(QNativeSocketEnginePrivate *d,
+ int how6,
+ int how4,
+ const QHostAddress &groupAddress,
+ const QNetworkInterface &interface)
{
int sockOpt = 0;
void *sockArg;
@@ -668,29 +668,29 @@ static bool doMulticast(QNativeSocketEnginePrivate *d,
bool QNativeSocketEnginePrivate::nativeJoinMulticastGroup(const QHostAddress &groupAddress,
const QNetworkInterface &interface)
{
- return doMulticast(this,
+ return multicastMembershipHelper(this,
#ifndef QT_NO_IPV6
- IPV6_JOIN_GROUP,
+ IPV6_JOIN_GROUP,
#else
- 0,
+ 0,
#endif
- IP_ADD_MEMBERSHIP,
- groupAddress,
- interface);
+ IP_ADD_MEMBERSHIP,
+ groupAddress,
+ interface);
}
bool QNativeSocketEnginePrivate::nativeLeaveMulticastGroup(const QHostAddress &groupAddress,
const QNetworkInterface &interface)
{
- return doMulticast(this,
+ return multicastMembershipHelper(this,
#ifndef QT_NO_IPV6
- IPV6_LEAVE_GROUP,
+ IPV6_LEAVE_GROUP,
#else
- 0,
+ 0,
#endif
- IP_DROP_MEMBERSHIP,
- groupAddress,
- interface);
+ IP_DROP_MEMBERSHIP,
+ groupAddress,
+ interface);
}
qint64 QNativeSocketEnginePrivate::nativeBytesAvailable() const
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp
index 5580abc..a922b45 100644
--- a/src/network/socket/qnativesocketengine_win.cpp
+++ b/src/network/socket/qnativesocketengine_win.cpp
@@ -765,11 +765,11 @@ int QNativeSocketEnginePrivate::nativeAccept()
return acceptedDescriptor;
}
-static bool doMulticast(QNativeSocketEnginePrivate *d,
- int how6,
- int how4,
- const QHostAddress &groupAddress,
- const QNetworkInterface &iface)
+static bool multicastMembershipHelper(QNativeSocketEnginePrivate *d,
+ int how6,
+ int how4,
+ const QHostAddress &groupAddress,
+ const QNetworkInterface &iface)
{
int sockOpt = 0;
char *sockArg;
@@ -828,29 +828,29 @@ static bool doMulticast(QNativeSocketEnginePrivate *d,
bool QNativeSocketEnginePrivate::nativeJoinMulticastGroup(const QHostAddress &groupAddress,
const QNetworkInterface &iface)
{
- return doMulticast(this,
+ return multicastMembershipHelper(this,
#ifndef QT_NO_IPV6
- IPV6_JOIN_GROUP,
+ IPV6_JOIN_GROUP,
#else
- 0,
+ 0,
#endif
- IP_ADD_MEMBERSHIP,
- groupAddress,
- iface);
+ IP_ADD_MEMBERSHIP,
+ groupAddress,
+ iface);
}
bool QNativeSocketEnginePrivate::nativeLeaveMulticastGroup(const QHostAddress &groupAddress,
const QNetworkInterface &iface)
{
- return doMulticast(this,
+ return multicastMembershipHelper(this,
#ifndef QT_NO_IPV6
- IPV6_LEAVE_GROUP,
+ IPV6_LEAVE_GROUP,
#else
- 0,
+ 0,
#endif
- IP_DROP_MEMBERSHIP,
- groupAddress,
- iface);
+ IP_DROP_MEMBERSHIP,
+ groupAddress,
+ iface);
}
qint64 QNativeSocketEnginePrivate::nativeBytesAvailable() const