summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2018-01-18 13:42:07 +0100
committerMartin Smith <martin.smith@qt.io>2018-01-24 10:01:50 +0000
commitf30d733d1c9886fb5e125229eaa243351c1a525a (patch)
tree55d872f1a5798b272db4368cdd7b80b6e8dd2379 /src/network
parentf53cbd26889d7114c40c5697eb78efcd38f39af0 (diff)
doc: Add more missing return types to \fn commands
Added missing return types to \fn commands and removed some unnecessary \internal comments. Change-Id: Ie6691f83a1c510134d1e83c3d98758360a67217e Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/kernel/qhostaddress.cpp6
-rw-r--r--src/network/kernel/qnetworkinterface.cpp2
-rw-r--r--src/network/ssl/qsslsocket.cpp6
-rw-r--r--src/network/ssl/qsslsocket_openssl11.cpp3
-rw-r--r--src/network/ssl/qsslsocket_opensslpre11.cpp3
5 files changed, 7 insertions, 13 deletions
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index bf00c6efce..63056a525b 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -1233,7 +1233,7 @@ bool QHostAddress::isGlobal() const
\l{https://www.iana.org/assignments/ipv6-address-space/ipv6-address-space.xhtml}{IANA
IPv6 Address Space} registry for more information.
- \sa isLoopback(), isGlobal(). isMulticast(), isSiteLocal(), isUniqueLocalUnicast()
+ \sa isLoopback(), isGlobal(), isMulticast(), isSiteLocal(), isUniqueLocalUnicast()
*/
bool QHostAddress::isLinkLocal() const
{
@@ -1338,8 +1338,8 @@ uint qHash(const QHostAddress &key, uint seed) Q_DECL_NOTHROW
}
/*!
+ \fn bool operator==(QHostAddress::SpecialAddress lhs, const QHostAddress &rhs)
\relates QHostAddress
- \fn operator==(QHostAddress::SpecialAddress lhs, const QHostAddress &rhs)
Returns \c true if special address \a lhs is the same as host address \a rhs;
otherwise returns \c false.
@@ -1348,9 +1348,9 @@ uint qHash(const QHostAddress &key, uint seed) Q_DECL_NOTHROW
*/
/*!
+ \fn bool operator!=(QHostAddress::SpecialAddress lhs, const QHostAddress &rhs)
\relates QHostAddress
\since 5.9
- \fn operator!=(QHostAddress::SpecialAddress lhs, const QHostAddress &rhs)
Returns \c false if special address \a lhs is the same as host address \a rhs;
otherwise returns \c true.
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp
index cab008d2ef..70674e9adf 100644
--- a/src/network/kernel/qnetworkinterface.cpp
+++ b/src/network/kernel/qnetworkinterface.cpp
@@ -166,7 +166,7 @@ QString QNetworkInterfacePrivate::makeHwAddress(int len, uchar *data)
*/
/*!
- \enum QNetworkAddressEntry::DnsEligilibilityStatus
+ \enum QNetworkAddressEntry::DnsEligibilityStatus
\since 5.11
This enum indicates whether a given host address is eligible to be
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 145ae1a3c8..9f07b53e4b 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -215,7 +215,7 @@
*/
/*!
- \fn QSslSocket::encrypted()
+ \fn void QSslSocket::encrypted()
This signal is emitted when QSslSocket enters encrypted mode. After this
signal has been emitted, QSslSocket::isEncrypted() will return true, and
@@ -225,7 +225,7 @@
*/
/*!
- \fn QSslSocket::modeChanged(QSslSocket::SslMode mode)
+ \fn void QSslSocket::modeChanged(QSslSocket::SslMode mode)
This signal is emitted when QSslSocket changes from \l
QSslSocket::UnencryptedMode to either \l QSslSocket::SslClientMode or \l
@@ -235,7 +235,7 @@
*/
/*!
- \fn QSslSocket::encryptedBytesWritten(qint64 written)
+ \fn void QSslSocket::encryptedBytesWritten(qint64 written)
\since 4.4
This signal is emitted when QSslSocket writes its encrypted data to the
diff --git a/src/network/ssl/qsslsocket_openssl11.cpp b/src/network/ssl/qsslsocket_openssl11.cpp
index b6d18943a5..96626b6a0f 100644
--- a/src/network/ssl/qsslsocket_openssl11.cpp
+++ b/src/network/ssl/qsslsocket_openssl11.cpp
@@ -73,9 +73,6 @@ QT_BEGIN_NAMESPACE
Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_opensslInitMutex, (QMutex::Recursive))
-/*!
- \internal
-*/
void QSslSocketPrivate::deinitialize()
{
// This function exists only for compatibility with the pre-11 code,
diff --git a/src/network/ssl/qsslsocket_opensslpre11.cpp b/src/network/ssl/qsslsocket_opensslpre11.cpp
index 8ad4d5b521..5782df65cc 100644
--- a/src/network/ssl/qsslsocket_opensslpre11.cpp
+++ b/src/network/ssl/qsslsocket_opensslpre11.cpp
@@ -198,9 +198,6 @@ static void q_OpenSSL_add_all_algorithms_safe()
}
-/*!
- \internal
-*/
void QSslSocketPrivate::deinitialize()
{
q_CRYPTO_set_id_callback(0);