From 9c2cfa330e113cb76f1adc870d653deba3a035f8 Mon Sep 17 00:00:00 2001 From: Kurt Pattyn Date: Sun, 26 Jan 2014 17:54:51 +0100 Subject: Set default error and errorstring Set the default error and error string to match those of QAbstractSocket. Change-Id: I96277ecda1f56da4de7509a22bcab86df8064e7c Reviewed-by: Frederik Gladhorn --- src/websockets/qwebsocket_p.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 646e24f..f0eae30 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -91,7 +91,7 @@ QWebSocketPrivate::QWebSocketPrivate(const QString &origin, QWebSocketProtocol:: QObject(parent), q_ptr(pWebSocket), m_pSocket(), - m_errorString(), + m_errorString(QWebSocket::tr("Unknown error")), m_version(version), m_resourceName(), m_requestUrl(), @@ -182,7 +182,7 @@ void QWebSocketPrivate::abort() */ QAbstractSocket::SocketError QWebSocketPrivate::error() const { - QAbstractSocket::SocketError err = QAbstractSocket::OperationError; + QAbstractSocket::SocketError err = QAbstractSocket::UnknownSocketError; if (Q_LIKELY(m_pSocket)) err = m_pSocket->error(); return err; -- cgit v1.2.1