diff options
| author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2014-01-26 01:44:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-01 17:01:19 +0100 |
| commit | 33e2f4e5715f5f3c83ebd08eea682890d81f9403 (patch) | |
| tree | a5c7c6c5cd1923b6aaa80a5562712cd3292daf27 /src | |
| parent | b0134b21df856199b84f62ebf44f4a0f7a9cb02f (diff) | |
| download | qtwebsockets-33e2f4e5715f5f3c83ebd08eea682890d81f9403.tar.gz | |
Move versionFromString() from public to private API
This method is only necessary for processing of handshakes and hence
is not needed in the public API.
Change-Id: I6bb2327337600523a136fb394275c31b9819f631
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/websockets/qwebsockethandshakerequest.cpp | 1 | ||||
| -rw-r--r-- | src/websockets/qwebsocketprotocol.h | 2 | ||||
| -rw-r--r-- | src/websockets/qwebsocketprotocol_p.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/websockets/qwebsockethandshakerequest.cpp b/src/websockets/qwebsockethandshakerequest.cpp index c47dfd0..5d6e827 100644 --- a/src/websockets/qwebsockethandshakerequest.cpp +++ b/src/websockets/qwebsockethandshakerequest.cpp @@ -41,6 +41,7 @@ #include "qwebsockethandshakerequest_p.h" #include "qwebsocketprotocol.h" +#include "qwebsocketprotocol_p.h" #include <QtCore/QString> #include <QtCore/QMap> diff --git a/src/websockets/qwebsocketprotocol.h b/src/websockets/qwebsocketprotocol.h index 1affc76..a7cb1ff 100644 --- a/src/websockets/qwebsocketprotocol.h +++ b/src/websockets/qwebsocketprotocol.h @@ -65,8 +65,6 @@ enum Version VersionLatest = Version13 }; -Version versionFromString(const QString &versionString); - enum CloseCode { CloseCodeNormal = 1000, diff --git a/src/websockets/qwebsocketprotocol_p.h b/src/websockets/qwebsocketprotocol_p.h index 4ce51b5..8850c4d 100644 --- a/src/websockets/qwebsocketprotocol_p.h +++ b/src/websockets/qwebsocketprotocol_p.h @@ -87,6 +87,7 @@ inline bool isCloseCodeValid(int closeCode) } inline Version currentVersion() { return VersionLatest; } +Version versionFromString(const QString &versionString); void Q_AUTOTEST_EXPORT mask(QByteArray *payload, quint32 maskingKey); void Q_AUTOTEST_EXPORT mask(char *payload, quint64 size, quint32 maskingKey); |