summaryrefslogtreecommitdiff
path: root/src/tests/emotion
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/tests/emotion
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (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/tests/emotion')
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index aaf9ecfa08..073db0f748 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -111,7 +111,7 @@ main_delete_request(Ecore_Evas *ee EINA_UNUSED)
111static void 111static void
112bg_setup(void) 112bg_setup(void)
113{ 113{
114 o_bg = eo_add(EDJE_OBJECT_CLASS, evas); 114 o_bg = efl_add(EDJE_OBJECT_CLASS, evas);
115 efl_file_set(o_bg, theme_file, "background"); 115 efl_file_set(o_bg, theme_file, "background");
116 efl_gfx_position_set(o_bg, 0, 0); 116 efl_gfx_position_set(o_bg, 0, 0);
117 efl_gfx_size_set(o_bg, startw, starth); 117 efl_gfx_size_set(o_bg, startw, starth);
@@ -573,7 +573,7 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha
573 } 573 }
574} 574}
575 575
576EO_CALLBACKS_ARRAY_DEFINE(emotion_object_test_callbacks, 576EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_test_callbacks,
577 { EMOTION_OBJECT_EVENT_FRAME_DECODE, video_obj_frame_decode_cb }, 577 { EMOTION_OBJECT_EVENT_FRAME_DECODE, video_obj_frame_decode_cb },
578 { EMOTION_OBJECT_EVENT_FRAME_RESIZE, video_obj_frame_resize_cb }, 578 { EMOTION_OBJECT_EVENT_FRAME_RESIZE, video_obj_frame_resize_cb },
579 { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, video_obj_length_change_cb }, 579 { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, video_obj_length_change_cb },
@@ -617,7 +617,7 @@ init_video_object(const char *module_filename, const char *filename)
617 fd = calloc(1, sizeof(Frame_Data)); 617 fd = calloc(1, sizeof(Frame_Data));
618 if (!fd) exit(1); 618 if (!fd) exit(1);
619 619
620 oe = eo_add(EDJE_OBJECT_CLASS, evas); 620 oe = efl_add(EDJE_OBJECT_CLASS, evas);
621 efl_event_callback_add(oe, EFL_EVENT_DEL, _oe_free_cb, fd); 621 efl_event_callback_add(oe, EFL_EVENT_DEL, _oe_free_cb, fd);
622 efl_key_data_set(oe, "frame_data", fd); 622 efl_key_data_set(oe, "frame_data", fd);
623 efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller"); 623 efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller");