summaryrefslogtreecommitdiffstats
path: root/dive.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-21 23:13:45 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-21 23:39:49 -0700
commit478baf107623c3aa0c31c3256cfc3bc794b089b1 (patch)
tree090485f799a36090bf4a301ba8611f0b5686a44a /dive.h
parent5aa8b52f82399bd4343a8213927c7e9694def1bc (diff)
downloadsubsurface-478baf107623c3aa0c31c3256cfc3bc794b089b1.tar.gz
Replace GError handling with a kMessageWidget based approach
Instead of passing pointers to GError around we pass just pointers to error message texts around and use kMessageWidget to show those. Problem is that right now the close button on that doesn't do a thing - so the error stays around indefinitely. Oops. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.h')
-rw-r--r--dive.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/dive.h b/dive.h
index 15c334ae1..d16d2445a 100644
--- a/dive.h
+++ b/dive.h
@@ -584,13 +584,13 @@ struct dive *find_dive_n_near(timestamp_t when, int n, timestamp_t offset);
extern int match_one_dc(struct divecomputer *a, struct divecomputer *b);
extern void parse_xml_init(void);
-extern void parse_xml_buffer(const char *url, const char *buf, int size, struct dive_table *table, GError **error);
+extern void parse_xml_buffer(const char *url, const char *buf, int size, struct dive_table *table, char **error);
extern void parse_xml_exit(void);
extern void set_filename(const char *filename, gboolean force);
-extern int parse_dm4_buffer(const char *url, const char *buf, int size, struct dive_table *table, GError **error);
+extern int parse_dm4_buffer(const char *url, const char *buf, int size, struct dive_table *table, char **error);
-extern void parse_file(const char *filename, GError **error);
+extern void parse_file(const char *filename, char **error);
extern void show_dive_info(struct dive *);
@@ -634,7 +634,7 @@ extern void add_event(struct divecomputer *dc, int time, int type, int flags, in
/* UI related protopypes */
extern void init_ui(int *argcp, char ***argvp);
-extern void init_qt_ui(int *argcp, char ***argvp);
+extern void init_qt_ui(int *argcp, char ***argvp, char *errormessage);
extern void run_ui(void);
extern void exit_ui(void);