summaryrefslogtreecommitdiffstats
path: root/core/divelist.h
diff options
context:
space:
mode:
Diffstat (limited to 'core/divelist.h')
-rw-r--r--core/divelist.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/core/divelist.h b/core/divelist.h
index 5c1667314..ae36de9db 100644
--- a/core/divelist.h
+++ b/core/divelist.h
@@ -18,10 +18,13 @@ extern int init_decompression(struct deco_state *ds, struct dive *dive);
/* divelist core logic functions */
extern void process_loaded_dives();
-extern void add_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table,
- bool prefer_imported, bool downloaded, bool merge_all_trips, bool add_to_new_trip);
-extern void process_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table,
- bool prefer_imported, bool downloaded, bool merge_all_trips, bool add_to_new_trip,
+/* flags for process_imported_dives() */
+#define IMPORT_PREFER_IMPORTED (1 << 0)
+#define IMPORT_IS_DOWNLOADED (1 << 1)
+#define IMPORT_MERGE_ALL_TRIPS (1 << 2)
+#define IMPORT_ADD_TO_NEW_TRIP (1 << 3)
+extern void add_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, int flags);
+extern void process_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, int flags,
struct dive_table *dives_to_add, struct dive_table *dives_to_remove,
struct trip_table *trips_to_add);
extern char *get_dive_gas_string(const struct dive *dive);