summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorCorentin Jabot <corentinjabot@gmail.com>2012-11-25 12:18:58 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-13 09:11:29 +0100
commit7b507c581ccf345efcb3ba9c757d8d06bb5e4349 (patch)
tree5b898c00fc83e2d709ae2f53858b53bc7f51b214 /src/network
parentcc90d4a563c070a58dadba7f0e98f252a080d225 (diff)
Fix some WS errors
Fix whitespace errors in qabstractsocket.cpp and qlocalsocket_win.cpp Change-Id: Ifd0cb86a8e63a1d0ef8a5846a7f893acf9f63542 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/socket/qabstractsocket.cpp4
-rw-r--r--src/network/socket/qlocalsocket_win.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 5ff7da9e9d..124f15e586 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -195,7 +195,7 @@
\fn void QAbstractSocket::disconnected()
This signal is emitted when the socket has been disconnected.
-
+
\warning If you need to delete the sender() of this signal in a slot connected
to it, use the \l{QObject::deleteLater()}{deleteLater()} function.
@@ -639,7 +639,7 @@ bool QAbstractSocketPrivate::initSocketLayer(QAbstractSocket::NetworkLayerProtoc
socketEngine->errorString().toLatin1().constData());
#endif
socketError = socketEngine->error();
- q->setErrorString(socketEngine->errorString());
+ q->setErrorString(socketEngine->errorString());
return false;
}
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index cb264a4c83..0138a96261 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -67,7 +67,7 @@ void QLocalSocketPrivate::_q_winError(ulong windowsError, const QString &functio
Q_Q(QLocalSocket);
QLocalSocket::LocalSocketState currentState = state;
- // If the connectToServer fails due to WaitNamedPipe() time-out, assume ConnectionError
+ // If the connectToServer fails due to WaitNamedPipe() time-out, assume ConnectionError
if (state == QLocalSocket::ConnectingState && windowsError == ERROR_SEM_TIMEOUT)
windowsError = ERROR_NO_DATA;