diff options
| author | Martin Smith <martin.smith@qt.io> | 2017-03-09 14:18:46 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2017-12-06 10:02:31 +0000 |
| commit | aefb3a9a076a6df1076cf8bf4f2a3b0c8993f6ee (patch) | |
| tree | 5ce9e37e28475336ac539ae78e88d5ba987d59c2 /src/network/kernel | |
| parent | ceccdff4e9fc93819d819b8ed15d95822f980505 (diff) | |
doc: Ensure clangqdoc sees declarations
This update corrects several uses of #ifdef macros
that needed updating because qdoc now uses clang to
parse header files.
Change-Id: I285efa4629a1a5d5bcbfaf701eeafbd0e9f1e43e
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qnetworkdatagram.cpp | 11 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkdatagram.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/network/kernel/qnetworkdatagram.cpp b/src/network/kernel/qnetworkdatagram.cpp index d167190684..50421fa7f5 100644 --- a/src/network/kernel/qnetworkdatagram.cpp +++ b/src/network/kernel/qnetworkdatagram.cpp @@ -442,10 +442,11 @@ void QNetworkDatagram::setData(const QByteArray &data) } /*! - \fn QNetworkDatagram QNetworkDatagram::makeReply(const QByteArray &data) const + \fn QNetworkDatagram QNetworkDatagram::makeReply(const QByteArray &payload) const & + \fn QNetworkDatagram QNetworkDatagram::makeReply(const QByteArray &payload) && Creates a new QNetworkDatagram representing a reply to this incoming datagram - and sets the payload data to \a data. This function is a very convenient + and sets the payload data to \a payload. This function is a very convenient way of responding to a datagram back to the original sender. Example: @@ -495,6 +496,7 @@ void QNetworkDatagram::setData(const QByteArray &data) \endcode */ + static bool isNonMulticast(const QHostAddress &addr) { // is it a multicast address? @@ -528,6 +530,11 @@ void QNetworkDatagram::destroy(QNetworkDatagramPrivate *d) delete d; } +/*! \fn void QNetworkDatagram::swap(QNetworkDatagram &other) + Swaps this instance with \a other. +*/ + + QT_END_NAMESPACE #endif // QT_NO_UDPSOCKET diff --git a/src/network/kernel/qnetworkdatagram.h b/src/network/kernel/qnetworkdatagram.h index c7605d67ba..1acb44a1e0 100644 --- a/src/network/kernel/qnetworkdatagram.h +++ b/src/network/kernel/qnetworkdatagram.h @@ -91,7 +91,7 @@ public: QByteArray data() const; void setData(const QByteArray &data); -#ifdef Q_COMPILER_REF_QUALIFIERS +#if defined(Q_COMPILER_REF_QUALIFIERS) || defined(Q_CLANG_QDOC) QNetworkDatagram makeReply(const QByteArray &payload) const & { return makeReply_helper(payload); } QNetworkDatagram makeReply(const QByteArray &payload) && |