summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-07-11 14:44:38 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-11 14:52:37 +0200
commit59339941e0e6e2b8648c2e128284de188a65714b (patch)
treed2f19ebbac24dfc5872509cb74262375cd3e8962 /src/network
parent62e6608f6932c6d871d17b0ccce0c7b388866458 (diff)
Fix some spelling errors
Change-Id: I19d3b2e9a5180b13deb828b55195404ef20be295 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/access/qhttpnetworkconnection.cpp4
-rw-r--r--src/network/access/qhttpnetworkconnectionchannel.cpp4
-rw-r--r--src/network/access/qhttpnetworkreply.cpp2
-rw-r--r--src/network/socket/qabstractsocket.cpp4
-rw-r--r--src/network/socket/qsocks5socketengine.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 6e56aa6126..b0c4deb2b9 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -551,7 +551,7 @@ QHttpNetworkReply* QHttpNetworkConnectionPrivate::queueRequest(const QHttpNetwor
break;
}
- // For Happy Eyeballs the networkLayerState is set to Unkown
+ // For Happy Eyeballs the networkLayerState is set to Unknown
// untill we have started the first connection attempt. So no
// request will be started untill we know if IPv4 or IPv6
// should be used.
@@ -975,7 +975,7 @@ void QHttpNetworkConnectionPrivate::startHostInfoLookup()
{
networkLayerState = InProgress;
- // check if we already now can descide if this is IPv4 or IPv6
+ // check if we already now can decide if this is IPv4 or IPv6
QString lookupHost = hostName;
#ifndef QT_NO_NETWORKPROXY
if (networkProxy.capabilities() & QNetworkProxy::HostNameLookupCapability) {
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 2971854060..9cbdcd65bd 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -505,7 +505,7 @@ void QHttpNetworkConnectionChannel::_q_receiveReply()
emit reply->dataReadProgress(replyPrivate->totalProgress, replyPrivate->bodyLength);
}
} else if (haveRead == -1) {
- // Some error occured
+ // Some error occurred
connection->d_func()->emitReplyError(socket, reply, QNetworkReply::ProtocolFailure);
break;
}
@@ -1116,7 +1116,7 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
if (socket->bytesAvailable()) {
// Read everything from the socket into the reply buffer.
// we can ignore the readbuffersize as the data is already
- // in memory and we will not recieve more data on the socket.
+ // in memory and we will not receive more data on the socket.
reply->setReadBufferSize(0);
_q_receiveReply();
#ifndef QT_NO_SSL
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index 6790e1b9ca..14205112df 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -719,7 +719,7 @@ qint64 QHttpNetworkReplyPrivate::uncompressBodyData(QByteDataBuffer *in, QByteDa
int ret = inflate(inflateStrm, Z_NO_FLUSH);
//All negative return codes are errors, in the context of HTTP compression, Z_NEED_DICT is also an error.
- // in the case where we get Z_DATA_ERROR this could be because we recieved raw deflate compressed data.
+ // in the case where we get Z_DATA_ERROR this could be because we received raw deflate compressed data.
if (ret == Z_DATA_ERROR && !triedRawDeflate) {
inflateEnd(inflateStrm);
triedRawDeflate = true;
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 8f290f6e2f..c9f9bd2b42 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -970,8 +970,8 @@ void QAbstractSocketPrivate::_q_startConnecting(const QHostInfo &hostInfo)
qWarning("QAbstractSocketPrivate::_q_startConnecting() received hostInfo for wrong lookup ID %d expected %d", hostInfo.lookupId(), hostLookupId);
}
- // Only add the addresses for the prefered network layer.
- // Or all if prefered network layer is not set.
+ // Only add the addresses for the preferred network layer.
+ // Or all if preferred network layer is not set.
if (preferredNetworkLayerProtocol == QAbstractSocket::UnknownNetworkLayerProtocol || preferredNetworkLayerProtocol == QAbstractSocket::AnyIPProtocol) {
addresses = hostInfo.addresses();
} else {
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index 48a866cc3a..75970523d1 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -1340,7 +1340,7 @@ bool QSocks5SocketEngine::bind(const QHostAddress &addr, quint16 port)
QHostAddress address;
if (addr.protocol() == QAbstractSocket::AnyIPProtocol)
- address = QHostAddress::AnyIPv4; //SOCKS5 doesnt support dual stack, and there isn't any implementation of udp on ipv6 yet
+ address = QHostAddress::AnyIPv4; //SOCKS5 doesn't support dual stack, and there isn't any implementation of udp on ipv6 yet
else
address = addr;