diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-17 12:45:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-17 12:45:45 +0300 |
commit | 51dcbdde033f6e8e55c4b1b4a47ca0624a6571ee (patch) | |
tree | 18315acbbe218deeea38c22ab41027df7d2cb06f /source/blender/windowmanager/intern/wm_keymap.c | |
parent | acc883da83b5fa7839a094e8dbf259077ca64f2e (diff) |
use 'const char *' by default with RNA functions except when the value is flagged as PROP_THICK_WRAP.
Also use const char in many other parts of blenders code.
Currently this gives warnings for setting operator id, label and description since these are an exception and allocated beforehand.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 628c2aa1922..a005da43a9a 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -75,7 +75,7 @@ void WM_keymap_properties_reset(wmKeyMapItem *kmi, struct IDProperty *properties keymap_properties_set(kmi); } -wmKeyConfig *WM_keyconfig_new(wmWindowManager *wm, char *idname) +wmKeyConfig *WM_keyconfig_new(wmWindowManager *wm, const char *idname) { wmKeyConfig *keyconf; @@ -86,7 +86,7 @@ wmKeyConfig *WM_keyconfig_new(wmWindowManager *wm, char *idname) return keyconf; } -wmKeyConfig *WM_keyconfig_new_user(wmWindowManager *wm, char *idname) +wmKeyConfig *WM_keyconfig_new_user(wmWindowManager *wm, const char *idname) { wmKeyConfig *keyconf = WM_keyconfig_new(wm, idname); @@ -222,7 +222,7 @@ wmKeyMapItem *WM_keymap_verify_item(wmKeyMap *keymap, char *idname, int type, in } /* always add item */ -wmKeyMapItem *WM_keymap_add_item(wmKeyMap *keymap, char *idname, int type, int val, int modifier, int keymodifier) +wmKeyMapItem *WM_keymap_add_item(wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier) { wmKeyMapItem *kmi= MEM_callocN(sizeof(wmKeyMapItem), "keymap entry"); @@ -265,7 +265,7 @@ void WM_keymap_remove_item(wmKeyMap *keymap, wmKeyMapItem *kmi) space/region ids are same as DNA_space_types.h */ /* gets free'd in wm.c */ -wmKeyMap *WM_keymap_list_find(ListBase *lb, char *idname, int spaceid, int regionid) +wmKeyMap *WM_keymap_list_find(ListBase *lb, const char *idname, int spaceid, int regionid) { wmKeyMap *km; @@ -277,7 +277,7 @@ wmKeyMap *WM_keymap_list_find(ListBase *lb, char *idname, int spaceid, int regio return NULL; } -wmKeyMap *WM_keymap_find(wmKeyConfig *keyconf, char *idname, int spaceid, int regionid) +wmKeyMap *WM_keymap_find(wmKeyConfig *keyconf, const char *idname, int spaceid, int regionid) { wmKeyMap *km= WM_keymap_list_find(&keyconf->keymaps, idname, spaceid, regionid); @@ -292,7 +292,7 @@ wmKeyMap *WM_keymap_find(wmKeyConfig *keyconf, char *idname, int spaceid, int re return km; } -wmKeyMap *WM_keymap_find_all(const bContext *C, char *idname, int spaceid, int regionid) +wmKeyMap *WM_keymap_find_all(const bContext *C, const char *idname, int spaceid, int regionid) { wmWindowManager *wm = CTX_wm_manager(C); wmKeyConfig *keyconf; @@ -323,7 +323,7 @@ wmKeyMap *WM_keymap_find_all(const bContext *C, char *idname, int spaceid, int r /* modal maps get linked to a running operator, and filter the keys before sending to modal() callback */ -wmKeyMap *WM_modalkeymap_add(wmKeyConfig *keyconf, char *idname, EnumPropertyItem *items) +wmKeyMap *WM_modalkeymap_add(wmKeyConfig *keyconf, const char *idname, EnumPropertyItem *items) { wmKeyMap *km= WM_keymap_find(keyconf, idname, 0, 0); km->flag |= KEYMAP_MODAL; @@ -332,7 +332,7 @@ wmKeyMap *WM_modalkeymap_add(wmKeyConfig *keyconf, char *idname, EnumPropertyIte return km; } -wmKeyMap *WM_modalkeymap_get(wmKeyConfig *keyconf, char *idname) +wmKeyMap *WM_modalkeymap_get(wmKeyConfig *keyconf, const char *idname) { wmKeyMap *km; @@ -362,7 +362,7 @@ wmKeyMapItem *WM_modalkeymap_add_item(wmKeyMap *km, int type, int val, int modif return kmi; } -void WM_modalkeymap_assign(wmKeyMap *km, char *opname) +void WM_modalkeymap_assign(wmKeyMap *km, const char *opname) { wmOperatorType *ot= WM_operatortype_find(opname, 0); @@ -757,7 +757,7 @@ wmKeyMapItem *WM_keymap_item_find_id(wmKeyMap *keymap, int id) /* Guess an appropriate keymap from the operator name */ /* Needs to be kept up to date with Keymap and Operator naming */ -wmKeyMap *WM_keymap_guess_opname(const bContext *C, char *opname) +wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) { wmKeyMap *km=NULL; SpaceLink *sl = CTX_wm_space_data(C); |