Renamed getters in HandshakeRequest to comply with Qt

Renamed all getXXX() methods by XXX() methods.

Change-Id: I54f52eb5dfc7342b7aecafb3ec65aa54e7b20d13
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 414cd9e..42648a1 100644 (file)
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -194,10 +194,10 @@ QWebSocket *QWebSocketPrivate::upgradeFrom(QTcpSocket *pTcpSocket,
 {
     QWebSocket *pWebSocket = new QWebSocket(pTcpSocket, response.getAcceptedVersion(), parent);
     pWebSocket->d_func()->setExtension(response.getAcceptedExtension());
-    pWebSocket->d_func()->setOrigin(request.getOrigin());
-    pWebSocket->d_func()->setRequestUrl(request.getRequestUrl());
+    pWebSocket->d_func()->setOrigin(request.origin());
+    pWebSocket->d_func()->setRequestUrl(request.requestUrl());
     pWebSocket->d_func()->setProtocol(response.getAcceptedProtocol());
-    pWebSocket->d_func()->setResourceName(request.getRequestUrl().toString(QUrl::RemoveUserInfo));
+    pWebSocket->d_func()->setResourceName(request.requestUrl().toString(QUrl::RemoveUserInfo));
     //a server should not send masked frames
     pWebSocket->d_func()->enableMasking(false);
 

diff --git a/src/websockets/qwebsockethandshakerequest_p.cpp b/src/websockets/qwebsockethandshakerequest_p.cpp
index dacbedc..8026b49 100644 (file)
--- a/src/websockets/qwebsockethandshakerequest_p.cpp
+++ b/src/websockets/qwebsockethandshakerequest_p.cpp
@@ -72,7 +72,7 @@ void QWebSocketHandshakeRequest::clear()
 /*!
     \internal
  */
-int QWebSocketHandshakeRequest::getPort() const
+int QWebSocketHandshakeRequest::port() const
 {
     return m_requestUrl.port(m_port);
 }
@@ -96,7 +96,7 @@ bool QWebSocketHandshakeRequest::isValid() const
 /*!
     \internal
  */
-QMap<QString, QString> QWebSocketHandshakeRequest::getHeaders() const
+QMap<QString, QString> QWebSocketHandshakeRequest::headers() const
 {
     return m_headers;
 }
@@ -104,7 +104,7 @@ QMap<QString, QString> QWebSocketHandshakeRequest::getHeaders() const
 /*!
     \internal
  */
-QList<QWebSocketProtocol::Version> QWebSocketHandshakeRequest::getVersions() const
+QList<QWebSocketProtocol::Version> QWebSocketHandshakeRequest::versions() const
 {
     return m_versions;
 }
@@ -112,7 +112,7 @@ QList<QWebSocketProtocol::Version> QWebSocketHandshakeRequest::getVersions() con
 /*!
     \internal
  */
-QString QWebSocketHandshakeRequest::getResourceName() const
+QString QWebSocketHandshakeRequest::resourceName() const
 {
     return m_requestUrl.path();
 }
@@ -120,7 +120,7 @@ QString QWebSocketHandshakeRequest::getResourceName() const
 /*!
     \internal
  */
-QString QWebSocketHandshakeRequest::getKey() const
+QString QWebSocketHandshakeRequest::key() const
 {
     return m_key;
 }
@@ -128,7 +128,7 @@ QString QWebSocketHandshakeRequest::getKey() const
 /*!
     \internal
  */
-QString QWebSocketHandshakeRequest::getHost() const
+QString QWebSocketHandshakeRequest::host() const
 {
     return m_requestUrl.host();
 }
@@ -136,7 +136,7 @@ QString QWebSocketHandshakeRequest::getHost() const
 /*!
     \internal
  */
-QString QWebSocketHandshakeRequest::getOrigin() const
+QString QWebSocketHandshakeRequest::origin() const
 {
     return m_origin;
 }
@@ -144,7 +144,7 @@ QString QWebSocketHandshakeRequest::getOrigin() const
 /*!
     \internal
  */
-QList<QString> QWebSocketHandshakeRequest::getProtocols() const
+QList<QString> QWebSocketHandshakeRequest::protocols() const
 {
     return m_protocols;
 }
@@ -152,7 +152,7 @@ QList<QString> QWebSocketHandshakeRequest::getProtocols() const
 /*!
     \internal
  */
-QList<QString> QWebSocketHandshakeRequest::getExtensions() const
+QList<QString> QWebSocketHandshakeRequest::extensions() const
 {
     return m_extensions;
 }
@@ -160,7 +160,7 @@ QList<QString> QWebSocketHandshakeRequest::getExtensions() const
 /*!
     \internal
  */
-QUrl QWebSocketHandshakeRequest::getRequestUrl() const
+QUrl QWebSocketHandshakeRequest::requestUrl() const
 {
     return m_requestUrl;
 }

diff --git a/src/websockets/qwebsockethandshakerequest_p.h b/src/websockets/qwebsockethandshakerequest_p.h
index 1939584..88025e9 100644 (file)
--- a/src/websockets/qwebsockethandshakerequest_p.h
+++ b/src/websockets/qwebsockethandshakerequest_p.h
@@ -51,18 +51,18 @@ public:
 
     void clear();
 
-    int getPort() const;
+    int port() const;
     bool isSecure() const;
     bool isValid() const;
-    QMap<QString, QString> getHeaders() const;
-    QList<QWebSocketProtocol::Version> getVersions() const;
-    QString getKey() const;
-    QString getOrigin() const;
-    QList<QString> getProtocols() const;
-    QList<QString> getExtensions() const;
-    QUrl getRequestUrl() const;
-    QString getResourceName() const;
-    QString getHost() const;
+    QMap<QString, QString> headers() const;
+    QList<QWebSocketProtocol::Version> versions() const;
+    QString key() const;
+    QString origin() const;
+    QList<QString> protocols() const;
+    QList<QString> extensions() const;
+    QUrl requestUrl() const;
+    QString resourceName() const;
+    QString host() const;
 
 private:
     QTextStream &readFromStream(QTextStream &textStream);

diff --git a/src/websockets/qwebsockethandshakeresponse_p.cpp b/src/websockets/qwebsockethandshakeresponse_p.cpp
index f0c09dc..56f0041 100644 (file)
--- a/src/websockets/qwebsockethandshakeresponse_p.cpp
+++ b/src/websockets/qwebsockethandshakeresponse_p.cpp
@@ -116,10 +116,10 @@ QString QWebSocketHandshakeResponse::getHandshakeResponse(const QWebSocketHandsh
     {
         if (request.isValid())
         {
-            const QString acceptKey = calculateAcceptKey(request.getKey());
-            const QList<QString> matchingProtocols = supportedProtocols.toSet().intersect(request.getProtocols().toSet()).toList();
-            const QList<QString> matchingExtensions = supportedExtensions.toSet().intersect(request.getExtensions().toSet()).toList();
-            QList<QWebSocketProtocol::Version> matchingVersions = request.getVersions().toSet().intersect(supportedVersions.toSet()).toList();
+            const QString acceptKey = calculateAcceptKey(request.key());
+            const QList<QString> matchingProtocols = supportedProtocols.toSet().intersect(request.protocols().toSet()).toList();
+            const QList<QString> matchingExtensions = supportedExtensions.toSet().intersect(request.extensions().toSet()).toList();
+            QList<QWebSocketProtocol::Version> matchingVersions = request.versions().toSet().intersect(supportedVersions.toSet()).toList();
             std::sort(matchingVersions.begin(), matchingVersions.end(), qGreater<QWebSocketProtocol::Version>());    //sort in descending order
 
             if (matchingVersions.isEmpty())
@@ -142,7 +142,7 @@ QString QWebSocketHandshakeResponse::getHandshakeResponse(const QWebSocketHandsh
                     m_acceptedExtension = matchingExtensions.first();
                     response << QStringLiteral("Sec-WebSocket-Extensions: ") % m_acceptedExtension;
                 }
-                QString origin = request.getOrigin().trimmed();
+                QString origin = request.origin().trimmed();
                 if (origin.isEmpty())
                 {
                     origin = QStringLiteral("*");

diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp
index e611fec..4b6815c 100644 (file)
--- a/src/websockets/qwebsocketserver_p.cpp
+++ b/src/websockets/qwebsocketserver_p.cpp
@@ -302,7 +302,7 @@ void QWebSocketServerPrivate::handshakeReceived()
         QTextStream textStream(pTcpSocket);
         textStream >> request;
 
-        QWebSocketCorsAuthenticator corsAuthenticator(request.getOrigin());
+        QWebSocketCorsAuthenticator corsAuthenticator(request.origin());
         Q_EMIT q->originAuthenticationRequired(&corsAuthenticator);
 
         QWebSocketHandshakeResponse response(request,