diff options
Diffstat (limited to 'src/lib/evas/include')
| -rw-r--r-- | src/lib/evas/include/evas_inline.x | 8 | ||||
| -rw-r--r-- | src/lib/evas/include/evas_private.h | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/evas/include/evas_inline.x b/src/lib/evas/include/evas_inline.x index 5778d85096..9794d99b4e 100644 --- a/src/lib/evas/include/evas_inline.x +++ b/src/lib/evas/include/evas_inline.x @@ -95,7 +95,7 @@ evas_event_freezes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte if (obj->parent_cache.freeze_events_valid) return obj->parent_cache.freeze_events; if (!obj->smart.parent) return 0; - Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *smart_parent_pd = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); obj->parent_cache.freeze_events = evas_event_freezes_through(obj->smart.parent, smart_parent_pd); obj->parent_cache.freeze_events_valid = EINA_TRUE; @@ -109,7 +109,7 @@ evas_event_passes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected if (obj->parent_cache.pass_events_valid) return obj->parent_cache.pass_events; if (!obj->smart.parent) return 0; - Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *smart_parent_pd = efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); obj->parent_cache.pass_events = evas_event_passes_through(obj->smart.parent, smart_parent_pd); obj->parent_cache.pass_events_valid = EINA_TRUE; @@ -127,7 +127,7 @@ evas_object_is_source_invisible(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro if (!obj->smart.parent) return 0; if (obj->mask->is_mask) return 0; Evas_Object_Protected_Data *smart_parent_pd = - eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); + efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); obj->parent_cache.src_invisible = evas_object_is_source_invisible(obj->smart.parent, smart_parent_pd); obj->parent_cache.src_invisible_valid = EINA_TRUE; @@ -330,7 +330,7 @@ evas_object_clip_recalc(Evas_Object_Protected_Data *obj) if (EINA_LIKELY(obj->smart.parent != NULL)) { Evas_Object_Protected_Data *parent = - eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); + efl_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); if (parent->clip.mask) { if (parent->clip.mask != obj->clip.mask) diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h index 0d41ab6ff7..47113527e3 100644 --- a/src/lib/evas/include/evas_private.h +++ b/src/lib/evas/include/evas_private.h @@ -587,8 +587,8 @@ MAGIC_CHECK_FAILED(o, t, m) // helper function for legacy EAPI implementations #define EVAS_OBJ_GET_OR_RETURN(o, ...) ({ \ - Evas_Object_Protected_Data *_obj = eo_isa(o, EFL_CANVAS_OBJECT_CLASS) ? \ - eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS) : NULL; \ + Evas_Object_Protected_Data *_obj = efl_isa(o, EFL_CANVAS_OBJECT_CLASS) ? \ + efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS) : NULL; \ if (!_obj) { MAGIC_CHECK_FAILED(o,0,0) return __VA_ARGS__; } \ _obj; }) @@ -601,19 +601,19 @@ MAGIC_CHECK_FAILED(o, t, m) /* DEBUG mode: fail, but normally just ERR(). This also returns if NULL. */ #ifdef DEBUG #define EVAS_OBJECT_LEGACY_API(_eo, ...) \ - do { Evas_Object_Protected_Data *_o = eo_data_scope_get(_eo, EFL_CANVAS_OBJECT_CLASS); \ + do { Evas_Object_Protected_Data *_o = efl_data_scope_get(_eo, EFL_CANVAS_OBJECT_CLASS); \ if (EINA_UNLIKELY(!_o)) return __VA_ARGS__; \ if (EINA_UNLIKELY(!_o->legacy)) { \ - char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO object '%s' is not permitted!", eo_class_name_get(_o->object)); \ + char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO object '%s' is not permitted!", efl_class_name_get(_o->object)); \ EINA_SAFETY_ERROR(buf); \ return __VA_ARGS__; \ } } while (0) #else #define EVAS_OBJECT_LEGACY_API(_eo, ...) \ - do { Evas_Object_Protected_Data *_o = eo_data_scope_get(_eo, EFL_CANVAS_OBJECT_CLASS); \ + do { Evas_Object_Protected_Data *_o = efl_data_scope_get(_eo, EFL_CANVAS_OBJECT_CLASS); \ if (EINA_UNLIKELY(!_o)) return __VA_ARGS__; \ if (EINA_UNLIKELY(!_o->legacy)) { \ - char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO object '%s' is not permitted!", eo_class_name_get(_o->object)); \ + char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO object '%s' is not permitted!", efl_class_name_get(_o->object)); \ EINA_SAFETY_ERROR(buf); \ } } while (0) #endif |