diff options
| -rw-r--r-- | dive.c | 2 | ||||
| -rw-r--r-- | dive.h | 2 | ||||
| -rw-r--r-- | qthelper.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -955,7 +955,7 @@ struct dive *fixup_dive(struct dive *dive) weightsystem_t *ws = dive->weightsystem + i; add_weightsystem_description(ws); } - dive->id = getUniqID(dive); + dive->id = dive_getUniqID(dive); return dive; } @@ -525,7 +525,7 @@ extern bool has_hr_data(struct divecomputer *dc); extern void sort_table(struct dive_table *table); extern struct dive *fixup_dive(struct dive *dive); -extern int getUniqID(struct dive *d); +extern int dive_getUniqID(struct dive *d); extern unsigned int dc_airtemp(struct divecomputer *dc); extern unsigned int dc_watertemp(struct divecomputer *dc); extern struct dive *merge_dives(struct dive *a, struct dive *b, int offset, bool prefer_downloaded); diff --git a/qthelper.cpp b/qthelper.cpp index 2cecb9774..a5e450eff 100644 --- a/qthelper.cpp +++ b/qthelper.cpp @@ -260,7 +260,7 @@ QList<int> getDivesInTrip(dive_trip_t *trip) // it doesn't change during the life time of a Subsurface session // oh, and it has no meaning whatsoever - that's why we have the // silly initial number and increment by 3 :-) -int getUniqID(struct dive *d) +int dive_getUniqID(struct dive *d) { static QSet<int> ids; static int maxId = 83529; |