diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-07-15 22:38:21 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-07-18 05:42:55 -0700 |
commit | b720f3697874338c3bf77a65ed3b319897841e26 (patch) | |
tree | a484e7613f816698faf91a333f6ffb155944533c /core/qthelper.h | |
parent | b862e028c6695e9adfdffc2b46ad3c433ec7f214 (diff) | |
download | subsurface-b720f3697874338c3bf77a65ed3b319897841e26.tar.gz |
Cleanup: fix include weirdness concerning string_to_*() functions
The string_to_*() functions were declared in dive.h and qthelper.h.
Moreover in one file they were declared with C in the other with
C++ linkage. This only works because qthelper.h includes dive.h
first.
Fix this anomaly by declaring the functions only in qthelper.h,
but moving them from the C++ to the C part.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/qthelper.h')
-rw-r--r-- | core/qthelper.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/qthelper.h b/core/qthelper.h index 2ff464c2a..685525a70 100644 --- a/core/qthelper.h +++ b/core/qthelper.h @@ -33,11 +33,6 @@ void write_hashes(); QString thumbnailFileName(const QString &filename); void learnPictureFilename(const QString &originalName, const QString &localName); QString localFilePath(const QString &originalFilename); -weight_t string_to_weight(const char *str); -depth_t string_to_depth(const char *str); -pressure_t string_to_pressure(const char *str); -volume_t string_to_volume(const char *str, pressure_t workp); -fraction_t string_to_fraction(const char *str); int getCloudURL(QString &filename); bool parseGpsText(const QString &gps_text, double *latitude, double *longitude); void init_proxy(); @@ -162,6 +157,11 @@ void print_qt_versions(); void lock_planner(); void unlock_planner(); xsltStylesheetPtr get_stylesheet(const char *name); +weight_t string_to_weight(const char *str); +depth_t string_to_depth(const char *str); +pressure_t string_to_pressure(const char *str); +volume_t string_to_volume(const char *str, pressure_t workp); +fraction_t string_to_fraction(const char *str); #ifdef __cplusplus } |