From: Rob Norris Date: Sat, 5 Apr 2014 09:48:31 +0000 (+0100) Subject: [QA] Correct and improve enumeration usage for export file types. X-Git-Url: https://git.street.me.uk/andy/viking.git/commitdiff_plain/bb3c38aff330a892b8001a15ee17fe8f9e73efce [QA] Correct and improve enumeration usage for export file types. --- diff --git a/src/file.c b/src/file.c index bae3fa76..49f35588 100644 --- a/src/file.c +++ b/src/file.c @@ -612,7 +612,7 @@ gboolean check_file_magic_vik ( const gchar *filename ) * * Returns: a newly allocated string */ -gchar *append_file_ext ( const gchar *filename, VikLoadType_t type ) +gchar *append_file_ext ( const gchar *filename, VikFileType_t type ) { gchar *new_name = NULL; const gchar *ext = NULL; diff --git a/src/file.h b/src/file.h index 3e1b12b8..9d25f652 100644 --- a/src/file.h +++ b/src/file.h @@ -55,7 +55,7 @@ typedef enum { LOAD_TYPE_OTHER_SUCCESS, } VikLoadType_t; -gchar *append_file_ext ( const gchar *filename, VikLoadType_t type ); +gchar *append_file_ext ( const gchar *filename, VikFileType_t type ); VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename ); gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename ); diff --git a/src/viktrwlayer_export.c b/src/viktrwlayer_export.c index 1fdfb652..76fb5e47 100644 --- a/src/viktrwlayer_export.c +++ b/src/viktrwlayer_export.c @@ -32,7 +32,7 @@ #include "viking.h" #include "viktrwlayer_export.h" -void vik_trw_layer_export ( VikTrwLayer *vtl, const gchar *title, const gchar* default_name, VikTrack* trk, guint file_type ) +void vik_trw_layer_export ( VikTrwLayer *vtl, const gchar *title, const gchar* default_name, VikTrack* trk, VikFileType_t file_type ) { GtkWidget *file_selector; const gchar *fn; diff --git a/src/viktrwlayer_export.h b/src/viktrwlayer_export.h index 0d745b21..5b929b4f 100644 --- a/src/viktrwlayer_export.h +++ b/src/viktrwlayer_export.h @@ -27,7 +27,7 @@ G_BEGIN_DECLS -void vik_trw_layer_export ( VikTrwLayer *vtl, const gchar *title, const gchar* default_name, VikTrack* trk, guint file_type ); +void vik_trw_layer_export ( VikTrwLayer *vtl, const gchar *title, const gchar* default_name, VikTrack* trk, VikFileType_t file_type ); void vik_trw_layer_export_external_gpx ( VikTrwLayer *vtl, const gchar* external_program );