diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-09-18 17:23:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 10:09:12 +0200 |
| commit | ec837633231d0e9c0e70ca3c3d4ad7e1fa548623 (patch) | |
| tree | a33aa929e47e94fd6d91db9d047285818ee993a5 /src/bluetooth/qbluetoothsocket_p.cpp | |
| parent | 4a8fe389db0212eb6f85a49612ceddd56dd1aaf4 (diff) | |
Unify QBluetoothSoket, QBluetoothServer and QBluetoothServiceInfo protocol enum
Change-Id: I6e66196a599e2cceabc7d93d728ba97361d8999f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_p.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothsocket_p.cpp b/src/bluetooth/qbluetoothsocket_p.cpp index 91fbfb40..018ccea6 100644 --- a/src/bluetooth/qbluetoothsocket_p.cpp +++ b/src/bluetooth/qbluetoothsocket_p.cpp @@ -52,7 +52,7 @@ QBluetoothSocketPrivate::~QBluetoothSocketPrivate() { } -bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothSocket::SocketType type) +bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothServiceInfo::Protocol type) { Q_UNUSED(type); return false; @@ -125,7 +125,7 @@ void QBluetoothSocketPrivate::close() { } -bool QBluetoothSocketPrivate::setSocketDescriptor(int socketDescriptor, QBluetoothSocket::SocketType socketType, +bool QBluetoothSocketPrivate::setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType, QBluetoothSocket::SocketState socketState, QBluetoothSocket::OpenMode openMode) { Q_UNUSED(socketDescriptor); |