diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
| commit | 8fe7fbe6b552b0d196967cfea85fede5e7c211b9 (patch) | |
| tree | b90f246cc3b8847cedaf6b5f8dc045cfc563b9be /src/bluetooth/qbluetoothsocket.h | |
| parent | 9bcb79f0c741f7805dad17c467a5c2041227a18a (diff) | |
| parent | b4bde05d8459cc57c25bac3f7be19fcf03908606 (diff) | |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/doc/src/examples.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
Diffstat (limited to 'src/bluetooth/qbluetoothsocket.h')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index cc580d0b..0cc765cd 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -58,7 +58,7 @@ class QBluetoothServiceInfo; class Q_BLUETOOTH_EXPORT QBluetoothSocket : public QIODevice { - Q_OBJECT + Q_OBJECT Q_DECLARE_PRIVATE(QBluetoothSocket) friend class QBluetoothServer; @@ -78,11 +78,13 @@ public: enum SocketError { NoSocketError = -2, - UnknownSocketError = QAbstractSocket::UnknownSocketError, - HostNotFoundError = QAbstractSocket::HostNotFoundError, - ServiceNotFoundError = QAbstractSocket::SocketAddressNotAvailableError, - NetworkError = QAbstractSocket::NetworkError, - UnsupportedProtocolError + UnknownSocketError = QAbstractSocket::UnknownSocketError, //-1 + HostNotFoundError = QAbstractSocket::HostNotFoundError, //2 + ServiceNotFoundError = QAbstractSocket::SocketAddressNotAvailableError, //9 + NetworkError = QAbstractSocket::NetworkError, //7 + UnsupportedProtocolError = 8, + OperationError = QAbstractSocket::OperationError //19 + //New enums (independent of QAbstractSocket) should be added from 100 onwards }; explicit QBluetoothSocket(QBluetoothServiceInfo::Protocol socketType, QObject *parent = 0); // create socket of type socketType |