mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: remove dc_user_device_t

Browse source 
The same structure was defined as "struct dc_user_device_t"
and typedefed as "device_data_t". Unify this. Since there
are much more of the latter, remove the former.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-19 18:42:43 +02:00 • committed by Dirk Hohndel
parent 8c65558b5c
commit 5a19437311
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/qt-ble.cpp
View file

@ -229,7 +229,7 @@ void BLEObject::addService(const QBluetoothUuid &newService)
}
}
BLEObject::BLEObject(QLowEnergyController *c, dc_user_device_t *d)
BLEObject::BLEObject(QLowEnergyController *c, device_data_t *d)
{
controller = c;
device = d;
@ -520,13 +520,13 @@ dc_status_t BLEObject::setupHwTerminalIo(const QList<QLowEnergyCharacteristic> &
// Bluez is broken, and doesn't have a sane way to query
// whether to use a random address or not. So we have to
// fake it.
static int use_random_address(dc_user_device_t *user_device)
static int use_random_address(device_data_t *user_device)
{
return IS_SHEARWATER(user_device) || IS_GARMIN(user_device);
}
#endif
dc_status_t qt_ble_open(void **io, dc_context_t *, const char *devaddr, dc_user_device_t *user_device)
dc_status_t qt_ble_open(void **io, dc_context_t *, const char *devaddr, device_data_t *user_device)
{
debugCounter = 0;
QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true"));