From 73af2d45921b8b3699450a98f523ccfdf5955250 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 8 Jan 2024 14:39:22 +0100 Subject: Cleanup echoclient cpp example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove m_url property. It is not used. - Remove constructing QUrl from QUrl as it is not required. Pick-to: 6.5 Change-Id: I07944b3b9e190d655be3fc37f2b8fd81018abc1b Reviewed-by: Mårten Nordheim (cherry picked from commit 99d0a787c636e80c02e9ef0384d5ba1a1963ac27) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 458ca7aacdaccbb6214230faa615240952074fc2) --- examples/websockets/echoclient/echoclient.cpp | 3 +-- examples/websockets/echoclient/echoclient.h | 1 - examples/websockets/sslechoclient/sslechoclient.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/websockets/echoclient/echoclient.cpp b/examples/websockets/echoclient/echoclient.cpp index ef760c3..163f1d2 100644 --- a/examples/websockets/echoclient/echoclient.cpp +++ b/examples/websockets/echoclient/echoclient.cpp @@ -8,14 +8,13 @@ QT_USE_NAMESPACE //! [constructor] EchoClient::EchoClient(const QUrl &url, bool debug, QObject *parent) : QObject(parent), - m_url(url), m_debug(debug) { if (m_debug) qDebug() << "WebSocket server:" << url; connect(&m_webSocket, &QWebSocket::connected, this, &EchoClient::onConnected); connect(&m_webSocket, &QWebSocket::disconnected, this, &EchoClient::closed); - m_webSocket.open(QUrl(url)); + m_webSocket.open(url); } //! [constructor] diff --git a/examples/websockets/echoclient/echoclient.h b/examples/websockets/echoclient/echoclient.h index 067956c..553f5d9 100644 --- a/examples/websockets/echoclient/echoclient.h +++ b/examples/websockets/echoclient/echoclient.h @@ -21,7 +21,6 @@ private Q_SLOTS: private: QWebSocket m_webSocket; - QUrl m_url; bool m_debug; }; diff --git a/examples/websockets/sslechoclient/sslechoclient.cpp b/examples/websockets/sslechoclient/sslechoclient.cpp index e5099e1..8fa6053 100644 --- a/examples/websockets/sslechoclient/sslechoclient.cpp +++ b/examples/websockets/sslechoclient/sslechoclient.cpp @@ -24,7 +24,7 @@ SslEchoClient::SslEchoClient(const QUrl &url, QObject *parent) : sslConfiguration.addCaCertificate(certificate); m_webSocket.setSslConfiguration(sslConfiguration); - m_webSocket.open(QUrl(url)); + m_webSocket.open(url); } //! [constructor] -- cgit v1.2.3