diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2011-10-23 20:04:52 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-10-31 20:25:12 +0100 |
| commit | 03f852cb47d508d98aa90f501e9b7f4214e8ad8b (patch) | |
| tree | 1df4fbdc4076205a306d9c3d89d68510e5ad035a /src/network/socket/qudpsocket.h | |
| parent | 3aa81c55e2f42389341feb77b1d9840e6c9b61a2 (diff) | |
Move support for socket binding from QUdpSocket upstream to QAbstractSocket.
This should be API-compatible with Qt 4, but is not ABI-compatible, due to
removing the enum from QUdpSocket.
Task-number: QTBUG-121
Change-Id: I967968c6cb6f96d3ab1d6300eadd5bde6154b300
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/socket/qudpsocket.h')
| -rw-r--r-- | src/network/socket/qudpsocket.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h index c477abd07e..068c20b9c4 100644 --- a/src/network/socket/qudpsocket.h +++ b/src/network/socket/qudpsocket.h @@ -60,23 +60,9 @@ class Q_NETWORK_EXPORT QUdpSocket : public QAbstractSocket { Q_OBJECT public: - enum BindFlag { - DefaultForPlatform = 0x0, - ShareAddress = 0x1, - DontShareAddress = 0x2, - ReuseAddressHint = 0x4 - }; - Q_DECLARE_FLAGS(BindMode, BindFlag) - explicit QUdpSocket(QObject *parent = 0); virtual ~QUdpSocket(); - bool bind(const QHostAddress &address, quint16 port); - bool bind(quint16 port = 0); - bool bind(const QHostAddress &address, quint16 port, BindMode mode); - bool bind(quint16 port, BindMode mode); - // ### Qt 5: Merge the bind functions - #ifndef QT_NO_NETWORKINTERFACE bool joinMulticastGroup(const QHostAddress &groupAddress); bool joinMulticastGroup(const QHostAddress &groupAddress, @@ -101,8 +87,6 @@ private: Q_DECLARE_PRIVATE(QUdpSocket) }; -Q_DECLARE_OPERATORS_FOR_FLAGS(QUdpSocket::BindMode) - #endif // QT_NO_UDPSOCKET QT_END_NAMESPACE |