fix typo in macro

[contrib/qtwebsockets.git] / src / websockets / qwebsocket_p.h

diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
index 544035f..5c65450 100644 (file)
--- a/src/websockets/qwebsocket_p.h
+++ b/src/websockets/qwebsocket_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Kurt Pattyn <pattyn.kurt@gmail.com>.
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtWebSockets module of the Qt Toolkit.
@@ -64,9 +64,11 @@
 #include <QtNetwork/QSslSocket>
 #endif
 #include <QtCore/QTime>
+#include <private/qobject_p.h>
 
 #include "qwebsocketprotocol.h"
 #include "qwebsocketdataprocessor_p.h"
+#include "qdefaultmaskgenerator_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -74,6 +76,7 @@ class QWebSocketHandshakeRequest;
 class QWebSocketHandshakeResponse;
 class QTcpSocket;
 class QWebSocket;
+class QMaskGenerator;
 
 struct QWebSocketConfiguration
 {
@@ -88,25 +91,24 @@ public:
     QList<QSslError> m_ignoredSslErrors;
     bool m_ignoreSslErrors;
 #endif
-#ifndef QT_NONETWORKPROXY
+#ifndef QT_NO_NETWORKPROXY
     QNetworkProxy m_proxy;
 #endif
     QTcpSocket *m_pSocket;
 };
 
-class QWebSocketPrivate : public QObject
+class QWebSocketPrivate : public QObjectPrivate
 {
-    Q_OBJECT
     Q_DISABLE_COPY(QWebSocketPrivate)
-    Q_DECLARE_PUBLIC(QWebSocket)
 
 public:
+    Q_DECLARE_PUBLIC(QWebSocket)
     explicit QWebSocketPrivate(const QString &origin,
                                QWebSocketProtocol::Version version,
-                               QWebSocket * const pWebSocket,
-                               QObject *parent = Q_NULLPTR);
+                               QWebSocket * const pWebSocket);
     virtual ~QWebSocketPrivate();
 
+    void init();
     void abort();
     QAbstractSocket::SocketError error() const;
     QString errorString() const;
@@ -122,12 +124,12 @@ public:
     QNetworkProxy proxy() const;
     void setProxy(const QNetworkProxy &networkProxy);
 #endif
+    void setMaskGenerator(const QMaskGenerator *maskGenerator);
+    const QMaskGenerator *maskGenerator() const;
     qint64 readBufferSize() const;
     void resume();
     void setPauseMode(QAbstractSocket::PauseModes pauseMode);
     void setReadBufferSize(qint64 size);
-    void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value);
-    QVariant socketOption(QAbstractSocket::SocketOption option);
     QAbstractSocket::SocketState state() const;
 
     QWebSocketProtocol::Version version() const;
@@ -139,38 +141,25 @@ public:
     QWebSocketProtocol::CloseCode closeCode() const;
     QString closeReason() const;
 
-    qint64 write(const char *message) Q_REQUIRED_RESULT;
-    qint64 write(const char *message, qint64 maxSize) Q_REQUIRED_RESULT;
-    qint64 write(const QString &message) Q_REQUIRED_RESULT;
-    qint64 write(const QByteArray &data) Q_REQUIRED_RESULT;    //send data as binary
+    qint64 sendTextMessage(const QString &message);
+    qint64 sendBinaryMessage(const QByteArray &data);
 
 #ifndef QT_NO_SSL
     void ignoreSslErrors(const QList<QSslError> &errors);
+    void ignoreSslErrors();
     void setSslConfiguration(const QSslConfiguration &sslConfiguration);
     QSslConfiguration sslConfiguration() const;
 #endif
 
-public Q_SLOTS:
     void close(QWebSocketProtocol::CloseCode closeCode, QString reason);
     void open(const QUrl &url, bool mask);
-    void ping(QByteArray payload);
+    void ping(const QByteArray &payload);
 
-#ifndef QT_NO_SSL
-    void ignoreSslErrors();
-#endif
-
-private Q_SLOTS:
-    void processData();
-    void processPing(QByteArray data);
-    void processPong(QByteArray data);
-    void processClose(QWebSocketProtocol::CloseCode closeCode, QString closeReason);
-    void processHandshake(QTcpSocket *pSocket);
-    void processStateChanged(QAbstractSocket::SocketState socketState);
-
-private:
     QWebSocket * const q_ptr;
 
-    QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QWebSocket *pWebSocket, QObject *parent = Q_NULLPTR);
+private:
+    QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version,
+                      QWebSocket *pWebSocket);
     void setVersion(QWebSocketProtocol::Version version);
     void setResourceName(const QString &resourceName);
     void setRequestUrl(const QUrl &requestUrl);
@@ -181,12 +170,20 @@ private:
     void setSocketState(QAbstractSocket::SocketState state);
     void setErrorString(const QString &errorString);
 
+    void processData();
+    void processPing(const QByteArray &data);
+    void processPong(const QByteArray &data);
+    void processClose(QWebSocketProtocol::CloseCode closeCode, QString closeReason);
+    void processHandshake(QTcpSocket *pSocket);
+    void processStateChanged(QAbstractSocket::SocketState socketState);
+
     qint64 doWriteFrames(const QByteArray &data, bool isBinary) Q_REQUIRED_RESULT;
 
     void makeConnections(const QTcpSocket *pTcpSocket);
     void releaseConnections(const QTcpSocket *pTcpSocket);
 
-    QByteArray getFrameHeader(QWebSocketProtocol::OpCode opCode, quint64 payloadLength, quint32 maskingKey, bool lastFrame);
+    QByteArray getFrameHeader(QWebSocketProtocol::OpCode opCode, quint64 payloadLength,
+                              quint32 maskingKey, bool lastFrame);
     QString calculateAcceptKey(const QByteArray &key) const;
     QString createHandShakeRequest(QString resourceName,
                                    QString host,
@@ -202,7 +199,6 @@ private:
 
     quint32 generateMaskingKey() const;
     QByteArray generateKey() const;
-    quint32 generateRandomNumber() const;
     qint64 writeFrames(const QList<QByteArray> &frames) Q_REQUIRED_RESULT;
     qint64 writeFrame(const QByteArray &frame) Q_REQUIRED_RESULT;
 
@@ -216,6 +212,8 @@ private:
     QString m_protocol;
     QString m_extension;
     QAbstractSocket::SocketState m_socketState;
+    QAbstractSocket::PauseModes m_pauseMode;
+    qint64 m_readBufferSize;
 
     QByteArray m_key;  //identification key used in handshake requests
 
@@ -231,6 +229,9 @@ private:
     QWebSocketDataProcessor m_dataProcessor;
     QWebSocketConfiguration m_configuration;
 
+    QMaskGenerator *m_pMaskGenerator;
+    QDefaultMaskGenerator m_defaultMaskGenerator;
+
     friend class QWebSocketServerPrivate;
 };