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

Widget: Removed !obj checks from ELM_WIDGET_DATA_GET_OR_RETURN and ELM_WIDGET_CHECK 

eo_data_scope_get and eo_isa returns NULL with complaint when NULL is passed.
So, Removed unnecessary !obj check routine.

In addition, adopt EINA_UNLIKELY for these macros and fix indentation.
This commit is contained in:
Ryuan Choi 2014-01-13 21:11:04 +09:00
parent 81d880cfae
commit f832375b4a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/elementary/src/lib/elm_widget.h
View File

@ -801,19 +801,17 @@ EAPI void elm_widget_tree_dump(const Evas_Object *top);
EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *output);
#define ELM_WIDGET_DATA_GET_OR_RETURN(o, ptr, ...) \
Elm_Widget_Smart_Data *ptr; \
ptr = (o ? \
eo_data_scope_get(o, ELM_OBJ_WIDGET_CLASS) :\
NULL); \
if (!ptr) \
Elm_Widget_Smart_Data *ptr; \
ptr = eo_data_scope_get(o, ELM_OBJ_WIDGET_CLASS); \
if (EINA_UNLIKELY(!ptr)) \
{ \
CRI("no widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
CRI("no widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
return __VA_ARGS__; \
}
#define ELM_WIDGET_CHECK(obj) \
if (!obj || !eo_isa((obj), ELM_OBJ_WIDGET_CLASS)) \
#define ELM_WIDGET_CHECK(obj) \
if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_WIDGET_CLASS))) \
return
/**