From c8da97458d4f8003beea00d8ba9791e3551be171 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Wed, 2 Apr 2014 20:18:13 +0800 Subject: Use the proper protocol names - "WebSocket" is one word, with uppercase 'W' and 'S'. - "HTTP"/"HTTPS" is fully uppercase Change-Id: Ice3a50c94394433c97f7347291af5cda69b234ce Reviewed-by: Kurt Pattyn --- examples/websockets/doc/echoclient.qdoc | 4 ++-- examples/websockets/doc/echoserver.qdoc | 2 +- examples/websockets/doc/simplechat.qdoc | 4 ++-- examples/websockets/echoclient/echoclient.cpp | 2 +- examples/websockets/echoserver/echoclient.html | 16 ++++++++-------- examples/websockets/simplechat/chatclient.html | 16 ++++++++-------- examples/websockets/sslechoclient/sslechoclient.cpp | 2 +- examples/websockets/sslechoserver/sslechoclient.html | 16 ++++++++-------- 8 files changed, 31 insertions(+), 31 deletions(-) (limited to 'examples') diff --git a/examples/websockets/doc/echoclient.qdoc b/examples/websockets/doc/echoclient.qdoc index a6cb1a9..2c64169 100644 --- a/examples/websockets/doc/echoclient.qdoc +++ b/examples/websockets/doc/echoclient.qdoc @@ -43,9 +43,9 @@ \example echoclient \title Echo Client Example \ingroup qtwebsockets-examples - \brief Describes how to use the websocket API for creating a simple echo client. + \brief Describes how to use the WebSocket API for creating a simple echo client. - The Echo Client Example shows how to use the websocket API to create a simple + The Echo Client Example shows how to use the WebSocket API to create a simple echo client. \sa {Echo Server Example} diff --git a/examples/websockets/doc/echoserver.qdoc b/examples/websockets/doc/echoserver.qdoc index fcb0442..ca020bf 100644 --- a/examples/websockets/doc/echoserver.qdoc +++ b/examples/websockets/doc/echoserver.qdoc @@ -47,7 +47,7 @@ sends back the messages it receives. The Echo Server Example shows how to create a simple server application that - sends back the messages it receives, using the websockets API. + sends back the messages it receives, using the WebSocket API. \sa {Echo Client Example} */ diff --git a/examples/websockets/doc/simplechat.qdoc b/examples/websockets/doc/simplechat.qdoc index 506d45a..13591a0 100644 --- a/examples/websockets/doc/simplechat.qdoc +++ b/examples/websockets/doc/simplechat.qdoc @@ -44,9 +44,9 @@ \title Simple Chat Example \ingroup qtwebsockets-examples \brief Shows how to use the QWebSocket and QWebSocketServer classes - for creating a minimalistic chat application over websockets. + for creating a minimalistic chat application over the WebSocket protocol. The Simple Chat Example shows how to use the QWebSocket and QWebSocketServer - classes to create a minimalistic chat application over websockets. + classes to create a minimalistic chat application over the WebSocket protocol. */ diff --git a/examples/websockets/echoclient/echoclient.cpp b/examples/websockets/echoclient/echoclient.cpp index 9e8ba9b..142a81e 100644 --- a/examples/websockets/echoclient/echoclient.cpp +++ b/examples/websockets/echoclient/echoclient.cpp @@ -57,7 +57,7 @@ EchoClient::EchoClient(const QUrl &url, QObject *parent) : //! [onConnected] void EchoClient::onConnected() { - qDebug() << "Websocket connected"; + qDebug() << "WebSocket connected"; connect(&m_webSocket, &QWebSocket::textMessageReceived, this, &EchoClient::onTextMessageReceived); m_webSocket.sendTextMessage(QStringLiteral("Hello, world!")); diff --git a/examples/websockets/echoserver/echoclient.html b/examples/websockets/echoserver/echoclient.html index e9c55dc..1edfb64 100644 --- a/examples/websockets/echoserver/echoclient.html +++ b/examples/websockets/echoserver/echoclient.html @@ -1,12 +1,12 @@ - Websocket Echo Client + WebSocket Echo Client -

Websocket Echo Client

WebSocket Echo Client

- - + +

@@ -37,7 +37,7 @@ var wsUri = "ws://localhost:1234"; var websocket = null; - function initWebsocket() { + function initWebSocket() { try { if (typeof MozWebSocket == 'function') WebSocket = MozWebSocket; @@ -62,7 +62,7 @@ } } - function stopWebsocket() { + function stopWebSocket() { if (websocket) websocket.close(); } @@ -92,9 +92,9 @@ break; } } - debug("Websocket state = " + websocket.readyState + " ( " + stateStr + " )"); + debug("WebSocket state = " + websocket.readyState + " ( " + stateStr + " )"); } else { - debug("Websocket is null"); + debug("WebSocket is null"); } } diff --git a/examples/websockets/simplechat/chatclient.html b/examples/websockets/simplechat/chatclient.html index 5b077f7..511d05b 100644 --- a/examples/websockets/simplechat/chatclient.html +++ b/examples/websockets/simplechat/chatclient.html @@ -1,12 +1,12 @@ - Websocket Chat Client + WebSocket Chat Client -

Websocket Chat Client

WebSocket Chat Client

- - + +

@@ -41,7 +41,7 @@ var wsUri = "ws://localhost:1234"; var websocket = null; - function initWebsocket() { + function initWebSocket() { try { if (typeof MozWebSocket == 'function') WebSocket = MozWebSocket; @@ -66,7 +66,7 @@ } } - function stopWebsocket() { + function stopWebSocket() { if (websocket) websocket.close(); } @@ -96,9 +96,9 @@ break; } } - debug("Websocket state = " + websocket.readyState + " ( " + stateStr + " )"); + debug("WebSocket state = " + websocket.readyState + " ( " + stateStr + " )"); } else { - debug("Websocket is null"); + debug("WebSocket is null"); } } diff --git a/examples/websockets/sslechoclient/sslechoclient.cpp b/examples/websockets/sslechoclient/sslechoclient.cpp index 037990d..2300da2 100644 --- a/examples/websockets/sslechoclient/sslechoclient.cpp +++ b/examples/websockets/sslechoclient/sslechoclient.cpp @@ -61,7 +61,7 @@ SslEchoClient::SslEchoClient(const QUrl &url, QObject *parent) : //! [onConnected] void SslEchoClient::onConnected() { - qDebug() << "Websocket connected"; + qDebug() << "WebSocket connected"; connect(&m_webSocket, &QWebSocket::textMessageReceived, this, &SslEchoClient::onTextMessageReceived); m_webSocket.sendTextMessage(QStringLiteral("Hello, world!")); diff --git a/examples/websockets/sslechoserver/sslechoclient.html b/examples/websockets/sslechoserver/sslechoclient.html index b9faa44..7ecb147 100644 --- a/examples/websockets/sslechoserver/sslechoclient.html +++ b/examples/websockets/sslechoserver/sslechoclient.html @@ -1,14 +1,14 @@ - Websocket Echo Client + WebSocket Echo Client -

Websocket Echo Client

WebSocket Echo Client

- - + +

@@ -39,7 +39,7 @@ } } - function initWebsocket() { + function initWebSocket() { try { if (typeof MozWebSocket == 'function') WebSocket = MozWebSocket; @@ -64,7 +64,7 @@ } } - function stopWebsocket() { + function stopWebSocket() { if (websocket) websocket.close(); } @@ -94,9 +94,9 @@ break; } } - debug("Websocket state = " + websocket.readyState + " ( " + stateStr + " )"); + debug("WebSocket state = " + websocket.readyState + " ( " + stateStr + " )"); } else { - debug("Websocket is null"); + debug("WebSocket is null"); } } -- cgit v1.2.1