From 24ab523acc1175ec1164a847ed7ddfc816f477ac Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Fri, 6 Aug 2021 23:26:02 +0200 Subject: [PATCH 1/2] Replace deprecated QAbstractsocket::error with QAbstractSocket::errorOccurred --- libraries/networking/src/LimitedNodeList.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 65e391d467..d45aca2f89 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -1224,8 +1224,7 @@ void LimitedNodeList::updateLocalSocket() { QTcpSocket* localIPTestSocket = new QTcpSocket; connect(localIPTestSocket, &QTcpSocket::connected, this, &LimitedNodeList::connectedForLocalSocketTest); - connect(localIPTestSocket, static_cast(&QTcpSocket::error), - this, &LimitedNodeList::errorTestingLocalSocket); + connect(localIPTestSocket, &QTcpSocket::errorOccurred, this, &LimitedNodeList::errorTestingLocalSocket); // attempt to connect to our reliable host localIPTestSocket->connectToHost(RELIABLE_LOCAL_IP_CHECK_HOST, RELIABLE_LOCAL_IP_CHECK_PORT); From ae9f2aa1ee6724f855744b399fc4f684a2c81208 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Thu, 12 Aug 2021 22:53:24 +0200 Subject: [PATCH 2/2] Update slots to the new syntax, use QAbstractSocket::errorOccurred --- libraries/embedded-webserver/src/HTTPConnection.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp index 4c00ba676c..5932c7ed56 100644 --- a/libraries/embedded-webserver/src/HTTPConnection.cpp +++ b/libraries/embedded-webserver/src/HTTPConnection.cpp @@ -124,9 +124,9 @@ HTTPConnection::HTTPConnection(QTcpSocket* socket, HTTPManager* parentManager) : _socket->setParent(this); // connect initial slots - connect(socket, SIGNAL(readyRead()), SLOT(readRequest())); - connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(deleteLater())); - connect(socket, SIGNAL(disconnected()), SLOT(deleteLater())); + connect(socket, &QAbstractSocket::readyRead, this, &HTTPConnection::readRequest); + connect(socket, &QAbstractSocket::errorOccurred, this, &HTTPConnection::deleteLater); + connect(socket, &QAbstractSocket::disconnected, this, &HTTPConnection::deleteLater); } HTTPConnection::~HTTPConnection() {