diff options
author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-27 14:18:09 +0200 |
---|---|---|
committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-07-07 11:51:48 +0200 |
commit | 6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc (patch) | |
tree | 727427eb4c603e74954d4da462484ea7bf5c65bb /src/network/ssl | |
parent | d9cc1499954829faf9486fb72056e29f1bad58e3 (diff) |
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6.
Task-number: QTBUG-82978
Change-Id: I3f0b6717956ca8fa486bed9817b89dfa19f5e0e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/network/ssl')
-rw-r--r-- | src/network/ssl/qdtls_openssl.cpp | 4 | ||||
-rw-r--r-- | src/network/ssl/qssldiffiehellmanparameters_openssl.cpp | 2 | ||||
-rw-r--r-- | src/network/ssl/qsslsocket.cpp | 2 | ||||
-rw-r--r-- | src/network/ssl/qsslsocket_mac.cpp | 14 | ||||
-rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/network/ssl/qdtls_openssl.cpp b/src/network/ssl/qdtls_openssl.cpp index b71ce6b502..cbbce65999 100644 --- a/src/network/ssl/qdtls_openssl.cpp +++ b/src/network/ssl/qdtls_openssl.cpp @@ -594,7 +594,7 @@ extern "C" int q_dgram_create(BIO *bio) extern "C" int q_dgram_destroy(BIO *bio) { - Q_UNUSED(bio) + Q_UNUSED(bio); return 1; } @@ -862,7 +862,7 @@ void QDtlsPrivateOpenSSL::TimeoutHandler::stop() void QDtlsPrivateOpenSSL::TimeoutHandler::timerEvent(QTimerEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); Q_ASSERT(timerId != -1); killTimer(timerId); diff --git a/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp b/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp index aaf8741130..05b3408b75 100644 --- a/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp +++ b/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp @@ -104,7 +104,7 @@ static int q_DH_check(DH *dh, int *status) // errors from the error queue, but it's not needed anyway // - see the 'isSafeDH' below, how it returns immediately // on 0. - Q_UNUSED(status) + Q_UNUSED(status); return result; } diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 9af8f2a9dc..ac928f10c8 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -2340,7 +2340,7 @@ void QSslSocketPrivate::_q_stateChangedSlot(QAbstractSocket::SocketState state) */ void QSslSocketPrivate::_q_errorSlot(QAbstractSocket::SocketError error) { - Q_UNUSED(error) + Q_UNUSED(error); #ifdef QSSLSOCKET_DEBUG Q_Q(QSslSocket); qCDebug(lcSsl) << "QSslSocket::_q_errorSlot(" << error << ')'; diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp index cad18a0e20..d7c3a82db9 100644 --- a/src/network/ssl/qsslsocket_mac.cpp +++ b/src/network/ssl/qsslsocket_mac.cpp @@ -625,8 +625,8 @@ void QSslSocketBackendPrivate::transmit() QList<QSslError> (QSslSocketBackendPrivate::verify)(QList<QSslCertificate> certificateChain, const QString &hostName) { Q_UNIMPLEMENTED(); - Q_UNUSED(certificateChain) - Q_UNUSED(hostName) + Q_UNUSED(certificateChain); + Q_UNUSED(hostName); QList<QSslError> errors; errors << QSslError(QSslError::UnspecifiedError); @@ -640,11 +640,11 @@ bool QSslSocketBackendPrivate::importPkcs12(QIODevice *device, const QByteArray &passPhrase) { Q_UNIMPLEMENTED(); - Q_UNUSED(device) - Q_UNUSED(key) - Q_UNUSED(cert) - Q_UNUSED(caCertificates) - Q_UNUSED(passPhrase) + Q_UNUSED(device); + Q_UNUSED(key); + Q_UNUSED(cert); + Q_UNUSED(caCertificates); + Q_UNUSED(passPhrase); return false; } diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 8a9bc47fb0..02ce1ed183 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -376,7 +376,7 @@ int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *session) int qt_OCSP_status_server_callback(SSL *ssl, void *ocspRequest) { - Q_UNUSED(ocspRequest) + Q_UNUSED(ocspRequest); if (!ssl) return SSL_TLSEXT_ERR_ALERT_FATAL; |