diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2014-04-02 20:18:13 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-09 04:01:17 +0200 |
| commit | c8da97458d4f8003beea00d8ba9791e3551be171 (patch) | |
| tree | cf07232e1f31c01d06644648d3c34d6aa4fca4e0 /src/websockets/qwebsocketframe.cpp | |
| parent | 02529e4d9ae2b17c0f15f7f05681f6385bfaa05a (diff) | |
| download | qtwebsockets-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 'src/websockets/qwebsocketframe.cpp')
| -rw-r--r-- | src/websockets/qwebsocketframe.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/websockets/qwebsocketframe.cpp b/src/websockets/qwebsocketframe.cpp index 431710c..e48308f 100644 --- a/src/websockets/qwebsocketframe.cpp +++ b/src/websockets/qwebsocketframe.cpp @@ -42,7 +42,7 @@ /*! \class QWebSocketFrame The class QWebSocketFrame is responsible for reading, validating and - interpreting frames from a websocket. + interpreting frames from a WebSocket. It reads data from a QIODevice, validates it against RFC 6455, and parses it into a frame (data, control). Whenever an error is detected, isValid() returns false. @@ -336,7 +336,7 @@ QWebSocketFrame QWebSocketFrame::readFrame(QIODevice *pIoDevice) switch (processingState) { case PS_WAIT_FOR_MORE_DATA: //TODO: waitForReadyRead should really be changed - //now, when a websocket is used in a GUI thread + //now, when a WebSocket is used in a GUI thread //the GUI will hang for at most 5 seconds //maybe, a QStateMachine should be used if (!pIoDevice->waitForReadyRead(5000)) { |