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: make device code more consistent with core

Browse source 
We keep track of device, i.e. distinct dive computers with id in the core.
The corresponding code stuck out like a sore thumb. Firstly, because it
is C++. But more importantly, because it used inconsistent nameing conventions.

Notably it defined a "DiveComputerNode" when this is something very different
from "struct dive_computer", the latter being the dive-computer related
data of a single dive.

Since the whole thing is defined in "device.h" and the function to create
such an entry is called "create_device_node", call the structure "device".
Use snake_case for consistency with the other core structures.

Moreover, call the collection of devices "device_table" in analogy
with "dive_table", etc.

Overall, this should make the core code more consistent style-wise.

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

14
core/device.h
View file

@ -26,10 +26,10 @@ extern void clear_device_nodes();
#include <QString>
#include <QVector>
struct DiveComputerNode {
bool operator==(const DiveComputerNode &a) const;
bool operator!=(const DiveComputerNode &a) const;
bool operator<(const DiveComputerNode &a) const;
struct device {
bool operator==(const device &a) const;
bool operator!=(const device &a) const;
bool operator<(const device &a) const;
void showchanges(const QString &n, const QString &s, const QString &f) const;
QString model;
uint32_t deviceId;
@ -38,13 +38,13 @@ struct DiveComputerNode {
QString nickName;
};
struct DiveComputerList {
struct device_table {
// Keep the dive computers in a vector sorted by (model, deviceId)
QVector<DiveComputerNode> dcs;
QVector<device> devices;
};
QString get_dc_nickname(const struct divecomputer *dc);
extern DiveComputerList dcList;
extern struct device_table device_table;
#endif