diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-03-20 15:45:12 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-03-21 10:13:54 +0000 |
| commit | 279a6968a7550b59e41ff8ffa70a5ca705780d4b (patch) | |
| tree | e024a0ec92517e6399aef18ee739441971807a90 | |
| parent | 24a07f0a94a0ac036866c18ef415f06dd1fb8bbe (diff) | |
Fix shadow warning
qbluetoothsocket.h: In member function 'void QBluetoothSocket::connectToService(
const QBluetoothAddress&, QBluetoothUuid::ServiceClassUuid, QIODevice::OpenMode)':
qbluetoothsocket.h:111:5: error: declaration of 'openMode' shadows a member of 'this' [-Werror=shadow]
Change-Id: Ib9478027799b287430721d99bebee4002a1e5896
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/bluetooth/qbluetoothsocket.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothsocket.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp index ddc6469f..c5b0f7d3 100644 --- a/src/bluetooth/qbluetoothsocket.cpp +++ b/src/bluetooth/qbluetoothsocket.cpp @@ -387,7 +387,7 @@ void QBluetoothSocket::connectToService(const QBluetoothServiceInfo &service, Op } /*! - \fn void QBluetoothSocket::connectToService(const QBluetoothAddress &address, QBluetoothUuid::ServiceClassUuid uuid, OpenMode openMode = ReadWrite) + \fn void QBluetoothSocket::connectToService(const QBluetoothAddress &address, QBluetoothUuid::ServiceClassUuid uuid, OpenMode mode = ReadWrite) \internal diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index db8562ed..a7f43170 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -107,9 +107,9 @@ public: void connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid, OpenMode openMode = ReadWrite); void connectToService(const QBluetoothAddress &address, quint16 port, OpenMode openMode = ReadWrite); inline void connectToService(const QBluetoothAddress &address, QBluetoothUuid::ServiceClassUuid uuid, - OpenMode openMode = ReadWrite) + OpenMode mode = ReadWrite) { - connectToService(address, QBluetoothUuid(uuid), openMode); + connectToService(address, QBluetoothUuid(uuid), mode); } void disconnectFromService(); |