diff options
| author | Felix (xq) Queißner <git@mq32.de> | 2020-06-16 23:01:16 +0200 |
|---|---|---|
| committer | Felix (xq) Queißner <git@mq32.de> | 2020-06-16 23:01:16 +0200 |
| commit | 94dbe30902e36cedb30cb89ea3bd7ecd6c5a03f2 (patch) | |
| tree | 98b32b834960a59102118630f4d936671081f6c7 /src/geminiclient.cpp | |
| parent | a3f3e3933c4a2522e233917a6795c6e9d677e65c (diff) | |
| download | kristall-94dbe30902e36cedb30cb89ea3bd7ecd6c5a03f2.tar.gz | |
Adds improved error handling.
Diffstat (limited to 'src/geminiclient.cpp')
| -rw-r--r-- | src/geminiclient.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
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()); } } |
