Replace deprecated QAbstractSocket::error

See #1198.
longturn · Jan 1, 2023 · ecdc27e · ecdc27e
1 parent 0387a5b
commit ecdc27e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/client/clinet.cpp b/client/clinet.cpp
@@ -118,17 +118,14 @@ static int try_to_connect(const QUrl &url, char *errbuf, int errbufsize)
   // Connect
   if (!client.conn.sock) {
     client.conn.sock = new QTcpSocket;
-    QObject::connect(
-        client.conn.sock,
-        QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
-        [] {
-          if (client.conn.sock != nullptr) {
-            log_debug("%s", qUtf8Printable(client.conn.sock->errorString()));
-            output_window_append(
-                ftc_client, qUtf8Printable(client.conn.sock->errorString()));
-          }
-          client.conn.used = false;
-        });
+    QObject::connect(client.conn.sock, &QAbstractSocket::errorOccurred, [] {
+      if (client.conn.sock != nullptr) {
+        log_debug("%s", qUtf8Printable(client.conn.sock->errorString()));
+        output_window_append(
+            ftc_client, qUtf8Printable(client.conn.sock->errorString()));
+      }
+      client.conn.used = false;
+    });
     QObject::connect(client.conn.sock, &QAbstractSocket::disconnected,
                      [] { client.conn.used = false; });
   }

diff --git a/client/servers.cpp b/client/servers.cpp
@@ -68,10 +68,8 @@ fcUdpScan::fcUdpScan(QObject *parent) : QUdpSocket(parent)
   fcudp_scan = nullptr;
   connect(this, &QUdpSocket::readyRead, this,
           &fcUdpScan::readPendingDatagrams);
-  connect(
-      this,
-      QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
-      this, &fcUdpScan::sockError);
+  connect(this, &QAbstractSocket::errorOccurred, this,
+          &fcUdpScan::sockError);
 }
 
 /**

diff --git a/server/server.cpp b/server/server.cpp
@@ -492,10 +492,8 @@ void server::accept_connections()
     if (server_make_connection(socket, remote) == 0) {
       // Success making the connection, connect signals
       connect(socket, &QIODevice::readyRead, this, &server::input_on_socket);
-      connect(socket,
-              QOverload<QAbstractSocket::SocketError>::of(
-                  &QAbstractSocket::error),
-              this, &server::error_on_socket);
+      connect(socket, &QAbstractSocket::errorOccurred, this,
+              &server::error_on_socket);
 
       // Prevents quitidle from firing immediately
       m_someone_ever_connected = true;