diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-17 19:54:17 +0200 |
|---|---|---|
| committer | Lars Schmertmann <lars.schmertmann@governikus.de> | 2020-06-23 18:31:40 +0000 |
| commit | 296c695c517d90de1c7f76c3b035807619c9bc9a (patch) | |
| tree | 50aa4bdf8138fc8b90fbd43ba8f39d14834b3a45 | |
| parent | aeeaa00fa083ac339d0770d633d22f203c504253 (diff) | |
| download | qtwebsockets-296c695c517d90de1c7f76c3b035807619c9bc9a.tar.gz | |
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6.
Task-number: QTBUG-82978
Change-Id: I36460d504aaac08bdbb64b6c71b5ab10e062e00d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| -rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocket.cpp | 2 | ||||
| -rw-r--r-- | src/websockets/qwebsocket_wasm_p.cpp | 2 | ||||
| -rw-r--r-- | src/websockets/qwebsocketserver.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp index 7f862e0..826ccc6 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp @@ -232,7 +232,7 @@ void QQmlWebSocket::setSocket(QWebSocket *socket) void QQmlWebSocket::onError(QAbstractSocket::SocketError error) { - Q_UNUSED(error) + Q_UNUSED(error); setErrorString(m_webSocket->errorString()); setStatus(Error); } diff --git a/src/websockets/qwebsocket_wasm_p.cpp b/src/websockets/qwebsocket_wasm_p.cpp index 85fcab2..73c596c 100644 --- a/src/websockets/qwebsocket_wasm_p.cpp +++ b/src/websockets/qwebsocket_wasm_p.cpp @@ -167,7 +167,7 @@ void QWebSocketPrivate::close(QWebSocketProtocol::CloseCode closeCode, QString r void QWebSocketPrivate::open(const QNetworkRequest &request, bool mask) { - Q_UNUSED(mask) + Q_UNUSED(mask); Q_Q(QWebSocket); const QUrl url = request.url(); if (!url.isValid() || url.toString().contains(QStringLiteral("\r\n"))) { diff --git a/src/websockets/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp index b833503..a7c6157 100644 --- a/src/websockets/qwebsocketserver.cpp +++ b/src/websockets/qwebsocketserver.cpp @@ -263,7 +263,7 @@ QWebSocketServer::QWebSocketServer(const QString &serverName, SslMode secureMode )), parent) { #ifdef QT_NO_SSL - Q_UNUSED(secureMode) + Q_UNUSED(secureMode); #endif Q_D(QWebSocketServer); d->init(); diff --git a/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp b/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp index 5390ff0..980af42 100644 --- a/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp +++ b/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp @@ -1359,7 +1359,7 @@ void tst_DataProcessor::invalidPayloadInCloseFrame() QFETCH(bool, isContinuationFrame); QFETCH(QWebSocketProtocol::CloseCode, expectedCloseCode); - Q_UNUSED(isContinuationFrame) + Q_UNUSED(isContinuationFrame); QByteArray data; QBuffer buffer; @@ -1507,7 +1507,7 @@ void tst_DataProcessor::doCloseFrameTest() QFETCH(bool, isContinuationFrame); QFETCH(QWebSocketProtocol::CloseCode, expectedCloseCode); - Q_UNUSED(isContinuationFrame) + Q_UNUSED(isContinuationFrame); QByteArray data; QBuffer buffer; |