AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some WS errors

Browse Source 
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>
This commit is contained in:
Corentin Jabot 2012-11-25 12:18:58 +01:00 committed by The Qt Project
parent cc90d4a563
commit 7b507c581c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/socket/qabstractsocket.cpp
View File

@ -195,7 +195,7 @@
\fn void QAbstractSocket::disconnected() \fn void QAbstractSocket::disconnected()
This signal is emitted when the socket has been 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 \warning If you need to delete the sender() of this signal in a slot connected
to it, use the \l{QObject::deleteLater()}{deleteLater()} function. to it, use the \l{QObject::deleteLater()}{deleteLater()} function.
@ -639,7 +639,7 @@ bool QAbstractSocketPrivate::initSocketLayer(QAbstractSocket::NetworkLayerProtoc
socketEngine->errorString().toLatin1().constData()); socketEngine->errorString().toLatin1().constData());
#endif #endif
socketError = socketEngine->error(); socketError = socketEngine->error();
q->setErrorString(socketEngine->errorString()); q->setErrorString(socketEngine->errorString());
return false; return false;
} }

2
src/network/socket/qlocalsocket_win.cpp
View File

@ -67,7 +67,7 @@ void QLocalSocketPrivate::_q_winError(ulong windowsError, const QString &functio
Q_Q(QLocalSocket); Q_Q(QLocalSocket);
QLocalSocket::LocalSocketState currentState = state; 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) if (state == QLocalSocket::ConnectingState && windowsError == ERROR_SEM_TIMEOUT)
windowsError = ERROR_NO_DATA; windowsError = ERROR_NO_DATA;