summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Trotsenko <alex1973tr@gmail.com>2016-07-29 19:15:48 +0300
committerAlex Trotsenko <alex1973tr@gmail.com>2016-08-02 10:03:45 +0000
commitfcbbd7bc3d1f7ba9dc2dec1dc3222d0b63660ba5 (patch)
tree5bad15eae420181eead0d97b2a4b11c5ac861053 /src
parentd875d5e2fc66b9a4ab1afea8441b33d4afc6e9b5 (diff)
Fix grammar issues in SCTP documentation
Change-Id: I11bfb20dc3d4db98dccfd3bc680fb1ffbd522508 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/network/kernel/qnetworkproxy.cpp4
-rw-r--r--src/network/socket/qabstractsocket.cpp4
-rw-r--r--src/network/socket/qsctpserver.cpp4
-rw-r--r--src/network/socket/qsctpsocket.cpp18
4 files changed, 15 insertions, 15 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index fc3185bd5e..2f7e9d537d 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -1002,7 +1002,7 @@ template<> void QSharedDataPointer<QNetworkProxyQueryPrivate>::detach()
\row
\li SctpServer
- \li Passive server sockets that listen on a SCTP port and await
+ \li Passive server sockets that listen on an SCTP port and await
incoming connections from the network. Normally, only the
local port is used, but the remote address could be used in
specific circumstances, for example to indicate which remote
@@ -1032,7 +1032,7 @@ template<> void QSharedDataPointer<QNetworkProxyQueryPrivate>::detach()
connections from the network
\value UrlRequest a more complex request which involves loading
of a URL
- \value SctpServer a SCTP server that listens for incoming
+ \value SctpServer an SCTP server that listens for incoming
connections from the network
\sa queryType(), setQueryType()
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index fbc7088a02..be60d187ad 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -1289,7 +1289,7 @@ bool QAbstractSocketPrivate::readFromSocket()
/*! \internal
- Prevents from the recursive readyRead() emission.
+ Emits readyRead(), protecting against recursion.
*/
void QAbstractSocketPrivate::emitReadyRead(int channel)
{
@@ -1306,7 +1306,7 @@ void QAbstractSocketPrivate::emitReadyRead(int channel)
/*! \internal
- Prevents from the recursive bytesWritten() emission.
+ Emits bytesWritten(), protecting against recursion.
*/
void QAbstractSocketPrivate::emitBytesWritten(qint64 bytes, int channel)
{
diff --git a/src/network/socket/qsctpserver.cpp b/src/network/socket/qsctpserver.cpp
index a2dc824a09..24f18e1ee8 100644
--- a/src/network/socket/qsctpserver.cpp
+++ b/src/network/socket/qsctpserver.cpp
@@ -55,7 +55,7 @@
TCP. See the QSctpSocket documentation for more protocol details.
QSctpServer is a convenience subclass of QTcpServer that allows
- you to accept incoming STCP socket connections either in TCP
+ you to accept incoming SCTP socket connections either in TCP
emulation or in datagram mode.
The most common way to use QSctpServer is to construct an object
@@ -157,7 +157,7 @@ QSctpServer::~QSctpServer()
maximum number of channels value would be used. Negative \a count
sets a TCP emulation mode.
- Call this member only when QSctpServer is in UnconnectedState.
+ Call this method only when QSctpServer is in UnconnectedState.
\sa maxChannelCount(), QSctpSocket
*/
diff --git a/src/network/socket/qsctpsocket.cpp b/src/network/socket/qsctpsocket.cpp
index dcfd6806a4..9ab241f9ab 100644
--- a/src/network/socket/qsctpsocket.cpp
+++ b/src/network/socket/qsctpsocket.cpp
@@ -60,7 +60,7 @@
independent channels, so that if there is data loss in one stream,
delivery will not be affected for the other streams.
- As message-oriented, SCTP transports a sequence of messages,
+ Being message-oriented, SCTP transports a sequence of messages,
rather than transporting an unbroken stream of bytes as does TCP.
Like in UDP, in SCTP a sender sends a message in one operation,
and that exact message is passed to the receiving application
@@ -83,17 +83,17 @@
\endlist
To set a continuous byte stream mode, instantiate QSctpSocket and
- call setMaxChannelCount() with the negative number of channels. This
- gives the ability to use QSctpSocket as a regular buffered
- QTcpSocket. You can call connectToHost() to initiate connection
- with endpoint, write() to transmit and read() to receive data from
- the peer, but you cannot distinguish message boundaries.
+ call setMaxChannelCount() with a negative value. This gives the
+ ability to use QSctpSocket as a regular buffered QTcpSocket. You
+ can call connectToHost() to initiate connection with endpoint,
+ write() to transmit and read() to receive data from the peer, but
+ you cannot distinguish message boundaries.
By default, QSctpSocket operates in datagram mode. Before
connecting, call setMaxChannelCount() to set the maximum number of
channels that the application is prepared to support. This number
- is a negotiated parameter with remote endpoint and its value can
- be bounded by the operating system. The default value of 0
+ is a parameter negotiated with the remote endpoint and its value
+ can be bounded by the operating system. The default value of 0
indicates to use the peer's value. If both endpoints have default
values, then number of connection channels is system-dependent.
After establishing a connection, you can fetch the actual number
@@ -412,7 +412,7 @@ void QSctpSocket::disconnectFromHost()
is 0, endpoint's value for maximum number of channels is used.
Negative \a count sets a continuous byte stream mode.
- Call this member only when QSctpSocket is in UnconnectedState.
+ Call this method only when QSctpSocket is in UnconnectedState.
\sa maxChannelCount(), readChannelCount(), writeChannelCount()
*/