Replaced QTcpSocket * with a QIODevice * to make network independent unit tests possible.

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

diff --git a/src/qwebsocket.h b/src/qwebsocket.h
index faf489a..e1791af 100644 (file)
--- a/src/qwebsocket.h
+++ b/src/qwebsocket.h
@@ -84,8 +84,8 @@ public:
     qint64 write(const QByteArray &data);      //send data as binary
 
 public Q_SLOTS:
-    virtual void close(QWebSocketProtocol::CloseCode closeCode = QWebSocketProtocol::CC_NORMAL, QString reason = QString());
-    virtual void open(const QUrl &url, bool mask = true);
+    void close(QWebSocketProtocol::CloseCode closeCode = QWebSocketProtocol::CC_NORMAL, const QString &reason = QString());
+    void open(const QUrl &url, bool mask = true);
     void ping();
 
 Q_SIGNALS:
@@ -106,10 +106,9 @@ Q_SIGNALS:
 
 private:
     Q_DISABLE_COPY(QWebSocket)
+    Q_DECLARE_PRIVATE(QWebSocket)
     QWebSocket(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version, QObject *parent = 0);
     QWebSocketPrivate * const d_ptr;
-
-    friend class QWebSocketPrivate;
 };
 
 QT_END_NAMESPACE