diff options
author | Tom Hacohen <tom@stosb.com> | 2016-08-15 14:44:41 +0100 |
---|---|---|
committer | Tom Hacohen <tom@stosb.com> | 2016-08-15 15:07:42 +0100 |
commit | e65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch) | |
tree | 7ecaf136e45470635889191aded2b47057720a98 /src/lib/emotion/emotion_smart.c | |
parent | 35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff) |
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for
Eo_Event that will follow soon.
Obviously breaks both API and ABI.
Diffstat (limited to 'src/lib/emotion/emotion_smart.c')
-rw-r--r-- | src/lib/emotion/emotion_smart.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c index c01e9d1..f9302e5 100644 --- a/src/lib/emotion/emotion_smart.c +++ b/src/lib/emotion/emotion_smart.c | |||
@@ -24,22 +24,22 @@ | |||
24 | #define E_SMART_OBJ_GET(smart, o, type) \ | 24 | #define E_SMART_OBJ_GET(smart, o, type) \ |
25 | { \ | 25 | { \ |
26 | if (!o) return; \ | 26 | if (!o) return; \ |
27 | if (!eo_isa(o, MY_CLASS)) { \ | 27 | if (!efl_isa(o, MY_CLASS)) { \ |
28 | ERR("Tried calling on a non-emotion object."); \ | 28 | ERR("Tried calling on a non-emotion object."); \ |
29 | return; \ | 29 | return; \ |
30 | } \ | 30 | } \ |
31 | smart = eo_data_scope_get(o, MY_CLASS); \ | 31 | smart = efl_data_scope_get(o, MY_CLASS); \ |
32 | if (!smart) return; \ | 32 | if (!smart) return; \ |
33 | } | 33 | } |
34 | 34 | ||
35 | #define E_SMART_OBJ_GET_RETURN(smart, o, type, ret) \ | 35 | #define E_SMART_OBJ_GET_RETURN(smart, o, type, ret) \ |
36 | { \ | 36 | { \ |
37 | if (!o) return ret; \ | 37 | if (!o) return ret; \ |
38 | if (!eo_isa(o, MY_CLASS)) { \ | 38 | if (!efl_isa(o, MY_CLASS)) { \ |
39 | ERR("Tried calling on a non-emotion object."); \ | 39 | ERR("Tried calling on a non-emotion object."); \ |
40 | return ret; \ | 40 | return ret; \ |
41 | } \ | 41 | } \ |
42 | smart = eo_data_scope_get(o, MY_CLASS); \ | 42 | smart = efl_data_scope_get(o, MY_CLASS); \ |
43 | if (!smart) return ret; \ | 43 | if (!smart) return ret; \ |
44 | } | 44 | } |
45 | 45 | ||
@@ -238,14 +238,14 @@ EAPI Evas_Object * | |||
238 | emotion_object_add(Evas *evas) | 238 | emotion_object_add(Evas *evas) |
239 | { | 239 | { |
240 | Evas_Object *e; | 240 | Evas_Object *e; |
241 | e = eo_add(MY_CLASS, evas); | 241 | e = efl_add(MY_CLASS, evas); |
242 | return e; | 242 | return e; |
243 | } | 243 | } |
244 | 244 | ||
245 | EOLIAN static Eo * | 245 | EOLIAN static Eo * |
246 | _emotion_object_efl_object_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED) | 246 | _emotion_object_efl_object_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED) |
247 | { | 247 | { |
248 | obj = efl_constructor(eo_super(obj, MY_CLASS)); | 248 | obj = efl_constructor(efl_super(obj, MY_CLASS)); |
249 | efl_canvas_object_type_set(obj, E_OBJ_NAME); | 249 | efl_canvas_object_type_set(obj, E_OBJ_NAME); |
250 | 250 | ||
251 | return obj; | 251 | return obj; |
@@ -1777,7 +1777,7 @@ _pixels_get(void *data, Evas_Object *obj) | |||
1777 | 1777 | ||
1778 | sd = data; | 1778 | sd = data; |
1779 | if (!sd->engine_instance) return; | 1779 | if (!sd->engine_instance) return; |
1780 | emotion_engine_instance_video_data_size_get(sd->engine_instance, &w, &h); | 1780 | emotion_engine_instance_videfl_data_size_get(sd->engine_instance, &w, &h); |
1781 | w = (w >> 1) << 1; | 1781 | w = (w >> 1) << 1; |
1782 | h = (h >> 1) << 1; | 1782 | h = (h >> 1) << 1; |
1783 | 1783 | ||