diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-07-07 16:00:43 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-20 00:22:07 +0200 |
| commit | bfc5bb09c4b79c17e1d846f6c46611d83cc7de4a (patch) | |
| tree | 2b7425be3d51822aef08b909dc9459ad851952ce /src/network/socket | |
| parent | 674e79416fefe7b5acf2a8c18d3c91d8feddcc18 (diff) | |
Ignore or suppress warning and debug messages in tst_QLocalSocket
The one in tst_QLocalSocket::writeToClientAndDisconnect just needed
proper ordering: that's what waitForDisconnect is for. At the same time,
we need to make sure we get the same message from all three
implementations of QLocalSocket::waitForDisconnect (and without the
useless space at the end).
Change-Id: I21364263cf908df022df814a6a39fcb5783e84e6
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qlocalsocket_tcp.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/qlocalsocket_unix.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index 1a61a54a76..0bf0cc0654 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -424,7 +424,7 @@ bool QLocalSocket::waitForDisconnected(int msecs) { Q_D(QLocalSocket); if (state() == UnconnectedState) { - qWarning() << "QLocalSocket::waitForDisconnected() is not allowed in UnconnectedState"; + qWarning("QLocalSocket::waitForDisconnected() is not allowed in UnconnectedState"); return false; } return (d->tcpSocket->waitForDisconnected(msecs)); diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 31780a27ec..4af584b345 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -560,7 +560,7 @@ bool QLocalSocket::waitForDisconnected(int msecs) { Q_D(QLocalSocket); if (state() == UnconnectedState) { - qWarning() << "QLocalSocket::waitForDisconnected() is not allowed in UnconnectedState"; + qWarning("QLocalSocket::waitForDisconnected() is not allowed in UnconnectedState"); return false; } return (d->unixSocket.waitForDisconnected(msecs)); diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index c907ce6ada..96c6c0f6ea 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -378,8 +378,10 @@ bool QLocalSocket::waitForConnected(int msecs) bool QLocalSocket::waitForDisconnected(int msecs) { Q_D(QLocalSocket); - if (state() == UnconnectedState) + if (state() == UnconnectedState) { + qWarning("QLocalSocket::waitForDisconnected() is not allowed in UnconnectedState"); return false; + } if (!openMode().testFlag(QIODevice::ReadOnly)) { qWarning("QLocalSocket::waitForDisconnected isn't supported for write only pipes."); return false; |