Improve MenuItemsSelection functions to use typedef enum for paramete…

…r/return types
viking-gps · Jan 18, 2025 · 34a2779 · 34a2779
1 parent 4e895f1
commit 34a2779
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/src/viklayer.c b/src/viklayer.c
@@ -552,13 +552,13 @@ void vik_layer_realize ( VikLayer *l, VikTreeview *vt, GtkTreeIter *layer_iter )
     vik_layer_interfaces[l->type]->realize ( l, vt, layer_iter );
 }
 
-void vik_layer_set_menu_items_selection(VikLayer *l, guint16 selection)
+void vik_layer_set_menu_items_selection(VikLayer *l, VikStdLayerMenuItem selection)
 {
   if ( vik_layer_interfaces[l->type]->set_menu_selection )
     vik_layer_interfaces[l->type]->set_menu_selection ( l, selection );
 }
 
-guint16 vik_layer_get_menu_items_selection(VikLayer *l)
+VikStdLayerMenuItem vik_layer_get_menu_items_selection(VikLayer *l)
 {
   if ( vik_layer_interfaces[l->type]->get_menu_selection )
     return(vik_layer_interfaces[l->type]->get_menu_selection (l));

diff --git a/src/viklayer.h b/src/viklayer.h
@@ -111,6 +111,15 @@ struct _VikToolInterface {
 /* Parameters (for I/O and Properties) */
 /* --> moved to uibuilder.h */
 
+typedef enum {
+  VIK_MENU_ITEM_PROPERTY=1,
+  VIK_MENU_ITEM_CUT=2,
+  VIK_MENU_ITEM_COPY=4,
+  VIK_MENU_ITEM_PASTE=8,
+  VIK_MENU_ITEM_DELETE=16,
+  VIK_MENU_ITEM_ALL=0xff
+} VikStdLayerMenuItem;
+
 /* layer interface functions */
 
 /* Create a new layer of a certain type. Should be filled with defaults */
@@ -138,8 +147,8 @@ typedef void          (*VikLayerFuncDraw)                  (VikLayer *,VikViewpo
 typedef void          (*VikLayerFuncConfigure)             (VikLayer *,VikViewport *); // 'configure-event' events
 typedef void          (*VikLayerFuncChangeCoordMode)       (VikLayer *,VikCoordMode);
 
-typedef void          (*VikLayerFuncSetMenuItemsSelection)          (VikLayer *,guint16);
-typedef guint16          (*VikLayerFuncGetMenuItemsSelection)          (VikLayer *);
+typedef void                (*VikLayerFuncSetMenuItemsSelection) (VikLayer *,VikStdLayerMenuItem);
+typedef VikStdLayerMenuItem (*VikLayerFuncGetMenuItemsSelection) (VikLayer *);
 
 typedef void          (*VikLayerFuncAddMenuItems)          (VikLayer *,GtkMenu *,gpointer); /* gpointer is a VikLayersPanel */
 typedef gboolean      (*VikLayerFuncSublayerAddMenuItems)  (VikLayer *,GtkMenu *,gpointer, /* first gpointer is a VikLayersPanel */
@@ -193,15 +202,6 @@ typedef double        (*VikLayerFuncGetTimestamp)          (VikLayer *);
 //  useful to hook in a separate redraw
 typedef gboolean      (*VikLayerFuncRefresh)               (VikLayer *);
 
-typedef enum {
-  VIK_MENU_ITEM_PROPERTY=1,
-  VIK_MENU_ITEM_CUT=2,
-  VIK_MENU_ITEM_COPY=4,
-  VIK_MENU_ITEM_PASTE=8,
-  VIK_MENU_ITEM_DELETE=16,
-  VIK_MENU_ITEM_ALL=0xff
-} VikStdLayerMenuItem;
-
 typedef struct _VikLayerInterface VikLayerInterface;
 
 /* See vik_layer_* for function parameter names */
@@ -298,8 +298,8 @@ void vik_layer_emit_update ( VikLayer *vl, gboolean is_modified );
 void vik_layer_redraw ( VikLayer *vl );
 
 /* GUI */
-void vik_layer_set_menu_items_selection(VikLayer *l, guint16 selection);
-guint16 vik_layer_get_menu_items_selection(VikLayer *l);
+void vik_layer_set_menu_items_selection(VikLayer *l, VikStdLayerMenuItem selection);
+VikStdLayerMenuItem vik_layer_get_menu_items_selection(VikLayer *l);
 void vik_layer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp );
 VikLayer *vik_layer_create ( VikLayerTypeEnum type, VikViewport *vp, gboolean interactive );
 gboolean vik_layer_properties ( VikLayer *layer, VikViewport *vp, gboolean have_apply );

diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c
@@ -841,8 +841,8 @@ static void trw_layer_draw ( VikTrwLayer *l, VikViewport *vvp );
 static void trw_layer_configure ( VikTrwLayer *l, VikViewport *vvp );
 static void trw_layer_change_coord_mode ( VikTrwLayer *vtl, VikCoordMode dest_mode );
 static gdouble trw_layer_get_timestamp ( VikTrwLayer *vtl );
-static void trw_layer_set_menu_selection ( VikTrwLayer *vtl, guint16 selection );
-static guint16 trw_layer_get_menu_selection ( VikTrwLayer *vtl );
+static void trw_layer_set_menu_selection ( VikTrwLayer *vtl, VikStdLayerMenuItem selection );
+static VikStdLayerMenuItem trw_layer_get_menu_selection ( VikTrwLayer *vtl );
 static void trw_layer_add_menu_items ( VikTrwLayer *vtl, GtkMenu *menu, gpointer vlp );
 static gboolean trw_layer_sublayer_add_menu_items ( VikTrwLayer *l, GtkMenu *menu, gpointer vlp, gint subtype, gpointer sublayer, GtkTreeIter *iter, VikViewport *vvp );
 static const gchar* trw_layer_sublayer_rename_request ( VikTrwLayer *l, const gchar *newname, gpointer vlp, gint subtype, gpointer sublayer, GtkTreeIter *iter );
@@ -12621,14 +12621,14 @@ static void trw_layer_change_coord_mode ( VikTrwLayer *vtl, VikCoordMode dest_mo
   }
 }
 
-static void trw_layer_set_menu_selection ( VikTrwLayer *vtl, guint16 selection )
+static void trw_layer_set_menu_selection ( VikTrwLayer *vtl, VikStdLayerMenuItem selection )
 {
   vtl->menu_selection = selection;
 }
 
-static guint16 trw_layer_get_menu_selection ( VikTrwLayer *vtl )
+static VikStdLayerMenuItem trw_layer_get_menu_selection ( VikTrwLayer *vtl )
 {
-  return (vtl->menu_selection);
+  return vtl->menu_selection;
 }
 
 /* ----------- Downloading maps along tracks --------------- */