From a77488bab4732c30044b04e97d13707e03825bdf Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 10 Sep 2012 19:14:49 +0100 Subject: unsigned long -> uint32_t, signed long and long -> int32_t, plus collateral fixes. Test suite does not pass --- include/dom/events/mouse_event.h | 32 ++++++++++++++-------------- include/dom/events/mouse_multi_wheel_event.h | 26 +++++++++++----------- include/dom/events/mouse_wheel_event.h | 14 ++++++------ include/dom/events/ui_event.h | 12 +++++------ 4 files changed, 42 insertions(+), 42 deletions(-) (limited to 'include/dom/events') diff --git a/include/dom/events/mouse_event.h b/include/dom/events/mouse_event.h index 8212c72..9cf84bb 100644 --- a/include/dom/events/mouse_event.h +++ b/include/dom/events/mouse_event.h @@ -18,24 +18,24 @@ struct dom_abstract_view; typedef struct dom_mouse_event dom_mouse_event; dom_exception _dom_mouse_event_get_screen_x(dom_mouse_event *evt, - long *x); + int32_t *x); #define dom_mouse_event_get_screen_x(e, x) _dom_mouse_event_get_screen_x(\ - (dom_mouse_event *) (e), (long *) (x)) + (dom_mouse_event *) (e), (int32_t *) (x)) dom_exception _dom_mouse_event_get_screen_y(dom_mouse_event *evt, - long *y); + int32_t *y); #define dom_mouse_event_get_screen_y(e, y) _dom_mouse_event_get_screen_y(\ - (dom_mouse_event *) (e), (long *) (y)) + (dom_mouse_event *) (e), (int32_t *) (y)) dom_exception _dom_mouse_event_get_client_x(dom_mouse_event *evt, - long *x); + int32_t *x); #define dom_mouse_event_get_client_x(e, x) _dom_mouse_event_get_client_x(\ - (dom_mouse_event *) (e), (long *) (x)) + (dom_mouse_event *) (e), (int32_t *) (x)) dom_exception _dom_mouse_event_get_client_y(dom_mouse_event *evt, - long *y); + int32_t *y); #define dom_mouse_event_get_client_y(e, y) _dom_mouse_event_get_client_y(\ - (dom_mouse_event *) (e), (long *) (y)) + (dom_mouse_event *) (e), (int32_t *) (y)) dom_exception _dom_mouse_event_get_ctrl_key(dom_mouse_event *evt, bool *key); @@ -76,32 +76,32 @@ dom_exception _dom_mouse_event_get_modifier_state(dom_mouse_event *evt, dom_exception _dom_mouse_event_init(dom_mouse_event *evt, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, bool ctrl, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, bool ctrl, bool alt, bool shift, bool meta, unsigned short button, dom_event_target *et); #define dom_mouse_event_init(e, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt, \ shift, meta, button, et) \ _dom_mouse_event_init((dom_mouse_event *) (e), \ (dom_string *) (t), (bool) (b), (bool) (c),\ - (struct dom_abstract_view *) (v), (long) (d), (long) (sx), \ - (long) (sy), (long) (cx), (long) (cy), (bool) (ctrl),\ + (struct dom_abstract_view *) (v), (int32_t) (d), (int32_t) (sx), \ + (int32_t) (sy), (int32_t) (cx), (int32_t) (cy), (bool) (ctrl),\ (bool) (alt), (bool) (shift), (bool) (meta), \ (unsigned short) (button), (dom_event_target *) (et)) dom_exception _dom_mouse_event_init_ns(dom_mouse_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail, long screen_x, long screen_y, long client_x, - long client_y, bool ctrl, bool alt, bool shift, bool meta, + int32_t detail, int32_t screen_x, int32_t screen_y, int32_t client_x, + int32_t client_y, bool ctrl, bool alt, bool shift, bool meta, unsigned short button, dom_event_target *et); #define dom_mouse_event_init_ns(e, n, t, b, c, v, d, sx, sy, cx, cy, ctrl, alt,\ shift, meta, button, et) \ _dom_mouse_event_init_ns((dom_mouse_event *) (e), \ (dom_string *) (n), (dom_string *) (t),\ (bool) (b), (bool) (c), (struct dom_abstract_view *) (v),\ - (long) (d), (long) (sx), (long) (sy), (long) (cx),\ - (long) (cy), (bool) (ctrl), (bool) (alt), (bool) (shift),\ + (int32_t) (d), (int32_t) (sx), (int32_t) (sy), (int32_t) (cx),\ + (int32_t) (cy), (bool) (ctrl), (bool) (alt), (bool) (shift),\ (bool) (meta), (unsigned short) (button),\ (dom_event_target *) (et)) diff --git a/include/dom/events/mouse_multi_wheel_event.h b/include/dom/events/mouse_multi_wheel_event.h index 8d2a4eb..d8115ad 100644 --- a/include/dom/events/mouse_multi_wheel_event.h +++ b/include/dom/events/mouse_multi_wheel_event.h @@ -18,39 +18,39 @@ struct dom_abstract_view; typedef struct dom_mouse_multi_wheel_event dom_mouse_multi_wheel_event; dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_x( - dom_mouse_multi_wheel_event *evt, long *x); + dom_mouse_multi_wheel_event *evt, int32_t *x); #define dom_mouse_multi_wheel_event_get_wheel_delta_x(e, x) \ _dom_mouse_multi_wheel_event_get_wheel_delta_x( \ - (dom_mouse_multi_wheel_event *) (e), (long *) (x)) + (dom_mouse_multi_wheel_event *) (e), (int32_t *) (x)) dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_y( - dom_mouse_multi_wheel_event *evt, long *y); + dom_mouse_multi_wheel_event *evt, int32_t *y); #define dom_mouse_multi_wheel_event_get_wheel_delta_y(e, y) \ _dom_mouse_multi_wheel_event_get_wheel_delta_y( \ - (dom_mouse_multi_wheel_event *) (e), (long *) (y)) + (dom_mouse_multi_wheel_event *) (e), (int32_t *) (y)) dom_exception _dom_mouse_multi_wheel_event_get_wheel_delta_z( - dom_mouse_multi_wheel_event *evt, long *z); + dom_mouse_multi_wheel_event *evt, int32_t *z); #define dom_mouse_multi_wheel_event_get_wheel_delta_z(e, z) \ _dom_mouse_multi_wheel_event_get_wheel_delta_z( \ - (dom_mouse_multi_wheel_event *) (e), (long *) (z)) + (dom_mouse_multi_wheel_event *) (e), (int32_t *) (z)) dom_exception _dom_mouse_multi_wheel_event_init_ns( dom_mouse_multi_wheel_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, unsigned short button, dom_event_target *et, - dom_string *modifier_list, long wheel_delta_x, - long wheel_delta_y, long wheel_delta_z); + dom_string *modifier_list, int32_t wheel_delta_x, + int32_t wheel_delta_y, int32_t wheel_delta_z); #define dom_mouse_multi_wheel_event_init_ns(e, n, t, b, c, v, \ d, sx, sy, cx, cy, button, et, ml, x, y, z) \ _dom_mouse_multi_wheel_event_init_ns( \ (dom_mouse_multi_wheel_event *) (e), (dom_string *) (n),\ (dom_string *) (t), (bool) (b), (bool) (c), \ - (struct dom_abstract_view *) (v), (long) (d), (long) (sx), \ - (long) (sy), (long) (cx), (long) (cy),\ + (struct dom_abstract_view *) (v), (int32_t) (d), (int32_t) (sx), \ + (int32_t) (sy), (int32_t) (cx), (int32_t) (cy),\ (unsigned short) (button), (dom_event_target *) (et),\ - (dom_string *) (ml), (long) (x), (long) (y), (long) (z)) + (dom_string *) (ml), (int32_t) (x), (int32_t) (y), (int32_t) (z)) #endif diff --git a/include/dom/events/mouse_wheel_event.h b/include/dom/events/mouse_wheel_event.h index 34f5e75..f753b68 100644 --- a/include/dom/events/mouse_wheel_event.h +++ b/include/dom/events/mouse_wheel_event.h @@ -17,26 +17,26 @@ struct dom_abstract_view; typedef struct dom_mouse_wheel_event dom_mouse_wheel_event; dom_exception _dom_mouse_wheel_event_get_wheel_delta( - dom_mouse_wheel_event *evt, long *d); + dom_mouse_wheel_event *evt, int32_t *d); #define dom_mouse_wheel_event_get_wheel_delta(e, d) \ _dom_mouse_wheel_event_get_wheel_delta( \ - (dom_mouse_wheel_event *) (e), (long *) (d)) + (dom_mouse_wheel_event *) (e), (int32_t *) (d)) dom_exception _dom_mouse_wheel_event_init_ns( dom_mouse_wheel_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, - struct dom_abstract_view *view, long detail, long screen_x, - long screen_y, long client_x, long client_y, + struct dom_abstract_view *view, int32_t detail, int32_t screen_x, + int32_t screen_y, int32_t client_x, int32_t client_y, unsigned short button, dom_event_target *et, - dom_string *modifier_list, long wheel_delta); + dom_string *modifier_list, int32_t wheel_delta); #define dom_mouse_wheel_event_init_ns(e, n, t, b, c, v, \ d, sx, sy, cx, cy, button, et, ml, dt) \ _dom_mouse_wheel_event_init_ns((dom_mouse_wheel_event *) (e), \ (dom_string *) (n), (dom_string *) (t), \ (bool) (b), (bool) (c), (struct dom_abstract_view *) (v),\ - (long) (d), (long) (sx), (long) (sy), (long) (cx), (long) (cy),\ + (int32_t) (d), (int32_t) (sx), (int32_t) (sy), (int32_t) (cx), (int32_t) (cy),\ (unsigned short) (button), (dom_event_target *) (et),\ - (dom_string *) (ml), (long) (dt)) + (dom_string *) (ml), (int32_t) (dt)) #endif diff --git a/include/dom/events/ui_event.h b/include/dom/events/ui_event.h index da321e5..0979a3b 100644 --- a/include/dom/events/ui_event.h +++ b/include/dom/events/ui_event.h @@ -22,24 +22,24 @@ dom_exception _dom_ui_event_get_view(dom_ui_event *evt, (dom_ui_event *) (e), (struct dom_abstract_view **) (v)) dom_exception _dom_ui_event_get_detail(dom_ui_event *evt, - long *detail); + int32_t *detail); #define dom_ui_event_get_detail(e, d) _dom_ui_event_get_detail(\ - (dom_ui_event *) (e), (long *) (d)) + (dom_ui_event *) (e), (int32_t *) (d)) dom_exception _dom_ui_event_init(dom_ui_event *evt, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail); + int32_t detail); #define dom_ui_event_init(e, t, b, c, v, d) _dom_ui_event_init( \ (dom_ui_event *) (e), (dom_string *) (t), (bool) (b), \ - (bool) (c), (struct dom_abstract_view *) (v), (long) (d)) + (bool) (c), (struct dom_abstract_view *) (v), (int32_t) (d)) dom_exception _dom_ui_event_init_ns(dom_ui_event *evt, dom_string *namespace, dom_string *type, bool bubble, bool cancelable, struct dom_abstract_view *view, - long detail); + int32_t detail); #define dom_ui_event_init_ns(e, n, t, b, c, v, d) _dom_ui_event_init_ns( \ (dom_ui_event *) (e), (dom_string *) (n), \ (dom_string *) (t), (bool) (b), (bool) (c), \ - (struct dom_abstract_view *) (v), (long) (d)) + (struct dom_abstract_view *) (v), (int32_t) (d)) #endif -- cgit v1.2.3