diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocket.cpp | 2 | ||||
-rw-r--r-- | src/websockets/qwebsocket.cpp | 12 | ||||
-rw-r--r-- | src/websockets/qwebsocket.h | 4 | ||||
-rw-r--r-- | src/websockets/qwebsocket_p.cpp | 4 | ||||
-rw-r--r-- | src/websockets/qwebsocket_p.h | 4 |
5 files changed, 15 insertions, 11 deletions
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp index 7ba03c0..f58c8d0 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp @@ -126,7 +126,7 @@ qint64 QQmlWebSocket::sendTextMessage(const QString &message) setStatus(Error); return 0; } - return m_webSocket->write(message); + return m_webSocket->sendTextMessage(message); } QUrl QQmlWebSocket::url() const diff --git a/src/websockets/qwebsocket.cpp b/src/websockets/qwebsocket.cpp index ada9799..c08aed3 100644 --- a/src/websockets/qwebsocket.cpp +++ b/src/websockets/qwebsocket.cpp @@ -330,21 +330,25 @@ bool QWebSocket::flush() /*! \brief Sends the given \a message over the socket as a text message and returns the number of bytes actually sent. + + \sa sendBinaryMessage() */ -qint64 QWebSocket::write(const QString &message) +qint64 QWebSocket::sendTextMessage(const QString &message) { Q_D(QWebSocket); - return d->write(message); + return d->sendTextMessage(message); } /*! \brief Sends the given \a data over the socket as a binary message and returns the number of bytes actually sent. + + \sa sendTextMessage() */ -qint64 QWebSocket::write(const QByteArray &data) +qint64 QWebSocket::sendBinaryMessage(const QByteArray &data) { Q_D(QWebSocket); - return d->write(data); + return d->sendBinaryMessage(data); } /*! diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h index 18f8994..7f4131e 100644 --- a/src/websockets/qwebsocket.h +++ b/src/websockets/qwebsocket.h @@ -104,8 +104,8 @@ public: 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) Q_REQUIRED_RESULT; + qint64 sendBinaryMessage(const QByteArray &data) Q_REQUIRED_RESULT; #ifndef QT_NO_SSL void ignoreSslErrors(const QList<QSslError> &errors); diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index bd4d1c1..5d775ef 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -210,7 +210,7 @@ bool QWebSocketPrivate::flush() /*! \internal */ -qint64 QWebSocketPrivate::write(const QString &message) +qint64 QWebSocketPrivate::sendTextMessage(const QString &message) { return doWriteFrames(message.toUtf8(), false); } @@ -218,7 +218,7 @@ qint64 QWebSocketPrivate::write(const QString &message) /*! \internal */ -qint64 QWebSocketPrivate::write(const QByteArray &data) +qint64 QWebSocketPrivate::sendBinaryMessage(const QByteArray &data) { return doWriteFrames(data, true); } diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index 611c817..d3f13e2 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -140,8 +140,8 @@ public: QWebSocketProtocol::CloseCode closeCode() const; QString closeReason() const; - 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) Q_REQUIRED_RESULT; + qint64 sendBinaryMessage(const QByteArray &data) Q_REQUIRED_RESULT; #ifndef QT_NO_SSL void ignoreSslErrors(const QList<QSslError> &errors); |