diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-02-20 11:54:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-20 11:54:51 +0300 |
commit | 185e301229691e1105a0147a8c5a697bb2461ed0 (patch) | |
tree | 2b147df463669d1a8a85faa12ba2581160eb2d2f /source/blender/makesrna/intern/rna_wm.c | |
parent | d0978103aefab710c9d433a5a0a32b40b5e287eb (diff) |
RNA: correct bool callbacks
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 347b669812e..6119bc968e6 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -526,21 +526,21 @@ static PointerRNA rna_OperatorMacro_properties_get(PointerRNA *ptr) static void rna_Event_ascii_get(PointerRNA *ptr, char *value) { - wmEvent *event = (wmEvent *)ptr->data; + const wmEvent *event = ptr->data; value[0] = event->ascii; value[1] = '\0'; } static int rna_Event_ascii_length(PointerRNA *ptr) { - wmEvent *event = (wmEvent *)ptr->data; + const wmEvent *event = ptr->data; return (event->ascii) ? 1 : 0; } static void rna_Event_unicode_get(PointerRNA *ptr, char *value) { /* utf8 buf isn't \0 terminated */ - wmEvent *event = (wmEvent *)ptr->data; + const wmEvent *event = ptr->data; size_t len = 0; if (event->utf8_buf[0]) { @@ -556,7 +556,7 @@ static void rna_Event_unicode_get(PointerRNA *ptr, char *value) static int rna_Event_unicode_length(PointerRNA *ptr) { - wmEvent *event = (wmEvent *)ptr->data; + const wmEvent *event = ptr->data; if (event->utf8_buf[0]) { /* invalid value is checked on assignment so we don't need to account for this */ return BLI_str_utf8_size(event->utf8_buf); @@ -568,13 +568,13 @@ static int rna_Event_unicode_length(PointerRNA *ptr) static float rna_Event_pressure_get(PointerRNA *ptr) { - wmEvent *event = ptr->data; + const wmEvent *event = ptr->data; return WM_event_tablet_data(event, NULL, NULL); } static int rna_Event_is_tablet_get(PointerRNA *ptr) { - wmEvent *event = ptr->data; + const wmEvent *event = ptr->data; return WM_event_is_tablet(event); } @@ -762,7 +762,7 @@ static EnumPropertyItem *rna_KeyMapItem_propvalue_itemf(bContext *C, PointerRNA return keymap_propvalue_items; /* ERROR */ } -static int rna_KeyMapItem_any_getf(PointerRNA *ptr) +static int rna_KeyMapItem_any_get(PointerRNA *ptr) { wmKeyMapItem *kmi = (wmKeyMapItem *)ptr->data; @@ -778,7 +778,7 @@ static int rna_KeyMapItem_any_getf(PointerRNA *ptr) } } -static void rna_KeyMapItem_any_setf(PointerRNA *ptr, int value) +static void rna_KeyMapItem_any_set(PointerRNA *ptr, int value) { wmKeyMapItem *kmi = (wmKeyMapItem *)ptr->data; @@ -2028,7 +2028,7 @@ static void rna_def_keyconfig(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_KeyMapItem_update"); prop = RNA_def_property(srna, "any", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_funcs(prop, "rna_KeyMapItem_any_getf", "rna_KeyMapItem_any_setf"); + RNA_def_property_boolean_funcs(prop, "rna_KeyMapItem_any_get", "rna_KeyMapItem_any_set"); RNA_def_property_ui_text(prop, "Any", "Any modifier keys pressed"); RNA_def_property_update(prop, 0, "rna_KeyMapItem_update"); |