From 296c695c517d90de1c7f76c3b035807619c9bc9a Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Wed, 17 Jun 2020 19:54:17 +0200 Subject: Add ; to Q_UNUSED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I36460d504aaac08bdbb64b6c71b5ab10e062e00d Reviewed-by: Edward Welbourne Reviewed-by: Mårten Nordheim --- src/imports/qmlwebsockets/qqmlwebsocket.cpp | 2 +- src/websockets/qwebsocket_wasm_p.cpp | 2 +- src/websockets/qwebsocketserver.cpp | 2 +- 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; -- cgit v1.2.1