From 94dbe30902e36cedb30cb89ea3bd7ecd6c5a03f2 Mon Sep 17 00:00:00 2001
From: "Felix (xq) Queißner" <git@mq32.de>
Date: Tue, 16 Jun 2020 23:01:16 +0200
Subject: Adds improved error handling.

---
 src/geminiclient.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/geminiclient.cpp')

diff --git a/src/geminiclient.cpp b/src/geminiclient.cpp
index 8dff65b..c8a9642 100644
--- a/src/geminiclient.cpp
+++ b/src/geminiclient.cpp
@@ -10,7 +10,12 @@ GeminiClient::GeminiClient() : ProtocolHandler(nullptr)
     connect(&socket, &QSslSocket::readyRead, this, &GeminiClient::socketReadyRead);
     connect(&socket, &QSslSocket::disconnected, this, &GeminiClient::socketDisconnected);
     connect(&socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &GeminiClient::sslErrors);
-    connect(&socket, QOverload<QAbstractSocket::SocketError>::of(&QSslSocket::error), this, &GeminiClient::socketError);
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+    connect(&socket, &QTcpSocket::errorOccurred, this, &GeminiClient::socketError);
+#else
+    connect(&socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), this, &GeminiClient::socketError);
+#endif
 
     QSslConfiguration ssl_config;
     ssl_config.setProtocol(QSsl::TlsV1_2);
@@ -318,8 +323,6 @@ void GeminiClient::socketError(QAbstractSocket::SocketError socketError)
     if(socketError == QAbstractSocket::RemoteHostClosedError) {
         socket.close();
     } else {
-        // qWarning() << socketError << socket.errorString();
-        // TODO: Make the correct error here!
-        emit this->networkError(HostNotFound, socket.errorString());
+        this->emitNetworkError(socketError, socket.errorString());
     }
 }
-- 
cgit v1.2.3