summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-11-29 16:29:36 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-30 03:39:01 +0100
commit7287bd2c3a947e3d30daa60af86d9adf2946cde7 (patch)
tree01a218397a410a3a1a10d278b90d873748454fb1 /tests
parentd9cab185a8345b336c46c528daab362670a7632c (diff)
tst_qbluetoothsocket: Fix warnings about operators.
Change expression to what was most likely intended. Change-Id: Ifd1e6ef2a41cab020cfd9a3f341a74f1b169448e Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp
index 4b4aa0f4..6b738de5 100644
--- a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp
+++ b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp
@@ -761,13 +761,14 @@ void tst_QBluetoothSocket::tst_error()
QBluetoothSocket socket;
QSignalSpy errorSpy(&socket, SIGNAL(error(QBluetoothSocket::SocketError)));
QCOMPARE(errorSpy.count(), 0);
-
- QVERIFY(socket.error() != (QBluetoothSocket::ConnectionRefusedError ||
- QBluetoothSocket::HostNotFoundError ||
- QBluetoothSocket::NetworkError ||
- QBluetoothSocket::RemoteHostClosedError ||
- QBluetoothSocket::ServiceNotFoundError ||
- QBluetoothSocket::UnknownSocketError));
+ const QBluetoothSocket::SocketError e = socket.error();
+
+ QVERIFY(e != QBluetoothSocket::ConnectionRefusedError
+ && e != QBluetoothSocket::HostNotFoundError
+ && e != QBluetoothSocket::NetworkError
+ && e != QBluetoothSocket::RemoteHostClosedError
+ && e != QBluetoothSocket::ServiceNotFoundError
+ && e != QBluetoothSocket::UnknownSocketError);
QVERIFY(socket.errorString() == QString());
}