diff options
| author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2014-01-18 19:14:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-18 20:45:46 +0100 |
| commit | 367a9ffcc20fd79ee1ea83e4fd5c6b6ae16c5729 (patch) | |
| tree | 8e25402a7ac3d154d6901ce415903890b4f98727 /src/websockets/qwebsockethandshakeresponse.cpp | |
| parent | d6abdaf4921cd375d71d9016c36d27ac83138a20 (diff) | |
| download | qtwebsockets-367a9ffcc20fd79ee1ea83e4fd5c6b6ae16c5729.tar.gz | |
Rename enumerations to comply with Qt style
Change-Id: Id72fe27cec606e7f02b8e9ac1d0d763890e86a95
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets/qwebsockethandshakeresponse.cpp')
| -rw-r--r-- | src/websockets/qwebsockethandshakeresponse.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/websockets/qwebsockethandshakeresponse.cpp b/src/websockets/qwebsockethandshakeresponse.cpp index dbf4b6f..3700b21 100644 --- a/src/websockets/qwebsockethandshakeresponse.cpp +++ b/src/websockets/qwebsockethandshakeresponse.cpp @@ -72,8 +72,8 @@ QWebSocketHandshakeResponse::QWebSocketHandshakeResponse( m_response(), m_acceptedProtocol(), m_acceptedExtension(), - m_acceptedVersion(QWebSocketProtocol::V_Unknow), - m_error(QWebSocketProtocol::CC_NORMAL), + m_acceptedVersion(QWebSocketProtocol::VersionUnknown), + m_error(QWebSocketProtocol::CloseCodeNormal), m_errorString() { m_response = getHandshakeResponse(request, serverName, @@ -140,7 +140,7 @@ QString QWebSocketHandshakeResponse::getHandshakeResponse( if (!isOriginAllowed) { if (!m_canUpgrade) { - m_error = QWebSocketProtocol::CC_POLICY_VIOLATED; + m_error = QWebSocketProtocol::CloseCodePolicyViolated; m_errorString = tr("Access forbidden."); response << QStringLiteral("HTTP/1.1 403 Access Forbidden"); } @@ -157,7 +157,7 @@ QString QWebSocketHandshakeResponse::getHandshakeResponse( std::greater<QWebSocketProtocol::Version>()); //sort in descending order if (Q_UNLIKELY(matchingVersions.isEmpty())) { - m_error = QWebSocketProtocol::CC_PROTOCOL_ERROR; + m_error = QWebSocketProtocol::CloseCodeProtocolError; m_errorString = tr("Unsupported version requested."); m_canUpgrade = false; } else { @@ -189,7 +189,7 @@ QString QWebSocketHandshakeResponse::getHandshakeResponse( m_canUpgrade = true; } } else { - m_error = QWebSocketProtocol::CC_PROTOCOL_ERROR; + m_error = QWebSocketProtocol::CloseCodeProtocolError; m_errorString = tr("Bad handshake request received."); m_canUpgrade = false; } |