From 638280b648d80fcd29242acc653709e4edcf7ad2 Mon Sep 17 00:00:00 2001 From: Kurt Pattyn Date: Thu, 22 Aug 2013 20:42:53 +0200 Subject: [PATCH] Renamed WebSocketProtocol::getCurrentVersion() with currentVersion() --- source/handshakeresponse.cpp | 2 +- source/websocket.cpp | 2 +- source/websocketprotocol.h | 2 +- source/websocketserver.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/handshakeresponse.cpp b/source/handshakeresponse.cpp index 245437d..5996836 100644 --- a/source/handshakeresponse.cpp +++ b/source/handshakeresponse.cpp @@ -97,7 +97,7 @@ QString HandshakeResponse::getHandshakeResponse(const HandshakeRequest &request, "Access-Control-Allow-Origin: " + origin << "Date: " + QDateTime::currentDateTimeUtc().toString("ddd, dd MMM yyyy hh:mm:ss 'GMT'"); - m_acceptedVersion = WebSocketProtocol::getCurrentVersion(); + m_acceptedVersion = WebSocketProtocol::currentVersion(); m_canUpgrade = true; } } diff --git a/source/websocket.cpp b/source/websocket.cpp index a72e519..8e64f6c 100644 --- a/source/websocket.cpp +++ b/source/websocket.cpp @@ -1098,7 +1098,7 @@ QString WebSocket::createHandShakeRequest(QString resourceName, { handshakeRequest << "Origin: " + origin; } - handshakeRequest << "Sec-WebSocket-Version: " + QString::number(WebSocketProtocol::getCurrentVersion()); + handshakeRequest << "Sec-WebSocket-Version: " + QString::number(WebSocketProtocol::currentVersion()); if (extensions.length() > 0) { handshakeRequest << "Sec-WebSocket-Extensions: " + extensions; diff --git a/source/websocketprotocol.h b/source/websocketprotocol.h index 90bd91b..ba385c5 100644 --- a/source/websocketprotocol.h +++ b/source/websocketprotocol.h @@ -82,7 +82,7 @@ namespace WebSocketProtocol void mask(QByteArray *payload, quint32 maskingKey); void mask(char *payload, quint64 size, quint32 maskingKey); - inline Version getCurrentVersion() { return V_LATEST; } + inline Version currentVersion() { return V_LATEST; } } //end namespace WebSocketProtocol diff --git a/source/websocketserver.cpp b/source/websocketserver.cpp index 556c929..e5fc7b7 100644 --- a/source/websocketserver.cpp +++ b/source/websocketserver.cpp @@ -307,7 +307,7 @@ bool WebSocketServer::waitForNewConnection(int msec, bool *timedOut) QList WebSocketServer::supportedVersions() const { QList supportedVersions; - supportedVersions << WebSocketProtocol::getCurrentVersion(); //we only support V13 + supportedVersions << WebSocketProtocol::currentVersion(); //we only support V13 return supportedVersions; } -- 2.7.4