griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: merge key-map clear & free into one loop

Browse Source
This commit is contained in:
Campbell Barton
2023-09-20 12:11:28 +10:00
parent 53cbdaaa8b
commit f8719abdf4
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/intern/rna_wm_api.cc
View File

@@ -495,9 +495,7 @@ static void rna_KeyMaps_remove(wmKeyConfig *keyconfig, ReportList *reports, Poin
static void rna_KeyMaps_clear(wmKeyConfig *keyconfig)
{
while (wmKeyMap *keymap = static_cast<wmKeyMap *>(keyconfig->keymaps.first)) {
WM_keymap_remove(keyconfig, keymap);
}
WM_keyconfig_clear(keyconfig);
}
wmKeyConfig *rna_KeyConfig_new(wmWindowManager *wm, const char *idname)

15
source/blender/windowmanager/intern/wm_keymap.cc
View File

@@ -324,11 +324,12 @@ void WM_keyconfig_remove(wmWindowManager *wm, wmKeyConfig *keyconf)
void WM_keyconfig_clear(wmKeyConfig *keyconf)
{
LISTBASE_FOREACH (wmKeyMap *, km, &keyconf->keymaps) {
LISTBASE_FOREACH_MUTABLE (wmKeyMap *, km, &keyconf->keymaps) {
WM_keymap_clear(km);
MEM_freeN(km);
}
BLI_freelistN(&keyconf->keymaps);
BLI_listbase_clear(&keyconf->keymaps);
}
void WM_keyconfig_free(wmKeyConfig *keyconf)
@@ -418,16 +419,18 @@ static wmKeyMap *wm_keymap_copy(wmKeyMap *keymap)
void WM_keymap_clear(wmKeyMap *keymap)
{
LISTBASE_FOREACH (wmKeyMapDiffItem *, kmdi, &keymap->diff_items) {
LISTBASE_FOREACH_MUTABLE (wmKeyMapDiffItem *, kmdi, &keymap->diff_items) {
wm_keymap_diff_item_free(kmdi);
MEM_freeN(kmdi);
}
LISTBASE_FOREACH (wmKeyMapItem *, kmi, &keymap->items) {
LISTBASE_FOREACH_MUTABLE (wmKeyMapItem *, kmi, &keymap->items) {
wm_keymap_item_free(kmi);
MEM_freeN(kmi);
}
BLI_freelistN(&keymap->diff_items);
BLI_freelistN(&keymap->items);
BLI_listbase_clear(&keymap->diff_items);
BLI_listbase_clear(&keymap->items);
}
void WM_keymap_remove(wmKeyConfig *keyconf, wmKeyMap *keymap)