diff options
| author |  Andreas Buhr <andreas.buhr@qt.io> | 2021-03-12 13:20:38 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2021-03-12 08:41:31 -0800 |
| commit | 41fc822d56e7d0866129ef6b68ccfb947300bffd (patch) | |
| tree | 2d89a683316b54fb991a63d1c9e906f4701e086a /core/qt-ble.cpp | |
| parent | 9686b4cf740d38bc8d1262f368cf5edfe0c68f0d (diff) | |
| download | subsurface-41fc822d56e7d0866129ef6b68ccfb947300bffd.tar.gz | |
Use QtBluetooth enums from their namespace
For increased type safety, some enums have been changed to
scoped enums in Qt 6.2, see
https://codereview.qt-project.org/c/qt/qtconnectivity/+/337069
https://codereview.qt-project.org/c/qt/qtconnectivity/+/336678
This patch adapts subsurface to this change.
Since C++11, enums inject their symbols in both their own
and their parent namespace, so this patch can be merged right
now.
Signed-off-by: Andreas Buhr <andreas.buhr@qt.io>
Diffstat (limited to 'core/qt-ble.cpp')
| -rw-r--r-- | core/qt-ble.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/qt-ble.cpp b/core/qt-ble.cpp index 357758580..04a9180b2 100644 --- a/core/qt-ble.cpp +++ b/core/qt-ble.cpp @@ -642,7 +642,7 @@ dc_status_t qt_ble_open(void **io, dc_context_t *, const char *devaddr, device_d QLowEnergyDescriptor d = l.first(); for (const QLowEnergyDescriptor &tmp: l) { - if (tmp.type() == QBluetoothUuid::ClientCharacteristicConfiguration) { + if (tmp.type() == QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration) { d = tmp; break; } |