summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2014-04-02 20:18:13 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-09 04:01:17 +0200
commitc8da97458d4f8003beea00d8ba9791e3551be171 (patch)
treecf07232e1f31c01d06644648d3c34d6aa4fca4e0 /examples
parent02529e4d9ae2b17c0f15f7f05681f6385bfaa05a (diff)
downloadqtwebsockets-c8da97458d4f8003beea00d8ba9791e3551be171.tar.gz
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 <pattyn.kurt@gmail.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/websockets/doc/echoclient.qdoc4
-rw-r--r--examples/websockets/doc/echoserver.qdoc2
-rw-r--r--examples/websockets/doc/simplechat.qdoc4
-rw-r--r--examples/websockets/echoclient/echoclient.cpp2
-rw-r--r--examples/websockets/echoserver/echoclient.html16
-rw-r--r--examples/websockets/simplechat/chatclient.html16
-rw-r--r--examples/websockets/sslechoclient/sslechoclient.cpp2
-rw-r--r--examples/websockets/sslechoserver/sslechoclient.html16
8 files changed, 31 insertions, 31 deletions
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 @@
<html>
<head>
- <title>Websocket Echo Client</title>
+ <title>WebSocket Echo Client</title>
</head>
<body>
- <h1>Websocket Echo Client</h1>
+ <h1>WebSocket Echo Client</h1>
<p>
- <button onClick="initWebsocket();">Connect</button>
- <button onClick="stopWebsocket();">Disconnect</button>
+ <button onClick="initWebSocket();">Connect</button>
+ <button onClick="stopWebSocket();">Disconnect</button>
<button onClick="checkSocket();">State</button>
</p>
<p>
@@ -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");
}
}
</script>
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 @@
<html>
<head>
- <title>Websocket Chat Client</title>
+ <title>WebSocket Chat Client</title>
</head>
<body>
- <h1>Websocket Chat Client</h1>
+ <h1>WebSocket Chat Client</h1>
<p>
- <button onClick="initWebsocket();">Connect</button>
- <button onClick="stopWebsocket();">Disconnect</button>
+ <button onClick="initWebSocket();">Connect</button>
+ <button onClick="stopWebSocket();">Disconnect</button>
<button onClick="checkSocket();">State</button>
</p>
<p>
@@ -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");
}
}
</script>
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 @@
<!DOCTYPE html>
<html>
<head>
- <title>Websocket Echo Client</title>
+ <title>WebSocket Echo Client</title>
<meta charset="utf-8">
</head>
<body>
- <h1>Websocket Echo Client</h1>
+ <h1>WebSocket Echo Client</h1>
<p>
- <button onClick="initWebsocket();">Connect</button>
- <button onClick="stopWebsocket();">Disconnect</button>
+ <button onClick="initWebSocket();">Connect</button>
+ <button onClick="stopWebSocket();">Disconnect</button>
<button onClick="checkSocket();">State</button>
</p>
<p>
@@ -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");
}
}
</script>
View Lorry Controller Status