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 | |
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')
-rw-r--r-- | src/network/access/qhttpthreaddelegate.cpp | 2 | ||||
-rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 2 | ||||
-rw-r--r-- | src/network/kernel/qdnslookup_unix.cpp | 6 | ||||
-rw-r--r-- | src/network/kernel/qnetconmonitor_stub.cpp | 10 | ||||
-rw-r--r-- | src/network/kernel/qnetworkinterface_unix.cpp | 8 | ||||
-rw-r--r-- | src/network/socket/qnativesocketengine_win.cpp | 2 | ||||
-rw-r--r-- | src/network/socket/qsocks5socketengine.cpp | 12 | ||||
-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 |
12 files changed, 33 insertions, 33 deletions
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index 30403b1848..a1d8873fe3 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -169,7 +169,7 @@ static QByteArray makeCacheKey(QUrl &url, QNetworkProxy *proxy, const QString &p } } #else - Q_UNUSED(proxy) + Q_UNUSED(proxy); #endif if (!peerVerifyName.isEmpty()) result += QLatin1Char(':') + peerVerifyName; diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index ecffc7131e..400cfff8d3 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -564,7 +564,7 @@ void QNetworkReplyImplPrivate::appendDownstreamData(QIODevice *data) void QNetworkReplyImplPrivate::appendDownstreamData(const QByteArray &data) { - Q_UNUSED(data) + Q_UNUSED(data); // TODO implement // TODO call diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp index 12b40fc35d..1449c32937 100644 --- a/src/network/kernel/qdnslookup_unix.cpp +++ b/src/network/kernel/qdnslookup_unix.cpp @@ -408,9 +408,9 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN #else void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestName, const QHostAddress &nameserver, QDnsLookupReply *reply) { - Q_UNUSED(requestType) - Q_UNUSED(requestName) - Q_UNUSED(nameserver) + Q_UNUSED(requestType); + Q_UNUSED(requestName); + Q_UNUSED(nameserver); reply->error = QDnsLookup::ResolverError; reply->errorString = tr("Resolver library can't be loaded: No runtime library loading support"); return; diff --git a/src/network/kernel/qnetconmonitor_stub.cpp b/src/network/kernel/qnetconmonitor_stub.cpp index a8ff861739..a992339e42 100644 --- a/src/network/kernel/qnetconmonitor_stub.cpp +++ b/src/network/kernel/qnetconmonitor_stub.cpp @@ -61,8 +61,8 @@ QNetworkConnectionMonitor::QNetworkConnectionMonitor() QNetworkConnectionMonitor::QNetworkConnectionMonitor(const QHostAddress &local, const QHostAddress &remote) : QObject(*new QNetworkConnectionMonitorPrivate) { - Q_UNUSED(local) - Q_UNUSED(remote) + Q_UNUSED(local); + Q_UNUSED(remote); } QNetworkConnectionMonitor::~QNetworkConnectionMonitor() @@ -71,8 +71,8 @@ QNetworkConnectionMonitor::~QNetworkConnectionMonitor() bool QNetworkConnectionMonitor::setTargets(const QHostAddress &local, const QHostAddress &remote) { - Q_UNUSED(local) - Q_UNUSED(remote) + Q_UNUSED(local); + Q_UNUSED(remote); return false; } @@ -140,7 +140,7 @@ bool QNetworkStatusMonitor::isEnabled() void QNetworkStatusMonitor::reachabilityChanged(bool online) { - Q_UNUSED(online) + Q_UNUSED(online); } QT_END_NAMESPACE diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index 977a0dcde9..4b8c58cb40 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -344,7 +344,7 @@ QT_END_INCLUDE_NAMESPACE static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList) { - Q_UNUSED(getMtu) + Q_UNUSED(getMtu); QList<QNetworkInterfacePrivate *> interfaces; QDuplicateTracker<QString> seenInterfaces; QDuplicateTracker<int> seenIndexes; @@ -400,7 +400,7 @@ static void getAddressExtraInfo(QNetworkAddressEntry *entry, struct sockaddr *sa { Q_UNUSED(entry); Q_UNUSED(sa); - Q_UNUSED(ifname) + Q_UNUSED(ifname); } # elif defined(Q_OS_BSD4) @@ -568,7 +568,7 @@ static void getAddressExtraInfo(QNetworkAddressEntry *entry, struct sockaddr *sa static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList) { - Q_UNUSED(getMtu) + Q_UNUSED(getMtu); QList<QNetworkInterfacePrivate *> interfaces; // make sure there's one entry for each interface @@ -600,7 +600,7 @@ static void getAddressExtraInfo(QNetworkAddressEntry *entry, struct sockaddr *sa { Q_UNUSED(entry); Q_UNUSED(sa); - Q_UNUSED(ifname) + Q_UNUSED(ifname); } # endif diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index 2581fc048e..70c96f0096 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -157,7 +157,7 @@ static QByteArray qt_prettyDebug(const char *data, int len, int maxLength) } -#define WS_ERROR_DEBUG(x) verboseWSErrorDebug(x); +#define WS_ERROR_DEBUG(x) verboseWSErrorDebug(x) #else diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp index b1b5621b2a..3d40840c1b 100644 --- a/src/network/socket/qsocks5socketengine.cpp +++ b/src/network/socket/qsocks5socketengine.cpp @@ -1611,9 +1611,9 @@ qint64 QSocks5SocketEngine::readDatagram(char *data, qint64 maxlen, QIpPacketHea } return copyLen; #else - Q_UNUSED(data) - Q_UNUSED(maxlen) - Q_UNUSED(header) + Q_UNUSED(data); + Q_UNUSED(maxlen); + Q_UNUSED(header); return -1; #endif // QT_NO_UDPSOCKET } @@ -1658,9 +1658,9 @@ qint64 QSocks5SocketEngine::writeDatagram(const char *data, qint64 len, const QI return len; #else - Q_UNUSED(data) - Q_UNUSED(len) - Q_UNUSED(header) + Q_UNUSED(data); + Q_UNUSED(len); + Q_UNUSED(header); return -1; #endif // QT_NO_UDPSOCKET } 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; |