Replace macros by enum

An enum informs the compiler about the idea of related values.

Signed-off-by: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>

diff --git a/src/file.c b/src/file.c
index 8f410db3fa1151a7a0de841c456cd786ee21a1a7..69029fb653cd0c238cf68175a9e82e90be612da9 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -644,7 +644,7 @@ gboolean check_file_ext ( const gchar *filename, const gchar *fileext )
   return FALSE;
 }
 
-gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type, const gchar *trackname )
+gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t file_type, const gchar *trackname )
 {
   FILE *f = g_fopen ( filename, "w" );
   if ( f )

diff --git a/src/file.h b/src/file.h
index 68c995ce0e5405f84007c1d738abe4fb4467b4ed..b03ebcd0fc74b81c247f1f1dbc927c1513791cdf 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -28,9 +28,11 @@
 #include "viktrwlayer.h"
 #include "vikviewport.h"
 
-#define FILE_TYPE_GPSPOINT 1
-#define FILE_TYPE_GPSMAPPER 2
-#define FILE_TYPE_GPX 3
+typedef enum {
+FILE_TYPE_GPSPOINT=1,
+FILE_TYPE_GPSMAPPER=2,
+FILE_TYPE_GPX=3,
+} VikFileType_t;
 
 const gchar *a_file_basename ( const gchar *filename );
 gboolean check_file_ext ( const gchar *filename, const gchar *fileext );
@@ -39,7 +41,7 @@ gboolean check_file_ext ( const gchar *filename, const gchar *fileext );
 gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename );
 gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename );
 /* Only need to define VikTrack and trackname if the file type is FILE_TYPE_GPX_TRACK */
-gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type, const gchar *trackname );
+gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t file_type, const gchar *trackname );
 const gchar *a_get_viking_dir();
 
 void file_write_layer_param ( FILE *f, const gchar *name, guint8 type, VikLayerParamData data );