Fixing whitespace, line wrapping

[ext/subsurface.git] / dive.h

diff --git a/dive.h b/dive.h
index cf11e1f89384bb34176e9eb5c14879cb89f73be1..0549843ab5374cdca86d5be614c40a9017d0a6d8 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -5,6 +5,7 @@
 #include <time.h>
 
 #include <glib.h>
+#include <libxml/tree.h>
 
 /*
  * Some silly typedefs to make our units very explicit.
@@ -83,9 +84,11 @@ typedef struct {
 typedef struct {
        cylinder_type_t type;
        struct gasmix gasmix;
-       pressure_t start, end;
+       pressure_t start, end, sample_start, sample_end;
 } cylinder_t;
 
+extern int cylinder_none(cylinder_t *cyl);
+
 extern int get_pressure_units(unsigned int mb, const char **units);
 extern double get_depth_units(unsigned int mm, int *frac, const char **units);
 extern double get_volume_units(unsigned int mm, int *frac, const char **units);
@@ -198,6 +201,7 @@ struct dive {
        char *location;
        char *notes;
        char *divemaster, *buddy;
+       int rating;
        double latitude, longitude;
        depth_t maxdepth, meandepth;
        duration_t duration, surfacetime;
@@ -253,11 +257,13 @@ extern void parse_xml_init(void);
 extern void parse_xml_file(const char *filename, GError **error);
 extern void set_filename(const char *filename);
 
+#ifdef XSLT
+extern xmlDoc *test_xslt_transforms(xmlDoc *doc);
+#endif
+
 extern void show_dive_info(struct dive *);
-extern void flush_dive_info_changes(struct dive *);
 
 extern void show_dive_equipment(struct dive *);
-extern void flush_dive_equipment_changes(struct dive *);
 
 extern void show_dive_stats(struct dive *);
 
@@ -299,6 +305,7 @@ extern void add_location(const char *string);
 extern void remember_event(const char *eventname);
 extern void evn_foreach(void (*callback)(const char *, int *, void *), void *data);
 
+extern int edit_dive_info(struct dive *dive);
 extern void dive_list_update_dives(void);
 extern void flush_divelist(struct dive *dive);
 
@@ -309,5 +316,14 @@ const char *monthname(int mon);
 
 #define UTF8_DEGREE "\xc2\xb0"
 #define UTF8_SUBSCRIPT_2 "\xe2\x82\x82"
+#define UTF8_WHITESTAR "\xe2\x98\x86"
+#define UTF8_BLACKSTAR "\xe2\x98\x85"
+#define ZERO_STARS     UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR
+#define ONE_STARS      UTF8_BLACKSTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR
+#define TWO_STARS      UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR
+#define THREE_STARS    UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_WHITESTAR UTF8_WHITESTAR
+#define FOUR_STARS     UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_WHITESTAR
+#define FIVE_STARS     UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR
+extern const char *star_strings[];
 
 #endif /* DIVE_H */