diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-10-15 13:19:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-15 16:11:18 +0200 |
| commit | d5aa60fd33be47dd9ae1ad49c71d3edf059229bd (patch) | |
| tree | 0c60dc56d952c94fea5eba4af0cf36bebf31d9d2 | |
| parent | 90e953fca860f04e82c6451a8dbe5649e882677e (diff) | |
Remove not needed error enum and avoid future enum value collisions
Change-Id: Ieb40958b689914db3b9b5303757426d7348d3fbe
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | src/imports/bluetooth/plugins.qmltypes | 5 | ||||
| -rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothsocket.cpp | 2 | ||||
| -rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothsocket_p.h | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/imports/bluetooth/plugins.qmltypes b/src/imports/bluetooth/plugins.qmltypes index 15182df5..20d57574 100644 --- a/src/imports/bluetooth/plugins.qmltypes +++ b/src/imports/bluetooth/plugins.qmltypes @@ -93,8 +93,7 @@ Module { "HostNotFoundError": 2, "ServiceNotFoundError": 9, "NetworkError": 7, - "UnsupportedProtocolError": 8, - "NoSocketerror": 9 + "UnsupportedProtocolError": 8 } } Enum { @@ -107,7 +106,7 @@ Module { "Bound": 4, "Closing": 6, "Listening": 5, - "NoServiceSet": 6 + "NoServiceSet": 100 } } Property { name: "service"; type: "QDeclarativeBluetoothService"; isPointer: true } diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp index d71e5dd6..a1329182 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp @@ -359,7 +359,7 @@ void QDeclarativeBluetoothSocket::newSocket(QBluetoothSocket *socket, QDeclarati d->m_socket = socket; d->m_connected = true; d->m_componentCompleted = true; - d->m_error = NoSocketerror; + d->m_error = NoError; QObject::connect(socket, SIGNAL(connected()), this, SLOT(socket_connected())); QObject::connect(socket, SIGNAL(disconnected()), this, SLOT(socket_disconnected())); diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h index cb6255b6..4b83dfb0 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h @@ -75,8 +75,7 @@ public: HostNotFoundError = QBluetoothSocket::HostNotFoundError, ServiceNotFoundError = QBluetoothSocket::ServiceNotFoundError, NetworkError = QBluetoothSocket::NetworkError, - UnsupportedProtocolError = QBluetoothSocket::UnsupportedProtocolError, - NoSocketerror + UnsupportedProtocolError = QBluetoothSocket::UnsupportedProtocolError }; enum SocketState { @@ -87,7 +86,7 @@ public: Bound = QBluetoothSocket::BoundState, Closing = QBluetoothSocket::ClosingState, Listening = QBluetoothSocket::ListeningState, - NoServiceSet + NoServiceSet = 100 //Leave gap for future enums and to avoid collision with QBluetoothSocket enums }; explicit QDeclarativeBluetoothSocket(QObject *parent = 0); |