Add UNUSED.

Fix formatting in e_actions.



SVN revision: 51328
This commit is contained in:
Christopher Michael 2010-08-18 19:46:26 +00:00
parent 02f7bc50a6
commit 7a8bbab059
4 changed files with 39 additions and 30 deletions

View File

@ -10,71 +10,80 @@
act = e_action_add(#name); \ act = e_action_add(#name); \
if (act) act->func.go = _e_actions_act_##name##_go; \ if (act) act->func.go = _e_actions_act_##name##_go; \
} }
#define ACT_FN_GO(act, use) \ #define ACT_FN_GO(act, use) \
static void _e_actions_act_##act##_go(E_Object *obj, use const char *params) static void _e_actions_act_##act##_go(E_Object *obj, const char *params use)
#define ACT_GO_MOUSE(name) \ #define ACT_GO_MOUSE(name) \
{ \ { \
act = e_action_add(#name); \ act = e_action_add(#name); \
if (act) act->func.go_mouse = _e_actions_act_##name##_go_mouse; \ if (act) act->func.go_mouse = _e_actions_act_##name##_go_mouse; \
} }
#define ACT_FN_GO_MOUSE(act, use) \ #define ACT_FN_GO_MOUSE(act, use) \
static void _e_actions_act_##act##_go_mouse(E_Object *obj, use const char *params, Ecore_Event_Mouse_Button *ev) static void _e_actions_act_##act##_go_mouse(E_Object *obj, const char *params use, Ecore_Event_Mouse_Button *ev)
#define ACT_GO_WHEEL(name) \ #define ACT_GO_WHEEL(name) \
{ \ { \
act = e_action_add(#name); \ act = e_action_add(#name); \
if (act) act->func.go_wheel = _e_actions_act_##name##_go_wheel; \ if (act) act->func.go_wheel = _e_actions_act_##name##_go_wheel; \
} }
#define ACT_FN_GO_WHEEL(act, use) \ #define ACT_FN_GO_WHEEL(act, use) \
static void _e_actions_act_##act##_go_wheel(E_Object *obj, use const char *params, Ecore_Event_Mouse_Wheel *ev) static void _e_actions_act_##act##_go_wheel(E_Object *obj, const char *params use, Ecore_Event_Mouse_Wheel *ev)
#define ACT_GO_EDGE(name) \ #define ACT_GO_EDGE(name) \
{ \ { \
act = e_action_add(#name); \ act = e_action_add(#name); \
if (act) act->func.go_edge = _e_actions_act_##name##_go_edge; \ if (act) act->func.go_edge = _e_actions_act_##name##_go_edge; \
} }
#define ACT_FN_GO_EDGE(act, use) \ #define ACT_FN_GO_EDGE(act, use) \
static void _e_actions_act_##act##_go_edge(E_Object *obj, use const char *params, E_Event_Zone_Edge *ev) static void _e_actions_act_##act##_go_edge(E_Object *obj, const char *params use, E_Event_Zone_Edge *ev)
#define ACT_GO_SIGNAL(name) \ #define ACT_GO_SIGNAL(name) \
{ \ { \
act = e_action_add(#name); \ act = e_action_add(#name); \
if (act) act->func.go_signal = _e_actions_act_##name##_go_signal; \ if (act) act->func.go_signal = _e_actions_act_##name##_go_signal; \
} }
#define ACT_FN_GO_SIGNAL(act, use) \ #define ACT_FN_GO_SIGNAL(act, use) \
static void _e_actions_act_##act##_go_signal(E_Object *obj, use const char *params, const char *sig, const char *src) static void _e_actions_act_##act##_go_signal(E_Object *obj, const char *params use, const char *sig, const char *src)
#define ACT_GO_KEY(name) \ #define ACT_GO_KEY(name) \
{ \ { \
act = e_action_add(#name); \ act = e_action_add(#name); \
if (act) act->func.go_key = _e_actions_act_##name##_go_key; \ if (act) act->func.go_key = _e_actions_act_##name##_go_key; \
} }
#define ACT_FN_GO_KEY(act, use) \ #define ACT_FN_GO_KEY(act, use) \
static void _e_actions_act_##act##_go_key(E_Object *obj, use const char *params, Ecore_Event_Key *ev) static void _e_actions_act_##act##_go_key(E_Object *obj, const char *params use, Ecore_Event_Key *ev)
#define ACT_END(name) \ #define ACT_END(name) \
{ \ { \
act = e_action_add(#name); \ act = e_action_add(#name); \
if (act) act->func.end = _e_actions_act_##name##_end; \ if (act) act->func.end = _e_actions_act_##name##_end; \
} }
#define ACT_FN_END(act, use) \ #define ACT_FN_END(act, use) \
static void _e_actions_act_##act##_end(E_Object *obj, use const char *params) static void _e_actions_act_##act##_end(E_Object *obj, const char *params use)
#define ACT_END_MOUSE(name) \ #define ACT_END_MOUSE(name) \
{ \ { \
act = e_action_add(#name); \ act = e_action_add(#name); \
if (act) act->func.end_mouse = _e_actions_act_##name##_end_mouse; \ if (act) act->func.end_mouse = _e_actions_act_##name##_end_mouse; \
} }
#define ACT_FN_END_MOUSE(act, use) \ #define ACT_FN_END_MOUSE(act, use) \
static void _e_actions_act_##act##_end_mouse(E_Object *obj, use const char *params, Ecore_Event_Mouse_Button *ev) static void _e_actions_act_##act##_end_mouse(E_Object *obj, const char *params use, Ecore_Event_Mouse_Button *ev)
#define ACT_END_KEY(name) \ #define ACT_END_KEY(name) \
{ \ { \
act = e_action_add(#name); \ act = e_action_add(#name); \
if (act) act->func.end_key = _e_actions_act_##name##_end_key; \ if (act) act->func.end_key = _e_actions_act_##name##_end_key; \
} }
#define ACT_FN_END_KEY(act, use) \ #define ACT_FN_END_KEY(act, use) \
static void _e_actions_act_##act##_end_key(E_Object *obj, use const char *params, Ecore_Event_Key *ev) static void _e_actions_act_##act##_end_key(E_Object *obj, const char *params use, Ecore_Event_Key *ev)
#define ACT_GO_ACPI(name) \ #define ACT_GO_ACPI(name) \
{ \ { \
act = e_action_add(#name); \ act = e_action_add(#name); \
if (act) act->func.go_acpi = _e_actions_act_##name##_go_acpi; \ if (act) act->func.go_acpi = _e_actions_act_##name##_go_acpi; \
} }
#define ACT_FN_GO_ACPI(act, use) \ #define ACT_FN_GO_ACPI(act, use) \
static void _e_actions_act_##act##_go_acpi(E_Object *obj, use const char *params, E_Event_Acpi *ev) static void _e_actions_act_##act##_go_acpi(E_Object *obj, const char *params use, E_Event_Acpi *ev)
/* local subsystem functions */ /* local subsystem functions */
static void _e_action_free(E_Action *act); static void _e_action_free(E_Action *act);

View File

@ -180,7 +180,7 @@ _e_wid_disable_hook(Evas_Object *obj)
} }
static void static void
_e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char *source) _e_wid_signal_cb1(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{ {
Evas_Object *wid; Evas_Object *wid;
@ -192,7 +192,7 @@ _e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char
} }
static void static void
_e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info) _e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{ {
e_widget_focus_steal(data); e_widget_focus_steal(data);
} }

View File

@ -216,13 +216,13 @@ _e_wid_disable_hook(Evas_Object *obj)
} }
static void static void
_e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info) _e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{ {
e_widget_focus_steal(data); e_widget_focus_steal(data);
} }
static void static void
_e_wid_in(void *data, Evas *e, Evas_Object *obj, void *event_info) _e_wid_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{ {
E_Pointer *p; E_Pointer *p;
@ -231,7 +231,7 @@ _e_wid_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
} }
static void static void
_e_wid_out(void *data, Evas *e, Evas_Object *obj, void *event_info) _e_wid_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{ {
E_Pointer *p; E_Pointer *p;
@ -240,7 +240,7 @@ _e_wid_out(void *data, Evas *e, Evas_Object *obj, void *event_info)
} }
static void static void
_e_wid_changed_cb(void *data, Evas_Object *obj, void *event_info) _e_wid_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{ {
Evas_Object *entry; Evas_Object *entry;
E_Widget_Data *wd; E_Widget_Data *wd;
@ -248,7 +248,7 @@ _e_wid_changed_cb(void *data, Evas_Object *obj, void *event_info)
if (!(entry = data) || (!(wd = e_widget_data_get(entry)))) if (!(entry = data) || (!(wd = e_widget_data_get(entry))))
return; return;
if (wd->text_location) if (wd->text_location)
{ {
text = e_entry_text_get(wd->o_entry); text = e_entry_text_get(wd->o_entry);
@ -261,7 +261,7 @@ _e_wid_changed_cb(void *data, Evas_Object *obj, void *event_info)
} }
static void static void
_e_wid_keydown(void *data, Evas *e, Evas_Object *obj, void *event_info) _e_wid_keydown(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{ {
evas_object_smart_callback_call(data, "key_down", event_info); evas_object_smart_callback_call(data, "key_down", event_info);
} }

View File

@ -263,14 +263,14 @@ _e_wid_disable_hook(Evas_Object *obj)
} }
static void static void
_e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char *source) _e_wid_signal_cb1(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{ {
_e_wid_do(data); _e_wid_do(data);
e_widget_change(data); e_widget_change(data);
} }
static void static void
_e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info) _e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{ {
e_widget_focus_steal(data); e_widget_focus_steal(data);
} }