[Bf-blender-cvs] [a7e8e509a74] soc-2020-custom-menus: Fix compiler warnings

[Campbell Barton]

Commit: a7e8e509a74472fc1963d5a33d39b29b62e8c2ce
Author: Campbell Barton
Date:   Wed Aug 12 18:26:40 2020 +1000
Branches: soc-2020-custom-menus
https://developer.blender.org/rBa7e8e509a74472fc1963d5a33d39b29b62e8c2ce

Fix compiler warnings

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

M	source/blender/blenkernel/BKE_blender_user_menu.h
M	source/blender/blenkernel/intern/blender_user_menu.c
M	source/blender/makesrna/intern/rna_userdef.c

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

diff --git a/source/blender/blenkernel/BKE_blender_user_menu.h b/source/blender/blenkernel/BKE_blender_user_menu.h
index e4a291807ef..e4eddd69ca2 100644
--- a/source/blender/blenkernel/BKE_blender_user_menu.h
+++ b/source/blender/blenkernel/BKE_blender_user_menu.h
@@ -31,9 +31,9 @@ struct bUserMenuItem;
 void BKE_blender_user_menu_free_list(struct ListBase *lb);
 void BKE_blender_user_menus_group_idname_update(struct bUserMenusGroup *umg);
 void BKE_blender_user_menus_group_idname_update_keymap(struct wmWindowManager *wm,
-                                                       char *old,
-                                                       char *new);
-struct bUserMenusGroup *BKE_blender_user_menus_group_find(struct ListBase *lb, char *idname);
+                                                       const char *old,
+                                                       const char *new);
+struct bUserMenusGroup *BKE_blender_user_menus_group_find(struct ListBase *lb, const char *idname);
 struct bUserMenu *BKE_blender_user_menu_find(struct ListBase *lb,
                                              char space_type,
                                              const char *context);
diff --git a/source/blender/blenkernel/intern/blender_user_menu.c b/source/blender/blenkernel/intern/blender_user_menu.c
index 26068930737..5f787b3d779 100644
--- a/source/blender/blenkernel/intern/blender_user_menu.c
+++ b/source/blender/blenkernel/intern/blender_user_menu.c
@@ -50,7 +50,7 @@ void BKE_blender_user_menu_free_list(ListBase *lb)
   BLI_listbase_clear(lb);
 }
 
-bUserMenusGroup *BKE_blender_user_menus_group_find(ListBase *lb, char *idname)
+bUserMenusGroup *BKE_blender_user_menus_group_find(ListBase *lb, const char *idname)
 {
   LISTBASE_FOREACH (bUserMenusGroup *, umg, lb) {
     if ((STREQ(idname, umg->idname))) {
@@ -81,7 +81,9 @@ void BKE_blender_user_menus_group_idname_update(bUserMenusGroup *umg)
                  sizeof(umg->idname));
 }
 
-void BKE_blender_user_menus_group_idname_update_keymap(wmWindowManager *wm, char *old, char *new)
+void BKE_blender_user_menus_group_idname_update_keymap(wmWindowManager *wm,
+                                                       const char *UNUSED(old),
+                                                       const char *UNUSED(new))
 {
   wmKeyConfig *kc;
   wmKeyMap *km;
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 677cb8fc563..30e58ffd4a6 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1444,7 +1444,7 @@ static void rna_UserDef_usermenus_pie_item_add(UserDef *userdef, int index)
   wmOperatorType *ot = WM_operatortype_find("OBJECT_OT_add", true);
   STRNCPY(umi->item.ui_name, "new item");
   STRNCPY(umi->op_idname, ot->idname);
-  umi->item.parent = insert;
+  umi->item.parent = (bUserMenuItem_SubMenu *)insert;
   userdef->runtime.um_item_select = &umi->item;
 }
 
@@ -1510,8 +1510,10 @@ static void rna_UserDef_usermenus_group_idname_set(Main *bmain,
                                                    PointerRNA *ptr)
 {
   bUserMenusGroup *umg = (bUserMenusGroup *)ptr->data;
-  char *name = umg->name;
-  char old[64] = {NULL};
+#  if 0
+  const char *name = umg->name;
+#  endif
+  char old[64] = {'\0'};
 
   STRNCPY(old, umg->idname);
   BKE_blender_user_menus_group_idname_update(umg);