diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2012-12-21 20:00:20 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2012-12-21 20:58:47 -0800 |
| commit | 8d2abc05f60cb9a5ec79db9a215fe8aa97e0c311 (patch) | |
| tree | 1a3d4fe6f9abc3206cdf8a115edb954842e64e29 /dive.h | |
| parent | eb3e879030b0a29cc3f40d8df3e3eb6f7120c9ea (diff) | |
| download | subsurface-8d2abc05f60cb9a5ec79db9a215fe8aa97e0c311.tar.gz | |
Remove nickname from divecomputer data structure
Having it there with the model information seemed to make sense but on
second thought it's the wrong spot to keep that information, especially
since we were storing it in the XML file in every single dive.
This change removes the nickname member from the divecomputer and makes
the rest of the code reasonably self consistent. It does not add much of
the new code for the new design to handle nicknames.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.h')
| -rw-r--r-- | dive.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -266,7 +266,6 @@ struct event { struct divecomputer { timestamp_t when; const char *model; - const char *nickname; uint32_t deviceid, diveid; int samples, alloc_samples; struct sample *sample; @@ -529,6 +528,7 @@ extern void dive_list_update_dives(void); extern void flush_divelist(struct dive *dive); extern void set_dc_nickname(struct dive *dive); +extern const char *get_dc_nickname(uint32_t deviceid); extern void remember_dc(uint32_t deviceid, const char *nickname, gboolean change_conf); #define DIVE_ERROR_PARSE 1 |