bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Efl.Ui.Check: rename data get macros

This commit is contained in:
Amitesh Singh 2017-06-16 16:11:42 +09:00
parent 0cc52f423b
commit 5df92c2a52
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/elementary/efl_ui_check.c
View File

@ -47,7 +47,7 @@ static const Elm_Action key_actions[] = {
static void static void
_activate(Evas_Object *obj) _activate(Evas_Object *obj)
{ {
ELM_CHECK_DATA_GET(obj, sd); EFL_UI_CHECK_DATA_GET(obj, sd);
efl_ui_nstate_activate(obj); efl_ui_nstate_activate(obj);
if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj); if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj);
@ -245,7 +245,7 @@ _on_check_off(void *data,
{ {
Evas_Object *obj = data; Evas_Object *obj = data;
ELM_CHECK_DATA_GET(obj, sd); EFL_UI_CHECK_DATA_GET(obj, sd);
efl_ui_nstate_value_set(obj, 0); efl_ui_nstate_value_set(obj, 0);
if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj); if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj);
@ -267,7 +267,7 @@ _on_check_on(void *data,
{ {
Evas_Object *obj = data; Evas_Object *obj = data;
ELM_CHECK_DATA_GET(obj, sd); EFL_UI_CHECK_DATA_GET(obj, sd);
efl_ui_nstate_value_set(obj, 1); efl_ui_nstate_value_set(obj, 1);
if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj); if (sd->statep) *sd->statep = efl_ui_nstate_value_get(obj);
@ -398,7 +398,7 @@ elm_check_state_get(const Evas_Object *obj)
EAPI void EAPI void
elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep) elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep)
{ {
ELM_CHECK_DATA_GET_OR_RETURN(obj, sd); EFL_UI_CHECK_DATA_GET_OR_RETURN(obj, sd);
if (!statep) if (!statep)
{ {
sd->statep = NULL; sd->statep = NULL;

12
src/lib/elementary/efl_ui_check_private.h
View File

@ -33,11 +33,11 @@ struct _Efl_Ui_Check_Data
* @} * @}
*/ */
#define ELM_CHECK_DATA_GET(o, sd) \ #define EFL_UI_CHECK_DATA_GET(o, sd) \
Efl_Ui_Check_Data * sd = efl_data_scope_get(o, EFL_UI_CHECK_CLASS) Efl_Ui_Check_Data * sd = efl_data_scope_get(o, EFL_UI_CHECK_CLASS)
#define ELM_CHECK_DATA_GET_OR_RETURN(o, ptr) \ #define EFL_UI_CHECK_DATA_GET_OR_RETURN(o, ptr) \
ELM_CHECK_DATA_GET(o, ptr); \ EFL_UI_CHECK_DATA_GET(o, ptr); \
if (EINA_UNLIKELY(!ptr)) \ if (EINA_UNLIKELY(!ptr)) \
{ \ { \
CRI("No widget data for object %p (%s)", \ CRI("No widget data for object %p (%s)", \
@ -45,8 +45,8 @@ struct _Efl_Ui_Check_Data
return; \ return; \
} }
#define ELM_CHECK_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ #define EFL_UI_CHECK_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
ELM_CHECK_DATA_GET(o, ptr); \ EFL_UI_CHECK_DATA_GET(o, ptr); \
if (EINA_UNLIKELY(!ptr)) \ if (EINA_UNLIKELY(!ptr)) \
{ \ { \
CRI("No widget data for object %p (%s)", \ CRI("No widget data for object %p (%s)", \
@ -54,7 +54,7 @@ struct _Efl_Ui_Check_Data
return val; \ return val; \
} }
#define ELM_CHECK_CHECK(obj) \ #define EFL_UI_CHECK_CHECK(obj) \
if (EINA_UNLIKELY(!efl_isa((obj), ELM_CHECK_CLASS))) \ if (EINA_UNLIKELY(!efl_isa((obj), ELM_CHECK_CLASS))) \
return return