Skip to content

Commit

Permalink
Use QtBluetooth enums from their namespace
Browse files Browse the repository at this point in the history
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/+/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>
  • Loading branch information
andreasbuhr committed Mar 12, 2021
1 parent 9deba92 commit dace705
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/comm/BluetoothLink.cc
Expand Up @@ -113,7 +113,7 @@ bool BluetoothLink::_hardwareConnect()
_discoveryAgent->start();
#else
_createSocket();
_targetSocket->connectToService(QBluetoothAddress(qobject_cast<BluetoothConfiguration*>(_config.get())->device().address), QBluetoothUuid(QBluetoothUuid::SerialPort));
_targetSocket->connectToService(QBluetoothAddress(qobject_cast<BluetoothConfiguration*>(_config.get())->device().address), QBluetoothUuid(QBluetoothUuid::ServiceClassUuid::SerialPort));
#endif
return true;
}
Expand Down

0 comments on commit dace705

Please sign in to comment.