[Bf-blender-cvs] [9f60b06c8b5] soc-2020-custom-menus: Quiet compiler warnings

[Campbell Barton]

Commit: 9f60b06c8b5875dee61553c2c9441616fccb3483
Author: Campbell Barton
Date:   Wed Jul 29 20:12:54 2020 +1000
Branches: soc-2020-custom-menus
https://developer.blender.org/rB9f60b06c8b5875dee61553c2c9441616fccb3483

Quiet compiler warnings

===================================================================

M	source/blender/blenloader/intern/writefile.c
M	source/blender/editors/include/ED_screen.h
M	source/blender/editors/screen/screen_user_menu.c
M	source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 0dabd86b472..c7473f8ad2e 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1234,7 +1234,7 @@ static void write_keymapitem(BlendWriter *writer, const wmKeyMapItem *kmi)
   }
 }
 
-static void write_usermenuitems(BlendWriter *writer, ListBase *lb)
+static void write_usermenuitems(BlendWriter *writer, const ListBase *lb)
 {
   LISTBASE_FOREACH (const bUserMenuItem *, umi, lb) {
     if (umi->type == USER_MENU_TYPE_OPERATOR) {
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index ab6b87d29ec..c0226895ca8 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -413,7 +413,7 @@ void ED_screen_user_menu_item_add_prop(struct bContext *C,
 
 void ED_screen_user_menu_item_remove(struct ListBase *lb, struct bUserMenuItem *umi);
 void ED_screen_user_menu_register(void);
-bool screen_user_menu_draw_items(struct bContext *C,
+bool screen_user_menu_draw_items(const struct bContext *C,
                                  struct uiLayout *layout,
                                  struct ListBase *lb,
                                  bool is_pie);
diff --git a/source/blender/editors/screen/screen_user_menu.c b/source/blender/editors/screen/screen_user_menu.c
index f6b6a3f0e5a..ddc3360de84 100644
--- a/source/blender/editors/screen/screen_user_menu.c
+++ b/source/blender/editors/screen/screen_user_menu.c
@@ -186,7 +186,6 @@ void ED_screen_user_menu_item_add_operator(ListBase *lb,
   if (!STREQ(ui_name, ot->name)) {
     STRNCPY(umi_op->item.ui_name, ui_name);
   }
-  IDProperty *properties;
   STRNCPY(umi_op->op_idname, ot->idname);
   umi_op->prop = prop ? IDP_CopyProperty(prop) : NULL;
 }
@@ -268,7 +267,7 @@ static void screen_user_menu_draw_submenu(bContext *C, uiLayout *layout, void *a
   screen_user_menu_draw_items(C, layout, lb, false);
 }
 
-bool screen_user_menu_draw_items(bContext *C, uiLayout *layout, ListBase *lb, bool is_pie)
+bool screen_user_menu_draw_items(const bContext *C, uiLayout *layout, ListBase *lb, bool is_pie)
 {
   /* Enable when we have the ability to edit menus. */
   char label[512];
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 66c2fdcadb2..9f9f5abed4a 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1080,7 +1080,9 @@ static void rna_UserDef_studiolight_light_ambient_get(PointerRNA *ptr, float *va
 static bUserMenu *rna_UserDef_usermenus_get_current(UserDef *userdef, bool ensure)
 {
   const char **contexts_list = CTX_data_list_mode_string();
+#  if 0 /* UNUSED */
   ListBase *umg_list = &userdef->user_menus;
+#  endif
 
   bUserMenusGroup *umg = userdef->runtime.umg_select;
   bUserMenu *bum = NULL;
@@ -1372,7 +1374,7 @@ static void rna_UserDef_usermenus_item_move(UserDef *userdef, bool up)
       BLI_addtail(&umi_sm->items, umi);
     else
       BLI_addhead(&umi_sm->items, umi);
-    umi->parent = umi_toward;
+    umi->parent = (bUserMenuItem_SubMenu *)umi_toward;
   }
   else {
 
@@ -1422,7 +1424,7 @@ static void rna_UserDef_usermenus_pie_set(PointerRNA *ptr, int value)
     BKE_blender_user_menu_item_free_list(lb);
     if (value)
       for (int i = 0; i < 8; i++) {
-        bUserMenuItem *new_umi = BKE_blender_user_menu_item_add(lb, USER_MENU_TYPE_SEP);
+        /* bUserMenuItem *new_umi = */ BKE_blender_user_menu_item_add(lb, USER_MENU_TYPE_SEP);
       }
   }
   umg->pie = value;
@@ -1448,7 +1450,7 @@ static void rna_UserDef_usermenus_item_op_set(PointerRNA *ptr, const char *value
   free(opptr);
 }
 
-static void rna_UserDef_usermenu_draw(UserDef *userdef,
+static void rna_UserDef_usermenu_draw(UserDef *UNUSED(userdef),
                                       bContext *C,
                                       uiLayout *layout,
                                       bUserMenusGroup *umg)
@@ -6546,7 +6548,6 @@ static void rna_def_userdef_usermenusgroup(BlenderRNA *brna)
   StructRNA *srna;
   PropertyRNA *prop;
   FunctionRNA *func;
-  PropertyRNA *parm;
 
   /* user menus group */
   srna = RNA_def_struct(brna, "UserMenusGroup", NULL);
@@ -6574,7 +6575,7 @@ static void rna_def_userdef_usermenusgroup(BlenderRNA *brna)
 
   func = RNA_def_function(srna, "set_keymap", "rna_UserDef_usermenus_set_keymap");
   RNA_def_function_ui_description(func, "set the keymap of the menu");
-  parm = RNA_def_pointer(func, "kmi", "KeyMapItem", "", "the new keymap");
+  RNA_def_pointer(func, "kmi", "KeyMapItem", "", "the new keymap");
 }
 
 static void rna_def_userdef_usermenus_editor(BlenderRNA *brna)
@@ -6593,6 +6594,7 @@ static void rna_def_userdef_usermenus_editor(BlenderRNA *brna)
       {0, NULL, 0, NULL, NULL},
   };
 
+#  if 0 /* TODO(campbell): remove this? */
   static const EnumPropertyItem um_item_type[] = {
       {USER_MENU_TYPE_OPERATOR, "OPERATOR", 0, "Operator", "Operator"},
       {USER_MENU_TYPE_MENU, "MENU", 0, "Menu", "Menu"},
@@ -6600,6 +6602,7 @@ static void rna_def_userdef_usermenus_editor(BlenderRNA *brna)
       {USER_MENU_TYPE_PROP, "PROPERTY", 0, "Property", "Property"},
       {0, NULL, 0, NULL, NULL},
   };
+#  endif
 
   StructRNA *srna = RNA_def_struct(brna, "PreferencesUserMenus", NULL);
   RNA_def_struct_sdna(srna, "UserDef");