Fix MenuClass menu creation

1 files changed, 25 insertions, 25 deletions

diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c
index 8aa181b50..6d6f7ce58 100644
--- a/frontends/amiga/hotlist.c
+++ b/frontends/amiga/hotlist.c
@@ -404,49 +404,49 @@ HOOKF(void, ami_hotlist_menu_item_edit_delete, APTR, window, struct IntuiMessage
 
 static void ami_hotlist_menulabs(struct ami_menu_data **md)
 {
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_PROJECT, NM_TITLE, "Tree",       0, NULL, NULL, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPORT,   NM_ITEM, "TreeExport", 'S', "TBImages:list_save",
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_PROJECT, NM_TITLE, "Tree", NULL, NULL, NULL, NULL, 0);
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPORT,   NM_ITEM, "TreeExport", "S", "TBImages:list_save",
 		ami_hotlist_menu_item_project_export, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_P1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND,   NM_ITEM, "Expand", 0, "TBImages:list_folderunfold", NULL, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND_ALL,   NM_SUB, "All", '+', NULL,
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_P1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0);
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND,   NM_ITEM, "Expand", NULL, "TBImages:list_folderunfold", NULL, NULL, 0);
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND_ALL,   NM_SUB, "All", "+", NULL,
 		ami_hotlist_menu_item_project_expand_all, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND_FOLDERS,   NM_SUB, "Folders", 0, NULL,
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND_FOLDERS,   NM_SUB, "Folders", NULL, NULL,
 		ami_hotlist_menu_item_project_expand_folders, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND_LINKS,   NM_SUB, "Links", 0, NULL,
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND_LINKS,   NM_SUB, "Links", NULL, NULL,
 		ami_hotlist_menu_item_project_expand_links, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE,   NM_ITEM, "Collapse", 0, "TBImages:list_folderfold", NULL, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE_ALL,   NM_SUB, "All", '-', NULL,
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE,   NM_ITEM, "Collapse", NULL, "TBImages:list_folderfold", NULL, NULL, 0);
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE_ALL,   NM_SUB, "All", "-", NULL,
 		ami_hotlist_menu_item_project_collapse_all, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE_FOLDERS,   NM_SUB, "Folders", 0, NULL,
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE_FOLDERS,   NM_SUB, "Folders", NULL, NULL,
 		ami_hotlist_menu_item_project_collapse_folders, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE_LINKS,   NM_SUB, "Links", 0, NULL,
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE_LINKS,   NM_SUB, "Links", NULL, NULL,
 		ami_hotlist_menu_item_project_collapse_links, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_P2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_SNAPSHOT,   NM_ITEM, "SnapshotWindow", 0, "TBImages:list_hold",
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_P2, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0);
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_SNAPSHOT,   NM_ITEM, "SnapshotWindow", NULL, "TBImages:list_hold",
 		ami_hotlist_menu_item_project_snapshot, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_P3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_CLOSE,   NM_ITEM, "CloseWindow", 'K', "TBImages:list_cancel",
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_P3, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0);
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_CLOSE,   NM_ITEM, "CloseWindow", "K", "TBImages:list_cancel",
 		ami_hotlist_menu_item_project_close, NULL, 0);
 
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_EDIT, NM_TITLE, "Edit",       0, NULL, NULL, NULL, 0);
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_EDIT, NM_TITLE, "Edit", NULL, NULL, NULL, NULL, 0);
 
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_NEWFOLDER,   NM_ITEM, "TreeNewFolder", 'N', "TBImages:list_drawer",
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_NEWFOLDER,   NM_ITEM, "TreeNewFolder", "N", "TBImages:list_drawer",
 		ami_hotlist_menu_item_edit_newfolder, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_NEWLINK,   NM_ITEM, "TreeNewLink", 0, "TBImages:list_favouriteadd",
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_NEWLINK,   NM_ITEM, "TreeNewLink", NULL, "TBImages:list_favouriteadd",
 		ami_hotlist_menu_item_edit_newlink, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_EDIT_EDIT,   NM_ITEM, "TreeEdit", 'E', "TBImages:list_edit",
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_EDIT_EDIT,   NM_ITEM, "TreeEdit", "E", "TBImages:list_edit",
 		ami_hotlist_menu_item_edit_edit, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_E1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_SELECTALL,   NM_ITEM, "SelectAllNS", 'A', NSA_SPACE,
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_E1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0);
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_SELECTALL,   NM_ITEM, "SelectAllNS", "A", NSA_SPACE,
 		ami_hotlist_menu_item_edit_select_all, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_CLEAR,   NM_ITEM, "ClearNS", 0, NSA_SPACE,
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_CLEAR,   NM_ITEM, "ClearNS", NULL, NSA_SPACE,
 		ami_hotlist_menu_item_edit_clear, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_E2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL, 0);
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_DELETE,   NM_ITEM, "TreeDelete", 0, "TBImages:list_delete",
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_E2, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0);
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_DELETE,   NM_ITEM, "TreeDelete", "Del", "TBImages:list_delete",
 		ami_hotlist_menu_item_edit_delete, NULL, 0);
 
-	ami_menu_alloc_item(md, AMI_HOTLIST_M_LAST,   NM_END, NULL,     0, NULL, NULL, NULL, 0);
+	ami_menu_alloc_item(md, AMI_HOTLIST_M_LAST,   NM_END, NULL, NULL, NULL, NULL, NULL, 0);
 }
 
 static struct Menu *