From b720f3697874338c3bf77a65ed3b319897841e26 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 15 Jul 2019 22:38:21 +0200 Subject: 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 --- core/dive.h | 5 ----- core/qthelper.h | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/core/dive.h b/core/dive.h index 1be628151..406a7b672 100644 --- a/core/dive.h +++ b/core/dive.h @@ -530,11 +530,6 @@ extern void set_git_prefs(const char *prefs); extern char *get_dive_date_c_string(timestamp_t when); extern void update_setpoint_events(const struct dive *dive, struct divecomputer *dc); -extern weight_t string_to_weight(const char *str); -extern depth_t string_to_depth(const char *str); -extern pressure_t string_to_pressure(const char *str); -extern volume_t string_to_volume(const char *str, pressure_t workp); -extern fraction_t string_to_fraction(const char *str); extern void average_max_depth(struct diveplan *dive, int *avg_depth, int *max_depth); #ifdef __cplusplus 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 } -- cgit v1.2.3-70-g09d2