summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocket.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/websockets/qwebsocket.cpp')
-rw-r--r--src/websockets/qwebsocket.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/websockets/qwebsocket.cpp b/src/websockets/qwebsocket.cpp
index 3472fe4..ade1eb4 100644
--- a/src/websockets/qwebsocket.cpp
+++ b/src/websockets/qwebsocket.cpp
@@ -297,7 +297,7 @@ QT_BEGIN_NAMESPACE
QWebSocket::QWebSocket(const QString &origin,
QWebSocketProtocol::Version version,
QObject *parent) :
- QObject(*(new QWebSocketPrivate(origin, version, this)), parent)
+ QObject(*(new QWebSocketPrivate(origin, version)), parent)
{
Q_D(QWebSocket);
d->init();
@@ -340,7 +340,7 @@ QAbstractSocket::SocketError QWebSocket::error() const
*/
QWebSocket::QWebSocket(QTcpSocket *pTcpSocket,
QWebSocketProtocol::Version version, QObject *parent) :
- QObject(*(new QWebSocketPrivate(pTcpSocket, version, this)), parent)
+ QObject(*(new QWebSocketPrivate(pTcpSocket, version)), parent)
{
Q_D(QWebSocket);
d->init();
@@ -775,4 +775,17 @@ bool QWebSocket::isValid() const
return d->isValid();
}
+/*!
+ \since 5.12
+ Returns the number of bytes that are waiting to be written. The bytes are written when control
+ goes back to the event loop or when flush() is called.
+
+ \sa flush
+ */
+qint64 QWebSocket::bytesToWrite() const
+{
+ Q_D(const QWebSocket);
+ return d->m_pSocket ? d->m_pSocket->bytesToWrite() : 0;
+}
+
QT_END_NAMESPACE