From 6cbb9c0b53883229f8d02fa6c08d0676d6c8915b Mon Sep 17 00:00:00 2001 From: Kurt Pattyn Date: Thu, 22 Aug 2013 20:37:30 +0200 Subject: [PATCH] Removed the verb 'get' from the name of public getters --- source/websocket.cpp | 14 +++++++------- source/websocket.h | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/websocket.cpp b/source/websocket.cpp index c4e9e73..a72e519 100644 --- a/source/websocket.cpp +++ b/source/websocket.cpp @@ -527,7 +527,7 @@ void WebSocket::releaseConnections(const QTcpSocket *pTcpSocket) /*! * \brief Returns the version the socket is currently using */ -WebSocketProtocol::Version WebSocket::getVersion() +WebSocketProtocol::Version WebSocket::version() { return m_version; } @@ -535,7 +535,7 @@ WebSocketProtocol::Version WebSocket::getVersion() /** * @brief Returns the name of the resource currently accessed. */ -QString WebSocket::getResourceName() +QString WebSocket::resourceName() { return m_resourceName; } @@ -543,7 +543,7 @@ QString WebSocket::getResourceName() /*! * \brief Returns the url the socket is connected to or will connect to. */ -QUrl WebSocket::getRequestUrl() +QUrl WebSocket::requestUrl() { return m_requestUrl; } @@ -551,7 +551,7 @@ QUrl WebSocket::getRequestUrl() /*! Returns the current origin */ -QString WebSocket::getOrigin() +QString WebSocket::origin() { return m_origin; } @@ -559,7 +559,7 @@ QString WebSocket::getOrigin() /*! Returns the currently used protocol. */ -QString WebSocket::getProtocol() +QString WebSocket::protocol() { return m_protocol; } @@ -567,7 +567,7 @@ QString WebSocket::getProtocol() /*! Returns the currently used extension. */ -QString WebSocket::getExtension() +QString WebSocket::extension() { return m_extension; } @@ -923,7 +923,7 @@ void WebSocket::processStateChanged(QAbstractSocket::SocketState socketState) if (webSocketState == QAbstractSocket::ConnectingState) { m_key = generateKey(); - QString handshake = createHandShakeRequest(m_resourceName, m_requestUrl.host() + ":" + QString::number(m_requestUrl.port(80)), getOrigin(), "", "", m_key); + QString handshake = createHandShakeRequest(m_resourceName, m_requestUrl.host() + ":" + QString::number(m_requestUrl.port(80)), origin(), "", "", m_key); m_pSocket->write(handshake.toLatin1()); } break; diff --git a/source/websocket.h b/source/websocket.h index eb003cd..0175ce2 100644 --- a/source/websocket.h +++ b/source/websocket.h @@ -52,12 +52,12 @@ public: bool waitForConnected(int msecs = 30000); bool waitForDisconnected(int msecs = 30000); - WebSocketProtocol::Version getVersion(); - QString getResourceName(); - QUrl getRequestUrl(); - QString getOrigin(); - QString getProtocol(); - QString getExtension(); + WebSocketProtocol::Version version(); + QString resourceName(); + QUrl requestUrl(); + QString origin(); + QString protocol(); + QString extension(); qint64 send(const char *message); qint64 send(const QString &message); //send data as text -- 2.7.4