summaryrefslogtreecommitdiff
path: root/src/websockets
diff options
context:
space:
mode:
authorKurt Pattyn <pattyn.kurt@gmail.com>2014-01-19 13:43:52 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-20 20:13:00 +0100
commitf8b27c6b833ee796193ae115cb87574cb0e4df4c (patch)
tree3196696628cbb08b72c534eac7187fd5d26c102a /src/websockets
parent02e71a5d8c2a006684e2223084231c07d1fe818f (diff)
downloadqtwebsockets-f8b27c6b833ee796193ae115cb87574cb0e4df4c.tar.gz
Rename write methods
Renamed the write methods to sendTextMessage and sendBinaryMessage respectively. This makes the code more readable. Change-Id: Ie49abf07a37f54c84bd01c5c788d2e42b28bcfdd Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets')
-rw-r--r--src/websockets/qwebsocket.cpp12
-rw-r--r--src/websockets/qwebsocket.h4
-rw-r--r--src/websockets/qwebsocket_p.cpp4
-rw-r--r--src/websockets/qwebsocket_p.h4
4 files changed, 14 insertions, 10 deletions
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);