From 71ec9705f1cd5e1c6e5ecb62c1b4a3c8797e0b59 Mon Sep 17 00:00:00 2001
From: ctrlaltca
Date: Fri, 10 Oct 2025 23:52:49 +0200
Subject: Fix error handling of QSslSocket (#2718)

---
 src/modules/objects/KvsObject_socket.cpp | 2 +-
 src/modules/objects/qtftp/qftp.cpp       | 6 +++---
 src/modules/objects/qthttp/qhttp.cpp     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/modules/objects')

diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index b1e492c7e..5fa50a84c 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -587,7 +587,7 @@ void KvsObject_socket::makeConnections()
 	connect(m_pSocket, SIGNAL(connected()), this, SLOT(slotConnected()));
 	connect(m_pSocket, SIGNAL(readyRead()), this, SLOT(slotReadyRead()));
 	connect(m_pSocket, SIGNAL(disconnected()), this, SLOT(slotDisconnected()));
-	connect(m_pSocket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(slotError(QAbstractSocket::SocketError)));
+	connect(m_pSocket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), this, SLOT(slotError(QAbstractSocket::SocketError)));
 	connect(m_pSocket, SIGNAL(hostFound()), this, SLOT(slotHostFound()));
 	connect(m_pSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(slotStateChanged(QAbstractSocket::SocketState)));
 	//proxyAuthenticationRequired ( const QNetworkProxy & proxy, QAuthenticator * authenticator )
diff --git a/src/modules/objects/qtftp/qftp.cpp b/src/modules/objects/qtftp/qftp.cpp
index 483e00be1..6c3505c1a 100644
--- a/src/modules/objects/qtftp/qftp.cpp
+++ b/src/modules/objects/qtftp/qftp.cpp
@@ -168,7 +168,7 @@ void QFtpDTP::connectToHost(const QString & host, quint16 port)
 	socket->setObjectName(QLatin1String("QFtpDTP Passive state socket"));
 	connect(socket, SIGNAL(connected()), SLOT(socketConnected()));
 	connect(socket, SIGNAL(readyRead()), SLOT(socketReadyRead()));
-	connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(socketError(QAbstractSocket::SocketError)));
+	connect(socket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), SLOT(socketError(QAbstractSocket::SocketError)));
 	connect(socket, SIGNAL(disconnected()), SLOT(socketConnectionClosed()));
 	connect(socket, SIGNAL(bytesWritten(qint64)), SLOT(socketBytesWritten(qint64)));
 
@@ -654,7 +654,7 @@ void QFtpDTP::setupSocket()
 	socket->setObjectName(QLatin1String("QFtpDTP Active state socket"));
 	connect(socket, SIGNAL(connected()), SLOT(socketConnected()));
 	connect(socket, SIGNAL(readyRead()), SLOT(socketReadyRead()));
-	connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(socketError(QAbstractSocket::SocketError)));
+	connect(socket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), SLOT(socketError(QAbstractSocket::SocketError)));
 	connect(socket, SIGNAL(disconnected()), SLOT(socketConnectionClosed()));
 	connect(socket, SIGNAL(bytesWritten(qint64)), SLOT(socketBytesWritten(qint64)));
 
@@ -691,7 +691,7 @@ QFtpPI::QFtpPI(QObject * parent) : QObject(parent),
 	    SLOT(connectionClosed()));
 	connect(&commandSocket, SIGNAL(readyRead()),
 	    SLOT(readyRead()));
-	connect(&commandSocket, SIGNAL(error(QAbstractSocket::SocketError)),
+	connect(&commandSocket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
 	    SLOT(error(QAbstractSocket::SocketError)));
 
 	connect(&dtp, SIGNAL(connectState(int)),
diff --git a/src/modules/objects/qthttp/qhttp.cpp b/src/modules/objects/qthttp/qhttp.cpp
index 84e5e28e5..192b55d7e 100644
--- a/src/modules/objects/qthttp/qhttp.cpp
+++ b/src/modules/objects/qthttp/qhttp.cpp
@@ -3314,7 +3314,7 @@ void QHttpPrivate::setSock(QTcpSocket * sock)
 	QObject::connect(socket, SIGNAL(connected()), q, SLOT(_q_slotConnected()));
 	QObject::connect(socket, SIGNAL(disconnected()), q, SLOT(_q_slotClosed()));
 	QObject::connect(socket, SIGNAL(readyRead()), q, SLOT(_q_slotReadyRead()));
-	QObject::connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), q, SLOT(_q_slotError(QAbstractSocket::SocketError)));
+	QObject::connect(socket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), q, SLOT(_q_slotError(QAbstractSocket::SocketError)));
 	QObject::connect(socket, SIGNAL(bytesWritten(qint64)),
 	    q, SLOT(_q_slotBytesWritten(qint64)));
 #ifndef QT_NO_NETWORKPROXY
-- 
cgit v1.3.1-10-gc9f91