diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-01-28 11:57:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-28 20:33:47 +0100 |
| commit | 43a95bb690d2c37c031fc827efe922ea334780c1 (patch) | |
| tree | b8e1a13c9d6314e188f850c2ea7d4b1daffdfb2c | |
| parent | 29de876f55dc96748fdca8dd3fef0c873791796f (diff) | |
Initialize QBluetoothSocket::socketError properly.
So far the initial value is compiler dependent. In most cases this meant
it was set to 0. However 0 is not even a valid
QBluetoothSocket::SocketError enum value. The NoSocketError value is -2.
Change-Id: Ieee4f7bd1c97d758295f4d0cc1297f62c114f4f3
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_bluez.cpp | 1 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_qnx.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index ed2e8ab8..d12acf7c 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -67,6 +67,7 @@ QBluetoothSocketPrivate::QBluetoothSocketPrivate() : socket(-1), socketType(QBluetoothServiceInfo::UnknownProtocol), state(QBluetoothSocket::UnconnectedState), + socketError(QBluetoothSocket::NoSocketError), readNotifier(0), connectWriteNotifier(0), connecting(false), diff --git a/src/bluetooth/qbluetoothsocket_qnx.cpp b/src/bluetooth/qbluetoothsocket_qnx.cpp index f242e4d9..6c87011b 100644 --- a/src/bluetooth/qbluetoothsocket_qnx.cpp +++ b/src/bluetooth/qbluetoothsocket_qnx.cpp @@ -50,6 +50,7 @@ QBluetoothSocketPrivate::QBluetoothSocketPrivate() : socket(-1), socketType(QBluetoothServiceInfo::UnknownProtocol), state(QBluetoothSocket::UnconnectedState), + socketError(QBluetoothSocket::NoSocketError), readNotifier(0), connectWriteNotifier(0), connecting(false), |