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

core: fold divesite-helper.cpp into divesite.cpp

Browse source 
The divesite-helper.cpp only existed because C-string manipulation
was too tedious. Now that divesite.cpp is C++ anyway, the split
is not necessary anymore.

Moreover, return an std::string, since this is a core-function.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-04 14:55:10 +02:00 • committed by bstoeger
parent 801b5d50b2
commit 177246b419
6 changed files with 55 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/divesite.h
View file

@ -8,7 +8,6 @@
#include <stdlib.h>
#ifdef __cplusplus
#include <QString>
#include <QObject>
struct dive_site
@ -73,8 +72,7 @@ void clear_dive_site_table(struct dive_site_table *ds_table);
void move_dive_site_table(struct dive_site_table *src, struct dive_site_table *dst);
void add_dive_to_dive_site(struct dive *d, struct dive_site *ds);
struct dive_site *unregister_dive_from_dive_site(struct dive *d);
QString constructLocationTags(taxonomy_data &taxonomy, bool for_maintab);
std::string constructLocationTags(const taxonomy_data &taxonomy, bool for_maintab);
/* Make pointer-to-dive_site a "Qt metatype" so that we can pass it through QVariants */
Q_DECLARE_METATYPE(dive_site *);