fix compilation with QT_NO_NETWORKPROXY

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

diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h
index 18f8994..bf85cc0 100644 (file)
--- a/src/websockets/qwebsocket.h
+++ b/src/websockets/qwebsocket.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.
@@ -43,6 +43,7 @@
 #define QWEBSOCKET_H
 
 #include <QtCore/QUrl>
+#include <QtNetwork/QAbstractSocket>
 #ifndef QT_NO_NETWORKPROXY
 #include <QtNetwork/QNetworkProxy>
 #endif
@@ -57,6 +58,7 @@ QT_BEGIN_NAMESPACE
 
 class QTcpSocket;
 class QWebSocketPrivate;
+class QMaskGenerator;
 
 class Q_WEBSOCKETS_EXPORT QWebSocket : public QObject
 {
@@ -85,27 +87,25 @@ public:
     QNetworkProxy proxy() const;
     void setProxy(const QNetworkProxy &networkProxy);
 #endif
+    void setMaskGenerator(const QMaskGenerator *maskGenerator);
+    const QMaskGenerator *maskGenerator() const;
     qint64 readBufferSize() const;
     void setReadBufferSize(qint64 size);
 
     void resume();
     void setPauseMode(QAbstractSocket::PauseModes pauseMode);
 
-    void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value);
-    QVariant socketOption(QAbstractSocket::SocketOption option);
     QAbstractSocket::SocketState state() const;
 
     QWebSocketProtocol::Version version() const;
     QString resourceName() const;
     QUrl requestUrl() const;
     QString origin() const;
-    QString protocol() const;
-    QString extension() const;
     QWebSocketProtocol::CloseCode closeCode() const;
     QString closeReason() const;
 
-    qint64 write(const QString &message) Q_REQUIRED_RESULT;
-    qint64 write(const QByteArray &data) Q_REQUIRED_RESULT;
+    qint64 sendTextMessage(const QString &message);
+    qint64 sendBinaryMessage(const QByteArray &data);
 
 #ifndef QT_NO_SSL
     void ignoreSslErrors(const QList<QSslError> &errors);
@@ -116,7 +116,7 @@ public:
 public Q_SLOTS:
     void close(QWebSocketProtocol::CloseCode closeCode = QWebSocketProtocol::CloseCodeNormal,
                const QString &reason = QString());
-    void open(const QUrl &url, bool mask = true);
+    void open(const QUrl &url);
     void ping(const QByteArray &payload = QByteArray());
 #ifndef QT_NO_SSL
     void ignoreSslErrors();
@@ -146,7 +146,6 @@ Q_SIGNALS:
 private:
     QWebSocket(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version,
                QObject *parent = Q_NULLPTR);
-    QWebSocketPrivate * const d_ptr;
 };
 
 QT_END_NAMESPACE