mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: remove typedefs in equipment.h

Browse source 
Wuth C++ the distinction between "typedef" and regular "struct"
makes no sense anymore. Remove the typedefs, it's just confusing.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-14 22:50:45 +02:00 committed by bstoeger
parent d242198c99
commit 65dcb98e41
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/equipment.h
View file

@ -13,14 +13,14 @@ struct dive;
enum cylinderuse {OC_GAS, DILUENT, OXYGEN, NOT_USED, NUM_GAS_USE}; // The different uses for cylinders enum cylinderuse {OC_GAS, DILUENT, OXYGEN, NOT_USED, NUM_GAS_USE}; // The different uses for cylinders
extern const char *cylinderuse_text[NUM_GAS_USE]; extern const char *cylinderuse_text[NUM_GAS_USE];
typedef struct struct cylinder_type_t
{ {
volume_t size; volume_t size;
pressure_t workingpressure; pressure_t workingpressure;
const char *description = nullptr; /* "LP85", "AL72", "AL80", "HP100+" or whatever */ const char *description = nullptr; /* "LP85", "AL72", "AL80", "HP100+" or whatever */
} cylinder_type_t; };
typedef struct struct cylinder_t
{ {
cylinder_type_t type; cylinder_type_t type;
struct gasmix gasmix = gasmix_air; struct gasmix gasmix = gasmix_air;
@ -32,7 +32,7 @@ typedef struct
enum cylinderuse cylinder_use = OC_GAS; enum cylinderuse cylinder_use = OC_GAS;
bool bestmix_o2 = false; bool bestmix_o2 = false;
bool bestmix_he = false; bool bestmix_he = false;
} cylinder_t; };
/* Table of cylinders. Attention: this stores cylinders, /* Table of cylinders. Attention: this stores cylinders,
* *not* pointers to cylinders. This has two crucial consequences: * *not* pointers to cylinders. This has two crucial consequences:
@ -45,12 +45,12 @@ struct cylinder_table {
cylinder_t *cylinders; cylinder_t *cylinders;
}; };
typedef struct struct weightsystem_t
{ {
weight_t weight; weight_t weight;
const char *description; /* "integrated", "belt", "ankle" */ const char *description; /* "integrated", "belt", "ankle" */
bool auto_filled; /* weight was automatically derived from the type */ bool auto_filled; /* weight was automatically derived from the type */
} weightsystem_t; };
static const weightsystem_t empty_weightsystem = { { 0 }, 0, false }; static const weightsystem_t empty_weightsystem = { { 0 }, 0, false };