summaryrefslogtreecommitdiff
path: root/src/tests
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
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')
-rw-r--r--src/tests/ecore/ecore_test_ecore.c28
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c32
-rw-r--r--src/tests/ecore/ecore_test_timer.c14
-rw-r--r--src/tests/edje/edje_test_edje.c18
-rw-r--r--src/tests/eina_cxx/simple.c2
-rw-r--r--src/tests/eio/eio_model_test_file.c6
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c6
-rw-r--r--src/tests/eio/eio_test_manager.c14
-rw-r--r--src/tests/eio/eio_test_manager_xattr.c4
-rw-r--r--src/tests/eio/eio_test_sentry.c80
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c12
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_connection.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_method.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_object.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_proxy.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_signal.c4
-rw-r--r--src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c4
-rw-r--r--src/tests/elementary/elm_code_test_widget.c2
-rw-r--r--src/tests/elementary/elm_test_atspi.c28
-rw-r--r--src/tests/elementary/elm_test_button.c6
-rw-r--r--src/tests/elementary/elm_test_config.c2
-rw-r--r--src/tests/elementary/elm_test_layout.c6
-rw-r--r--src/tests/elementary/elm_test_video.c2
-rw-r--r--src/tests/elementary/elm_test_win.c4
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c6
-rw-r--r--src/tests/eo/access/access_inherit.c12
-rw-r--r--src/tests/eo/access/access_main.c10
-rw-r--r--src/tests/eo/access/access_simple.c10
-rw-r--r--src/tests/eo/children/children_main.c14
-rw-r--r--src/tests/eo/children/children_simple.c6
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c16
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c16
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c272
-rw-r--r--src/tests/eo/constructors/constructors_main.c34
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c18
-rw-r--r--src/tests/eo/constructors/constructors_simple.c32
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c10
-rw-r--r--src/tests/eo/constructors/constructors_simple3.c8
-rw-r--r--src/tests/eo/constructors/constructors_simple4.c6
-rw-r--r--src/tests/eo/constructors/constructors_simple5.c8
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c10
-rw-r--r--src/tests/eo/constructors/constructors_simple7.c10
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit.c6
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c32
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c12
-rw-r--r--src/tests/eo/function_overrides/function_overrides_main.c28
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c34
-rw-r--r--src/tests/eo/interface/interface_interface.c10
-rw-r--r--src/tests/eo/interface/interface_interface2.c10
-rw-r--r--src/tests/eo/interface/interface_main.c8
-rw-r--r--src/tests/eo/interface/interface_simple.c26
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c10
-rw-r--r--src/tests/eo/mixin/mixin_main.c16
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c20
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c20
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c20
-rw-r--r--src/tests/eo/mixin/mixin_mixin4.c6
-rw-r--r--src/tests/eo/mixin/mixin_simple.c18
-rw-r--r--src/tests/eo/signals/signals_main.c32
-rw-r--r--src/tests/eo/signals/signals_simple.c18
-rw-r--r--src/tests/eo/suite/eo_test_call_errors.c32
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c38
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c132
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c72
-rw-r--r--src/tests/eo/suite/eo_test_class_singleton.c12
-rw-r--r--src/tests/eo/suite/eo_test_general.c702
-rw-r--r--src/tests/eo/suite/eo_test_init.c24
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c26
-rw-r--r--src/tests/eo/suite/eo_test_value.c14
-rw-r--r--src/tests/eolian/data/class_simple_ref.c22
-rw-r--r--src/tests/eolian/data/object_impl_add_ref.c2
-rw-r--r--src/tests/eolian/data/object_impl_ref.c2
-rw-r--r--src/tests/eolian/data/override_ref.c44
-rw-r--r--src/tests/eolian_cxx/a.c2
-rw-r--r--src/tests/eolian_cxx/b.c2
-rw-r--r--src/tests/eolian_cxx/c.c2
-rw-r--r--src/tests/eolian_cxx/d.c2
-rw-r--r--src/tests/eolian_cxx/generic.c2
-rw-r--r--src/tests/eolian_cxx/simple.c2
-rw-r--r--src/tests/eolian_js/eolian_js_test_constructor_method_impl.c8
-rw-r--r--src/tests/eolian_js/eolian_js_test_test_object_impl.c6
-rw-r--r--src/tests/evas/evas_test_image.c6
-rw-r--r--src/tests/evas/evas_test_mesh.c8
-rw-r--r--src/tests/evas/evas_test_object.c4
84 files changed, 1137 insertions, 1137 deletions
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index ced99d2062..98484e22a4 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -289,9 +289,9 @@ START_TEST(ecore_test_efl_loop_fd)
289 ret = pipe(comm); 289 ret = pipe(comm);
290 fail_if(ret != 0); 290 fail_if(ret != 0);
291 291
292 fd = eo_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(), 292 fd = efl_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(),
293 efl_loop_fd_set(eo_self, comm[0]), 293 efl_loop_fd_set(efl_self, comm[0]),
294 efl_event_callback_add(eo_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did)); 294 efl_event_callback_add(efl_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did));
295 fail_if(fd == NULL); 295 fail_if(fd == NULL);
296 296
297 ret = write(comm[1], &did, 1); 297 ret = write(comm[1], &did, 1);
@@ -324,7 +324,7 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
324 int comm[2]; 324 int comm[2];
325 int ret; 325 int ret;
326 326
327 eo_init(); 327 efl_object_init();
328 328
329 ret = ecore_init(); 329 ret = ecore_init();
330 fail_if(ret < 1); 330 fail_if(ret < 1);
@@ -332,11 +332,11 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
332 ret = pipe(comm); 332 ret = pipe(comm);
333 fail_if(ret != 0); 333 fail_if(ret != 0);
334 334
335 fd = eo_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(), 335 fd = efl_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(),
336 efl_loop_fd_set(eo_self, comm[0]), 336 efl_loop_fd_set(efl_self, comm[0]),
337 efl_event_callback_add(eo_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did), 337 efl_event_callback_add(efl_self, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did),
338 efl_event_callback_add(eo_self, EFL_EVENT_DEL, _efl_del_cb, &dead)); 338 efl_event_callback_add(efl_self, EFL_EVENT_DEL, _efl_del_cb, &dead));
339 eo_ref(fd); 339 efl_ref(fd);
340 fail_if(fd == NULL); 340 fail_if(fd == NULL);
341 341
342 ret = write(comm[1], &did, 1); 342 ret = write(comm[1], &did, 1);
@@ -355,7 +355,7 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
355 efl_del(fd); 355 efl_del(fd);
356 fail_if(dead == EINA_FALSE); 356 fail_if(dead == EINA_FALSE);
357 357
358 eo_shutdown(); 358 efl_object_shutdown();
359} 359}
360END_TEST 360END_TEST
361 361
@@ -827,16 +827,16 @@ START_TEST(ecore_test_efl_loop_register)
827 ecore_init(); 827 ecore_init();
828 828
829 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_CLASS); 829 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_CLASS);
830 fail_if(!eo_isa(t, EFL_LOOP_CLASS)); 830 fail_if(!efl_isa(t, EFL_LOOP_CLASS));
831 831
832 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS); 832 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS);
833 fail_if(t != NULL); 833 fail_if(t != NULL);
834 834
835 n = eo_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get()); 835 n = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get());
836 efl_loop_register(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n); 836 efl_loop_register(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
837 837
838 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS); 838 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS);
839 fail_if(!eo_isa(t, EFL_LOOP_TIMER_CLASS)); 839 fail_if(!efl_isa(t, EFL_LOOP_TIMER_CLASS));
840 fail_if(t != n); 840 fail_if(t != n);
841 841
842 efl_loop_unregister(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n); 842 efl_loop_unregister(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
@@ -856,7 +856,7 @@ START_TEST(ecore_test_efl_app_version)
856 ecore_init(); 856 ecore_init();
857 857
858 loop = efl_loop_main_get(EFL_LOOP_CLASS); 858 loop = efl_loop_main_get(EFL_LOOP_CLASS);
859 fail_if(!eo_isa(loop, EFL_LOOP_CLASS)); 859 fail_if(!efl_isa(loop, EFL_LOOP_CLASS));
860 860
861 efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, 0, 0, NULL, EFL_BUILD_ID); 861 efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, 0, 0, NULL, EFL_BUILD_ID);
862 ver = efl_loop_app_efl_version_get(loop); 862 ver = efl_loop_app_efl_version_get(loop);
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 7b744dd415..254db11b38 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -57,14 +57,14 @@ START_TEST(ecore_test_ecore_audio_obj_pulse)
57 Eina_Bool ret = EINA_FALSE; 57 Eina_Bool ret = EINA_FALSE;
58 Eina_Bool pulse_context_failed = EINA_FALSE; 58 Eina_Bool pulse_context_failed = EINA_FALSE;
59 59
60 in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL); 60 in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
61 fail_if(!in); 61 fail_if(!in);
62 62
63 ecore_audio_obj_name_set(in, "sample.wav"); 63 ecore_audio_obj_name_set(in, "sample.wav");
64 ret = ecore_audio_obj_source_set(in, TESTS_SRC_DIR"/sample.wav"); 64 ret = ecore_audio_obj_source_set(in, TESTS_SRC_DIR"/sample.wav");
65 fail_if(!ret); 65 fail_if(!ret);
66 66
67 out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL); 67 out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL);
68 fail_if(!out); 68 fail_if(!out);
69 69
70 ecore_timer_add(1.8, _seek_vol, in); 70 ecore_timer_add(1.8, _seek_vol, in);
@@ -108,12 +108,12 @@ START_TEST(ecore_test_ecore_audio_cleanup)
108 int freq = 1000; 108 int freq = 1000;
109 Eina_Bool ret = EINA_FALSE; 109 Eina_Bool ret = EINA_FALSE;
110 110
111 in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL); 111 in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
112 fail_if(!in); 112 fail_if(!in);
113 efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq); 113 efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq);
114 ecore_audio_obj_in_length_set(in, 2); 114 ecore_audio_obj_in_length_set(in, 2);
115 115
116 out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); 116 out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
117 fail_if(!out); 117 fail_if(!out);
118 ret = ecore_audio_obj_format_set(out, ECORE_AUDIO_FORMAT_OGG); 118 ret = ecore_audio_obj_format_set(out, ECORE_AUDIO_FORMAT_OGG);
119 fail_if(!ret); 119 fail_if(!ret);
@@ -139,7 +139,7 @@ START_TEST(ecore_test_ecore_audio_obj_tone)
139 Eina_Bool ret; 139 Eina_Bool ret;
140 char *tmp; 140 char *tmp;
141 141
142 in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL); 142 in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
143 fail_if(!in); 143 fail_if(!in);
144 144
145 ecore_audio_obj_name_set(in, "tone"); 145 ecore_audio_obj_name_set(in, "tone");
@@ -197,7 +197,7 @@ START_TEST(ecore_test_ecore_audio_obj_tone)
197 len = ecore_audio_obj_in_remaining_get(in); 197 len = ecore_audio_obj_in_remaining_get(in);
198 fail_if(len != 1.0); 198 fail_if(len != 1.0);
199 199
200 out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); 200 out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
201 fail_if(!out); 201 fail_if(!out);
202 202
203 ecore_audio_obj_name_set(out, "tmp.wav"); 203 ecore_audio_obj_name_set(out, "tmp.wav");
@@ -231,7 +231,7 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile)
231 Ecore_Audio_Format fmt; 231 Ecore_Audio_Format fmt;
232 const char *src; 232 const char *src;
233 233
234 in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL); 234 in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
235 fail_if(!in); 235 fail_if(!in);
236 236
237 fmt = ecore_audio_obj_format_get(in); 237 fmt = ecore_audio_obj_format_get(in);
@@ -277,7 +277,7 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile)
277 len = ecore_audio_obj_in_seek(in, -1.5, SEEK_END); 277 len = ecore_audio_obj_in_seek(in, -1.5, SEEK_END);
278 fail_if(fabs(rem - 1 - len) > 0.6); 278 fail_if(fabs(rem - 1 - len) > 0.6);
279 279
280 out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); 280 out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
281 fail_if(!out); 281 fail_if(!out);
282 282
283 ecore_audio_obj_name_set(out, "tmp.wav"); 283 ecore_audio_obj_name_set(out, "tmp.wav");
@@ -318,9 +318,9 @@ START_TEST(ecore_test_ecore_audio_obj_in_out)
318 Eina_List *in3; 318 Eina_List *in3;
319 Eina_Bool attached; 319 Eina_Bool attached;
320 320
321 Eo *in = eo_add(ECORE_AUDIO_IN_CLASS, NULL); 321 Eo *in = efl_add(ECORE_AUDIO_IN_CLASS, NULL);
322 Eo *in2 = eo_add(ECORE_AUDIO_IN_CLASS, NULL); 322 Eo *in2 = efl_add(ECORE_AUDIO_IN_CLASS, NULL);
323 Eo *out = eo_add(ECORE_AUDIO_OUT_CLASS, NULL); 323 Eo *out = efl_add(ECORE_AUDIO_OUT_CLASS, NULL);
324 324
325 fail_if(!in); 325 fail_if(!in);
326 fail_if(!in2); 326 fail_if(!in2);
@@ -416,10 +416,10 @@ START_TEST(ecore_test_ecore_audio_obj_vio)
416{ 416{
417 Eo *in, *out; 417 Eo *in, *out;
418 418
419 in = eo_add(ECORE_AUDIO_IN_CLASS, NULL); 419 in = efl_add(ECORE_AUDIO_IN_CLASS, NULL);
420 fail_if(!in); 420 fail_if(!in);
421 421
422 out = eo_add(ECORE_AUDIO_OUT_CLASS, NULL); 422 out = efl_add(ECORE_AUDIO_OUT_CLASS, NULL);
423 fail_if(!out); 423 fail_if(!out);
424 424
425 ecore_audio_obj_vio_set(in, &in_vio, NULL, NULL); 425 ecore_audio_obj_vio_set(in, &in_vio, NULL, NULL);
@@ -454,7 +454,7 @@ START_TEST(ecore_test_ecore_audio_obj_in)
454 Ecore_Audio_Vio vio; 454 Ecore_Audio_Vio vio;
455 Eina_Bool freed = EINA_FALSE; 455 Eina_Bool freed = EINA_FALSE;
456 456
457 Eo *in = eo_add(ECORE_AUDIO_IN_CLASS, NULL); 457 Eo *in = efl_add(ECORE_AUDIO_IN_CLASS, NULL);
458 458
459 fail_if(!in); 459 fail_if(!in);
460 460
@@ -541,10 +541,10 @@ START_TEST(ecore_test_ecore_audio_obj)
541 double volume; 541 double volume;
542 Eo *objs[2], *obj; 542 Eo *objs[2], *obj;
543 543
544 objs[0] = eo_add(ECORE_AUDIO_IN_CLASS, NULL); 544 objs[0] = efl_add(ECORE_AUDIO_IN_CLASS, NULL);
545 fail_if(!objs[0]); 545 fail_if(!objs[0]);
546 546
547 objs[1] = eo_add(ECORE_AUDIO_OUT_CLASS, NULL); 547 objs[1] = efl_add(ECORE_AUDIO_OUT_CLASS, NULL);
548 fail_if(!objs[1]); 548 fail_if(!objs[1]);
549 549
550 for (i=0; i<2; i++) { 550 for (i=0; i<2; i++) {
diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c
index 7da7d5239e..7550bdffd0 100644
--- a/src/tests/ecore/ecore_test_timer.c
+++ b/src/tests/ecore/ecore_test_timer.c
@@ -273,17 +273,17 @@ START_TEST(ecore_test_timer_lifecycle)
273 Ecore_Timer *t; 273 Ecore_Timer *t;
274 Eo *et; 274 Eo *et;
275 275
276 eo_init(); 276 efl_object_init();
277 ecore_init(); 277 ecore_init();
278 278
279 t = ecore_timer_add(1.0, _test_time_cb, &rl); 279 t = ecore_timer_add(1.0, _test_time_cb, &rl);
280 efl_event_callback_add((Eo*) t, EFL_EVENT_DEL, _test_death_cb, &dl); 280 efl_event_callback_add((Eo*) t, EFL_EVENT_DEL, _test_death_cb, &dl);
281 281
282 et = eo_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(), 282 et = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(),
283 efl_event_callback_add(eo_self, EFL_LOOP_TIMER_EVENT_TICK, _test_run_cb, &re), 283 efl_event_callback_add(efl_self, EFL_LOOP_TIMER_EVENT_TICK, _test_run_cb, &re),
284 efl_event_callback_add(eo_self, EFL_EVENT_DEL, _test_death_cb, &de), 284 efl_event_callback_add(efl_self, EFL_EVENT_DEL, _test_death_cb, &de),
285 efl_loop_timer_interval_set(eo_self, 1.0)); 285 efl_loop_timer_interval_set(efl_self, 1.0));
286 eo_ref(et); 286 efl_ref(et);
287 287
288 ecore_shutdown(); 288 ecore_shutdown();
289 289
@@ -294,7 +294,7 @@ START_TEST(ecore_test_timer_lifecycle)
294 efl_del(et); 294 efl_del(et);
295 fail_if(de == EINA_FALSE); 295 fail_if(de == EINA_FALSE);
296 296
297 eo_shutdown(); 297 efl_object_shutdown();
298} 298}
299END_TEST 299END_TEST
300 300
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 00f989b9ea..c681e02b0f 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -252,7 +252,7 @@ START_TEST(edje_test_snapshot)
252 252
253 /* check value of no_render flag as seen from evas land */ 253 /* check value of no_render flag as seen from evas land */
254 sub = edje_object_part_object_get(obj, "snap"); 254 sub = edje_object_part_object_get(obj, "snap");
255 fail_if(!eo_isa(sub, EFL_CANVAS_SNAPSHOT_CLASS) && 255 fail_if(!efl_isa(sub, EFL_CANVAS_SNAPSHOT_CLASS) &&
256 !evas_object_image_snapshot_get(sub)); 256 !evas_object_image_snapshot_get(sub));
257 257
258 // TODO: Verify that evas snapshot actually works (and has a filter) 258 // TODO: Verify that evas snapshot actually works (and has a filter)
@@ -355,13 +355,13 @@ START_TEST(edje_test_swallows)
355 Evas *evas = EDJE_TEST_INIT_EVAS(); 355 Evas *evas = EDJE_TEST_INIT_EVAS();
356 Evas_Object *ly, *o1, *o2; 356 Evas_Object *ly, *o1, *o2;
357 357
358 ly = eo_add(EDJE_OBJECT_CLASS, evas); 358 ly = efl_add(EDJE_OBJECT_CLASS, evas);
359 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group")); 359 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group"));
360 360
361 fail_unless(edje_object_part_exists(ly, "swallow")); 361 fail_unless(edje_object_part_exists(ly, "swallow"));
362 362
363 363
364 o1 = eo_add(EDJE_OBJECT_CLASS, ly); 364 o1 = efl_add(EDJE_OBJECT_CLASS, ly);
365 fail_if(!edje_object_part_swallow(ly, "swallow", o1)); 365 fail_if(!edje_object_part_swallow(ly, "swallow", o1));
366 ck_assert_ptr_eq(efl_parent_get(o1), ly); 366 ck_assert_ptr_eq(efl_parent_get(o1), ly);
367 367
@@ -371,7 +371,7 @@ START_TEST(edje_test_swallows)
371 fail_if(!edje_object_part_swallow(ly, "swallow", o1)); 371 fail_if(!edje_object_part_swallow(ly, "swallow", o1));
372 ck_assert_ptr_eq(efl_parent_get(o1), ly); 372 ck_assert_ptr_eq(efl_parent_get(o1), ly);
373 373
374 o2 = eo_add(EDJE_OBJECT_CLASS, ly); 374 o2 = efl_add(EDJE_OBJECT_CLASS, ly);
375 fail_if(!edje_object_part_swallow(ly, "swallow", o2)); 375 fail_if(!edje_object_part_swallow(ly, "swallow", o2));
376 ck_assert_ptr_eq(efl_parent_get(o2), ly); 376 ck_assert_ptr_eq(efl_parent_get(o2), ly);
377 /* o1 is deleted at this point. */ 377 /* o1 is deleted at this point. */
@@ -386,13 +386,13 @@ START_TEST(edje_test_swallows_eoapi)
386 Evas *evas = EDJE_TEST_INIT_EVAS(); 386 Evas *evas = EDJE_TEST_INIT_EVAS();
387 Evas_Object *ly, *o1, *o2; 387 Evas_Object *ly, *o1, *o2;
388 388
389 ly = eo_add(EDJE_OBJECT_CLASS, evas); 389 ly = efl_add(EDJE_OBJECT_CLASS, evas);
390 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group")); 390 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group"));
391 391
392 fail_unless(edje_object_part_exists(ly, "swallow")); 392 fail_unless(edje_object_part_exists(ly, "swallow"));
393 393
394 394
395 o1 = eo_add(EDJE_OBJECT_CLASS, ly); 395 o1 = efl_add(EDJE_OBJECT_CLASS, ly);
396 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); 396 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));
397 ck_assert_ptr_eq(efl_parent_get(o1), ly); 397 ck_assert_ptr_eq(efl_parent_get(o1), ly);
398 398
@@ -402,7 +402,7 @@ START_TEST(edje_test_swallows_eoapi)
402 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); 402 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));
403 ck_assert_ptr_eq(efl_parent_get(o1), ly); 403 ck_assert_ptr_eq(efl_parent_get(o1), ly);
404 404
405 o2 = eo_add(EDJE_OBJECT_CLASS, ly); 405 o2 = efl_add(EDJE_OBJECT_CLASS, ly);
406 fail_if(!efl_content_set(efl_part(ly, "swallow"), o2)); 406 fail_if(!efl_content_set(efl_part(ly, "swallow"), o2));
407 ck_assert_ptr_eq(efl_parent_get(o2), ly); 407 ck_assert_ptr_eq(efl_parent_get(o2), ly);
408 /* o1 is deleted at this point. */ 408 /* o1 is deleted at this point. */
@@ -664,7 +664,7 @@ START_TEST(edje_test_table_eoapi)
664 for (k = 0; k < 2; k++) 664 for (k = 0; k < 2; k++)
665 { 665 {
666 i = l*2 + k; 666 i = l*2 + k;
667 sobjs[i] = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 667 sobjs[i] = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
668 fail_if(!sobjs[i]); 668 fail_if(!sobjs[i]);
669 efl_pack_grid(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1); 669 efl_pack_grid(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1);
670 } 670 }
@@ -698,7 +698,7 @@ START_TEST(edje_test_table_eoapi)
698 fail_if(rows != 2); 698 fail_if(rows != 2);
699 699
700 /* test multiple ops on a proxy object */ 700 /* test multiple ops on a proxy object */
701 proxy = eo_ref(efl_part(obj, "table")); 701 proxy = efl_ref(efl_part(obj, "table"));
702 fail_if(!proxy); 702 fail_if(!proxy);
703 fail_if(!efl_pack_clear(proxy)); 703 fail_if(!efl_pack_clear(proxy));
704 fail_if(efl_content_count(efl_part(obj, "table")) != 4); 704 fail_if(efl_content_count(efl_part(obj, "table")) != 4);
diff --git a/src/tests/eina_cxx/simple.c b/src/tests/eina_cxx/simple.c
index 1eaff9f59e..a44bc8cbc0 100644
--- a/src/tests/eina_cxx/simple.c
+++ b/src/tests/eina_cxx/simple.c
@@ -14,7 +14,7 @@
14 14
15static Eo *_simple_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED) 15static Eo *_simple_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
16{ 16{
17 return efl_constructor(eo_super(obj, MY_CLASS)); 17 return efl_constructor(efl_super(obj, MY_CLASS));
18} 18}
19 19
20#include "simple.eo.c" 20#include "simple.eo.c"
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index 3352e355b4..824ef68649 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -111,10 +111,10 @@ START_TEST(eio_model_test_test_file)
111 111
112 fail_if(!eina_init(), "ERROR: Cannot init Eina!\n"); 112 fail_if(!eina_init(), "ERROR: Cannot init Eina!\n");
113 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n"); 113 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
114 fail_if(!eo_init(), "ERROR: Cannot init EO!\n"); 114 fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
115 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n"); 115 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n");
116 116
117 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, EFL_MODEL_TEST_FILENAME_PATH)); 117 filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, EFL_MODEL_TEST_FILENAME_PATH));
118 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 118 fail_if(!filemodel, "ERROR: Cannot init model!\n");
119 119
120 handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_func, NULL); 120 handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_func, NULL);
@@ -141,7 +141,7 @@ START_TEST(eio_model_test_test_file)
141 eina_promise_then(promise, &promise_then_count, &error_promise_then, NULL); 141 eina_promise_then(promise, &promise_then_count, &error_promise_then, NULL);
142 ecore_main_loop_begin(); 142 ecore_main_loop_begin();
143 143
144 eo_unref(filemodel); 144 efl_unref(filemodel);
145 145
146 eio_shutdown(); 146 eio_shutdown();
147 ecore_shutdown(); 147 ecore_shutdown();
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index 126b1d7156..d0ff492643 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -89,12 +89,12 @@ START_TEST(eio_model_test_test_monitor_add)
89 89
90 fail_if(!eina_init(), "ERROR: Cannot init Eina!\n"); 90 fail_if(!eina_init(), "ERROR: Cannot init Eina!\n");
91 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n"); 91 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
92 fail_if(!eo_init(), "ERROR: Cannot init EO!\n"); 92 fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
93 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n"); 93 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n");
94 94
95 tmpdir = eina_environment_tmp_get(); 95 tmpdir = eina_environment_tmp_get();
96 96
97 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, tmpdir)); 97 filemodel = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, tmpdir));
98 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 98 fail_if(!filemodel, "ERROR: Cannot init model!\n");
99 99
100 efl_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel); 100 efl_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel);
@@ -107,7 +107,7 @@ START_TEST(eio_model_test_test_monitor_add)
107 107
108 ecore_main_loop_begin(); 108 ecore_main_loop_begin();
109 109
110 eo_unref(filemodel); 110 efl_unref(filemodel);
111 111
112 eio_shutdown(); 112 eio_shutdown();
113 ecore_shutdown(); 113 ecore_shutdown();
diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c
index 795c0e23fd..c1ac397c8a 100644
--- a/src/tests/eio/eio_test_manager.c
+++ b/src/tests/eio/eio_test_manager.c
@@ -113,7 +113,7 @@ _do_ls_test(Efl_Io_Manager_Test_Stat_Ls_Func ls_func,
113{ 113{
114 int main_files = 0; 114 int main_files = 0;
115 115
116 Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 116 Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
117 Eina_Promise *promise = NULL; 117 Eina_Promise *promise = NULL;
118 118
119 efl_event_callback_add(job, event, filter_cb, NULL); 119 efl_event_callback_add(job, event, filter_cb, NULL);
@@ -126,7 +126,7 @@ _do_ls_test(Efl_Io_Manager_Test_Stat_Ls_Func ls_func,
126 126
127 fail_if(main_files != DONE_CALLED); 127 fail_if(main_files != DONE_CALLED);
128 128
129 eo_unref(job); 129 efl_unref(job);
130} 130}
131 131
132static void 132static void
@@ -160,7 +160,7 @@ START_TEST(efl_io_manager_test_file_direct_stat)
160 Eina_Tmpstr *nested_dirname = create_test_dirs(test_dirname); 160 Eina_Tmpstr *nested_dirname = create_test_dirs(test_dirname);
161 Eina_Tmpstr *nested_filename = get_full_path(test_dirname, files[3]); 161 Eina_Tmpstr *nested_filename = get_full_path(test_dirname, files[3]);
162 162
163 Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 163 Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
164 Eina_Promise *promise = NULL; 164 Eina_Promise *promise = NULL;
165 // Start testing 165 // Start testing
166 is_dir = EINA_TRUE; 166 is_dir = EINA_TRUE;
@@ -173,7 +173,7 @@ START_TEST(efl_io_manager_test_file_direct_stat)
173 promise = efl_io_manager_file_direct_stat(job, nested_filename); 173 promise = efl_io_manager_file_direct_stat(job, nested_filename);
174 eina_promise_then(promise, &_stat_done_cb, &_error_cb, &is_dir); 174 eina_promise_then(promise, &_stat_done_cb, &_error_cb, &is_dir);
175 ecore_main_loop_begin(); 175 ecore_main_loop_begin();
176 eo_unref(job); 176 efl_unref(job);
177 177
178 // Cleanup 178 // Cleanup
179 fail_if(!ecore_file_recursive_rm(test_dirname)); 179 fail_if(!ecore_file_recursive_rm(test_dirname));
@@ -254,13 +254,13 @@ START_TEST(efl_io_manager_test_open)
254 Eina_Tmpstr *nested_filename = get_full_path(test_dirname, files[3]); 254 Eina_Tmpstr *nested_filename = get_full_path(test_dirname, files[3]);
255 255
256 opened_file = EINA_FALSE; 256 opened_file = EINA_FALSE;
257 Efl_Io_Manager *job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 257 Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
258 Eina_Promise *promise = NULL; 258 Eina_Promise *promise = NULL;
259 259
260 promise = efl_io_manager_file_open(job, nested_filename, EINA_FALSE); 260 promise = efl_io_manager_file_open(job, nested_filename, EINA_FALSE);
261 eina_promise_then(promise, &_open_done_cb, &_error_cb, &opened_file); 261 eina_promise_then(promise, &_open_done_cb, &_error_cb, &opened_file);
262 ecore_main_loop_begin(); 262 ecore_main_loop_begin();
263 eo_unref(job); 263 efl_unref(job);
264 fail_if(!opened_file); 264 fail_if(!opened_file);
265 265
266 // Cleanup 266 // Cleanup
@@ -289,7 +289,7 @@ START_TEST(efl_io_instantiated)
289 289
290 manager = efl_provider_find(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS); 290 manager = efl_provider_find(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS);
291 fail_if(manager == NULL); 291 fail_if(manager == NULL);
292 fail_if(!eo_isa(manager, EFL_IO_MANAGER_CLASS)); 292 fail_if(!efl_isa(manager, EFL_IO_MANAGER_CLASS));
293 293
294 eio_shutdown(); 294 eio_shutdown();
295 295
diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c
index 77aa30c232..3733589a3d 100644
--- a/src/tests/eio/eio_test_manager_xattr.c
+++ b/src/tests/eio/eio_test_manager_xattr.c
@@ -129,7 +129,7 @@ START_TEST(eio_test_job_xattr_set)
129 129
130 fprintf(stderr, "eio_test_job_xattr_set\n"); fflush(stderr); 130 fprintf(stderr, "eio_test_job_xattr_set\n"); fflush(stderr);
131 131
132 job = eo_add(EFL_IO_MANAGER_CLASS, NULL); 132 job = efl_add(EFL_IO_MANAGER_CLASS, NULL);
133 133
134 test_file_path = get_full_path(XATTR_TEST_DIR, filename); 134 test_file_path = get_full_path(XATTR_TEST_DIR, filename);
135 fd = open(test_file_path, 135 fd = open(test_file_path,
@@ -184,7 +184,7 @@ START_TEST(eio_test_job_xattr_set)
184 184
185 free(attrib_promises); 185 free(attrib_promises);
186 186
187 eo_unref(job); 187 efl_unref(job);
188 close(fd); 188 close(fd);
189 unlink(test_file_path); 189 unlink(test_file_path);
190 eina_tmpstr_del(test_file_path); 190 eina_tmpstr_del(test_file_path);
diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index e00a7d8529..902d6532bb 100644
--- a/src/tests/eio/eio_test_sentry.c
+++ b/src/tests/eio/eio_test_sentry.c
@@ -146,14 +146,14 @@ START_TEST(eio_test_sentry_add_and_remove)
146 usleep(500000); 146 usleep(500000);
147 147
148 //monitor directory 148 //monitor directory
149 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 149 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
150 fail_if(!eio_sentry_add(sentry, filename)); 150 fail_if(!eio_sentry_add(sentry, filename));
151 151
152 usleep(500000); 152 usleep(500000);
153 153
154 eio_sentry_del(sentry, filename); 154 eio_sentry_del(sentry, filename);
155 155
156 eo_unref(sentry); 156 efl_unref(sentry);
157 157
158 _common_shutdown(dirname); 158 _common_shutdown(dirname);
159} 159}
@@ -172,7 +172,7 @@ START_TEST(eio_test_sentry_add_remove_add)
172 usleep(500000); 172 usleep(500000);
173 173
174 //monitor directory 174 //monitor directory
175 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 175 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
176 fail_if(!eio_sentry_add(sentry, filename)); 176 fail_if(!eio_sentry_add(sentry, filename));
177 eio_sentry_del(sentry, filename); 177 eio_sentry_del(sentry, filename);
178 178
@@ -181,7 +181,7 @@ START_TEST(eio_test_sentry_add_remove_add)
181 fail_if(!eio_sentry_add(sentry, filename)); 181 fail_if(!eio_sentry_add(sentry, filename));
182 eio_sentry_del(sentry, filename); 182 eio_sentry_del(sentry, filename);
183 183
184 eo_unref(sentry); 184 efl_unref(sentry);
185 185
186 _common_shutdown(dirname); 186 _common_shutdown(dirname);
187} 187}
@@ -202,7 +202,7 @@ START_TEST(eio_test_sentry_add_add_remove_remove)
202 //sleep to avoid catching event generated by above manipulations 202 //sleep to avoid catching event generated by above manipulations
203 usleep(500000); 203 usleep(500000);
204 204
205 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 205 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
206 206
207 //monitor directory 207 //monitor directory
208 fail_if(!eio_sentry_add(sentry, filename1)); 208 fail_if(!eio_sentry_add(sentry, filename1));
@@ -211,7 +211,7 @@ START_TEST(eio_test_sentry_add_add_remove_remove)
211 eio_sentry_del(sentry, filename1); 211 eio_sentry_del(sentry, filename1);
212 eio_sentry_del(sentry, filename2); 212 eio_sentry_del(sentry, filename2);
213 213
214 eo_unref(sentry); 214 efl_unref(sentry);
215 215
216 _common_shutdown(dirname); 216 _common_shutdown(dirname);
217} 217}
@@ -232,7 +232,7 @@ START_TEST(eio_test_sentry_directory_file_created_notify)
232 Eo* sentry; 232 Eo* sentry;
233 233
234 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_created_notify", dirname); 234 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_created_notify", dirname);
235 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 235 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
236 236
237 //sleep to avoid catching event generated by above manipulations 237 //sleep to avoid catching event generated by above manipulations
238 usleep(500000); 238 usleep(500000);
@@ -245,7 +245,7 @@ START_TEST(eio_test_sentry_directory_file_created_notify)
245 245
246 ecore_main_loop_begin(); 246 ecore_main_loop_begin();
247 247
248 eo_unref(sentry); 248 efl_unref(sentry);
249 249
250 _common_shutdown(dirname); 250 _common_shutdown(dirname);
251} 251}
@@ -259,7 +259,7 @@ START_TEST(eio_test_sentry_directory_file_deleted_notify)
259 259
260 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_deleted_notify", dirname); 260 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_deleted_notify", dirname);
261 _create_file((void*)filename); 261 _create_file((void*)filename);
262 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 262 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
263 263
264 //sleep to avoid catching event generated by above manipulations 264 //sleep to avoid catching event generated by above manipulations
265 usleep(500000); 265 usleep(500000);
@@ -272,7 +272,7 @@ START_TEST(eio_test_sentry_directory_file_deleted_notify)
272 272
273 ecore_main_loop_begin(); 273 ecore_main_loop_begin();
274 274
275 eo_unref(sentry); 275 efl_unref(sentry);
276 276
277 _common_shutdown(dirname); 277 _common_shutdown(dirname);
278} 278}
@@ -286,7 +286,7 @@ START_TEST(eio_test_sentry_directory_file_modified_notify)
286 286
287 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_modified_notify", dirname); 287 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_modified_notify", dirname);
288 _create_file((void*)filename); 288 _create_file((void*)filename);
289 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 289 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
290 290
291 //sleep to avoid catching event generated by above manipulations 291 //sleep to avoid catching event generated by above manipulations
292 usleep(500000); 292 usleep(500000);
@@ -299,7 +299,7 @@ START_TEST(eio_test_sentry_directory_file_modified_notify)
299 299
300 ecore_main_loop_begin(); 300 ecore_main_loop_begin();
301 301
302 eo_unref(sentry); 302 efl_unref(sentry);
303 303
304 //cleanup 304 //cleanup
305 _common_shutdown(dirname); 305 _common_shutdown(dirname);
@@ -314,7 +314,7 @@ START_TEST(eio_test_sentry_directory_file_closed_notify)
314 314
315 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_closed_notify", dirname); 315 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_closed_notify", dirname);
316 _create_file((void*)filename); 316 _create_file((void*)filename);
317 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 317 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
318 318
319 //sleep to avoid catching event generated by above manipulations 319 //sleep to avoid catching event generated by above manipulations
320 usleep(500000); 320 usleep(500000);
@@ -326,7 +326,7 @@ START_TEST(eio_test_sentry_directory_file_closed_notify)
326 326
327 ecore_main_loop_begin(); 327 ecore_main_loop_begin();
328 328
329 eo_unref(sentry); 329 efl_unref(sentry);
330 330
331 _common_shutdown(dirname); 331 _common_shutdown(dirname);
332} 332}
@@ -339,7 +339,7 @@ START_TEST(eio_test_sentry_directory_directory_created_notify)
339 Eo *sentry; 339 Eo *sentry;
340 340
341 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_created_notify", dirname); 341 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_created_notify", dirname);
342 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 342 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
343 343
344 //sleep to avoid catching event generated by above manipulations 344 //sleep to avoid catching event generated by above manipulations
345 usleep(500000); 345 usleep(500000);
@@ -352,7 +352,7 @@ START_TEST(eio_test_sentry_directory_directory_created_notify)
352 352
353 ecore_main_loop_begin(); 353 ecore_main_loop_begin();
354 354
355 eo_unref(sentry); 355 efl_unref(sentry);
356 356
357 _common_shutdown(dirname); 357 _common_shutdown(dirname);
358} 358}
@@ -366,7 +366,7 @@ START_TEST(eio_test_sentry_directory_directory_deleted_notify)
366 366
367 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_deleted_notify", dirname); 367 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_deleted_notify", dirname);
368 _create_directory((void*)filename); 368 _create_directory((void*)filename);
369 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 369 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
370 370
371 //sleep to avoid catching event generated by above manipulations 371 //sleep to avoid catching event generated by above manipulations
372 usleep(500000); 372 usleep(500000);
@@ -379,7 +379,7 @@ START_TEST(eio_test_sentry_directory_directory_deleted_notify)
379 379
380 ecore_main_loop_begin(); 380 ecore_main_loop_begin();
381 381
382 eo_unref(sentry); 382 efl_unref(sentry);
383 383
384 _common_shutdown(dirname); 384 _common_shutdown(dirname);
385} 385}
@@ -393,7 +393,7 @@ START_TEST(eio_test_sentry_directory_directory_modified_notify)
393 393
394 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_modified_notify", dirname); 394 filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_modified_notify", dirname);
395 _create_directory((void*)filename); 395 _create_directory((void*)filename);
396 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 396 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
397 397
398 //sleep to avoid catching event generated by above manipulations 398 //sleep to avoid catching event generated by above manipulations
399 usleep(500000); 399 usleep(500000);
@@ -406,7 +406,7 @@ START_TEST(eio_test_sentry_directory_directory_modified_notify)
406 406
407 ecore_main_loop_begin(); 407 ecore_main_loop_begin();
408 408
409 eo_unref(sentry); 409 efl_unref(sentry);
410 410
411 _common_shutdown(dirname); 411 _common_shutdown(dirname);
412} 412}
@@ -415,7 +415,7 @@ END_TEST
415START_TEST(eio_test_sentry_directory_directory_self_deleted_notify) 415START_TEST(eio_test_sentry_directory_directory_self_deleted_notify)
416{ 416{
417 Eina_Tmpstr *dirname = _common_init(); 417 Eina_Tmpstr *dirname = _common_init();
418 Eo *sentry = eo_add(EIO_SENTRY_CLASS, NULL); 418 Eo *sentry = efl_add(EIO_SENTRY_CLASS, NULL);
419 419
420 //sleep to avoid catching event generated by above manipulations 420 //sleep to avoid catching event generated by above manipulations
421 usleep(500000); 421 usleep(500000);
@@ -428,7 +428,7 @@ START_TEST(eio_test_sentry_directory_directory_self_deleted_notify)
428 428
429 ecore_main_loop_begin(); 429 ecore_main_loop_begin();
430 430
431 eo_unref(sentry); 431 efl_unref(sentry);
432 432
433 _common_shutdown(dirname); 433 _common_shutdown(dirname);
434} 434}
@@ -444,7 +444,7 @@ START_TEST(eio_test_sentry_file_file_modified_notify)
444 444
445 filename = eina_stringshare_printf("%s/filecreated", dirname); 445 filename = eina_stringshare_printf("%s/filecreated", dirname);
446 _create_file((void*)filename); 446 _create_file((void*)filename);
447 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 447 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
448 448
449 //sleep to avoid catching event generated by above manipulations 449 //sleep to avoid catching event generated by above manipulations
450 usleep(500000); 450 usleep(500000);
@@ -457,7 +457,7 @@ START_TEST(eio_test_sentry_file_file_modified_notify)
457 457
458 ecore_main_loop_begin(); 458 ecore_main_loop_begin();
459 459
460 eo_unref(sentry); 460 efl_unref(sentry);
461 461
462 //cleanup 462 //cleanup
463 _common_shutdown(dirname); 463 _common_shutdown(dirname);
@@ -472,7 +472,7 @@ START_TEST(eio_test_sentry_file_file_attrib_modified_notify)
472 472
473 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_attrib_modified_notify", dirname); 473 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_attrib_modified_notify", dirname);
474 _create_file((void*)filename); 474 _create_file((void*)filename);
475 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 475 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
476 476
477 //sleep to avoid catching event generated by above manipulations 477 //sleep to avoid catching event generated by above manipulations
478 usleep(500000); 478 usleep(500000);
@@ -485,7 +485,7 @@ START_TEST(eio_test_sentry_file_file_attrib_modified_notify)
485 485
486 ecore_main_loop_begin(); 486 ecore_main_loop_begin();
487 487
488 eo_unref(sentry); 488 efl_unref(sentry);
489 489
490 _common_shutdown(dirname); 490 _common_shutdown(dirname);
491} 491}
@@ -500,7 +500,7 @@ START_TEST(eio_test_sentry_file_file_closed_notify)
500 500
501 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_closed_notify", dirname); 501 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_closed_notify", dirname);
502 _create_file((void*)filename); 502 _create_file((void*)filename);
503 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 503 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
504 504
505 //sleep to avoid catching event generated by above manipulations 505 //sleep to avoid catching event generated by above manipulations
506 usleep(500000); 506 usleep(500000);
@@ -512,7 +512,7 @@ START_TEST(eio_test_sentry_file_file_closed_notify)
512 512
513 ecore_main_loop_begin(); 513 ecore_main_loop_begin();
514 514
515 eo_unref(sentry); 515 efl_unref(sentry);
516 516
517 _common_shutdown(dirname); 517 _common_shutdown(dirname);
518} 518}
@@ -526,7 +526,7 @@ START_TEST(eio_test_sentry_file_file_self_deleted_notify)
526 526
527 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_self_deleted_notify", dirname); 527 filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_self_deleted_notify", dirname);
528 _create_file((void*)filename); 528 _create_file((void*)filename);
529 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 529 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
530 530
531 //sleep to avoid catching event generated by above manipulations 531 //sleep to avoid catching event generated by above manipulations
532 usleep(500000); 532 usleep(500000);
@@ -539,7 +539,7 @@ START_TEST(eio_test_sentry_file_file_self_deleted_notify)
539 539
540 ecore_main_loop_begin(); 540 ecore_main_loop_begin();
541 541
542 eo_unref(sentry); 542 efl_unref(sentry);
543 543
544 _common_shutdown(dirname); 544 _common_shutdown(dirname);
545} 545}
@@ -555,7 +555,7 @@ START_TEST(eio_test_sentry_two_monitors_one_event)
555 555
556 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); 556 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
557 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_event", dirname); 557 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_event", dirname);
558 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 558 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
559 559
560 //sleep to avoid catching event generated by above manipulations 560 //sleep to avoid catching event generated by above manipulations
561 usleep(500000); 561 usleep(500000);
@@ -569,7 +569,7 @@ START_TEST(eio_test_sentry_two_monitors_one_event)
569 569
570 ecore_main_loop_begin(); 570 ecore_main_loop_begin();
571 571
572 eo_unref(sentry); 572 efl_unref(sentry);
573 573
574 _delete_directory((void*)dirname2); 574 _delete_directory((void*)dirname2);
575 _common_shutdown(dirname); 575 _common_shutdown(dirname);
@@ -587,7 +587,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_one_event)
587 587
588 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); 588 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
589 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname); 589 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname);
590 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 590 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
591 591
592 //sleep to avoid catching event generated by above manipulations 592 //sleep to avoid catching event generated by above manipulations
593 usleep(500000); 593 usleep(500000);
@@ -602,7 +602,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_one_event)
602 602
603 ecore_main_loop_begin(); 603 ecore_main_loop_begin();
604 604
605 eo_unref(sentry); 605 efl_unref(sentry);
606 606
607 _delete_directory((void*)dirname2); 607 _delete_directory((void*)dirname2);
608 _common_shutdown(dirname); 608 _common_shutdown(dirname);
@@ -624,7 +624,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_no_event)
624 624
625 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2); 625 eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
626 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname); 626 filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname);
627 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 627 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
628 628
629 //sleep to avoid catching event generated by above manipulations 629 //sleep to avoid catching event generated by above manipulations
630 usleep(500000); 630 usleep(500000);
@@ -640,7 +640,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_no_event)
640 640
641 ecore_main_loop_begin(); 641 ecore_main_loop_begin();
642 642
643 eo_unref(sentry); 643 efl_unref(sentry);
644 644
645 _delete_directory((void*)dirname2); 645 _delete_directory((void*)dirname2);
646 _common_shutdown(dirname); 646 _common_shutdown(dirname);
@@ -658,7 +658,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory)
658 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_2", dirname); 658 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_2", dirname);
659 _create_file((void*)filename); 659 _create_file((void*)filename);
660 _create_file((void*)filename2); 660 _create_file((void*)filename2);
661 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 661 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
662 662
663 //sleep to avoid catching event generated by above manipulations 663 //sleep to avoid catching event generated by above manipulations
664 usleep(500000); 664 usleep(500000);
@@ -672,7 +672,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory)
672 672
673 ecore_main_loop_begin(); 673 ecore_main_loop_begin();
674 674
675 eo_unref(sentry); 675 efl_unref(sentry);
676 676
677 //cleanup 677 //cleanup
678 _common_shutdown(dirname); 678 _common_shutdown(dirname);
@@ -691,7 +691,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed)
691 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_one_removed_2", dirname); 691 filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_one_removed_2", dirname);
692 _create_file((void*)filename); 692 _create_file((void*)filename);
693 _create_file((void*)filename2); 693 _create_file((void*)filename2);
694 sentry = eo_add(EIO_SENTRY_CLASS, NULL); 694 sentry = efl_add(EIO_SENTRY_CLASS, NULL);
695 695
696 //sleep to avoid catching event generated by above manipulations 696 //sleep to avoid catching event generated by above manipulations
697 usleep(500000); 697 usleep(500000);
@@ -708,7 +708,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed)
708 708
709 ecore_main_loop_begin(); 709 ecore_main_loop_begin();
710 710
711 eo_unref(sentry); 711 efl_unref(sentry);
712 712
713 //cleanup 713 //cleanup
714 _common_shutdown(dirname); 714 _common_shutdown(dirname);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index fb311ad0f5..524d53df27 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -168,7 +168,7 @@ check_property(Eo *object, const char *property_name, const char *expected_value
168Eo * 168Eo *
169create_connection(void) 169create_connection(void)
170{ 170{
171 Eo *connection = eo_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE)); 171 Eo *connection = efl_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE));
172 ck_assert_ptr_ne(NULL, connection); 172 ck_assert_ptr_ne(NULL, connection);
173 return connection; 173 return connection;
174} 174}
@@ -176,7 +176,7 @@ create_connection(void)
176Eo * 176Eo *
177create_object(void) 177create_object(void)
178{ 178{
179 Eo *object = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH)); 179 Eo *object = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH));
180 ck_assert_ptr_ne(NULL, object); 180 ck_assert_ptr_ne(NULL, object);
181 return object; 181 return object;
182} 182}
@@ -274,7 +274,7 @@ START_TEST(smoke)
274 check_init(); 274 check_init();
275 275
276 Eo *connection = create_connection(); 276 Eo *connection = create_connection();
277 eo_unref(connection); 277 efl_unref(connection);
278 278
279 check_shutdown(); 279 check_shutdown();
280} 280}
@@ -286,7 +286,7 @@ START_TEST(object)
286 286
287 Eo *root = create_object(); 287 Eo *root = create_object();
288 288
289 eo_unref(root); 289 efl_unref(root);
290 290
291 check_shutdown(); 291 check_shutdown();
292} 292}
@@ -316,7 +316,7 @@ START_TEST(proxy)
316 } 316 }
317 eina_promise_unref(promise); 317 eina_promise_unref(promise);
318 318
319 eo_unref(root); 319 efl_unref(root);
320 320
321 check_shutdown(); 321 check_shutdown();
322} 322}
@@ -373,7 +373,7 @@ _eldbus_model_arguments_from_proxy_get(Eldbus_Model_Proxy *proxy, const char *me
373 unsigned int i; 373 unsigned int i;
374 EINA_ACCESSOR_FOREACH(accessor, i, child) 374 EINA_ACCESSOR_FOREACH(accessor, i, child)
375 { 375 {
376 if (!eo_isa(child, klass)) 376 if (!efl_isa(child, klass))
377 continue; 377 continue;
378 378
379 const char *name; 379 const char *name;
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
index 3bb0fffb88..ecd24bcbb9 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
@@ -25,7 +25,7 @@ _setup(void)
25static void 25static void
26_teardown(void) 26_teardown(void)
27{ 27{
28 eo_unref(connection); 28 efl_unref(connection);
29 check_shutdown(); 29 check_shutdown();
30} 30}
31 31
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
index b1d8800596..a22e0a5fbc 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
@@ -29,7 +29,7 @@ _setup(void)
29 29
30 fake_server = fake_server_start(&fake_server_data); 30 fake_server = fake_server_start(&fake_server_data);
31 31
32 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); 32 fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
33 ck_assert_ptr_ne(NULL, fake_server_object); 33 ck_assert_ptr_ne(NULL, fake_server_object);
34 34
35 fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE); 35 fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
@@ -42,7 +42,7 @@ _setup(void)
42static void 42static void
43_teardown(void) 43_teardown(void)
44{ 44{
45 eo_unref(fake_server_object); 45 efl_unref(fake_server_object);
46 46
47 fake_server_stop(fake_server); 47 fake_server_stop(fake_server);
48 48
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_object.c b/src/tests/eldbus/eldbus_test_eldbus_model_object.c
index 78058ab3ef..06b2e8ad60 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_object.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_object.c
@@ -25,7 +25,7 @@ _setup(void)
25static void 25static void
26_teardown(void) 26_teardown(void)
27{ 27{
28 eo_unref(object); 28 efl_unref(object);
29 check_shutdown(); 29 check_shutdown();
30} 30}
31 31
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
index d1830ccac3..939d60ac3f 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
@@ -27,7 +27,7 @@ _setup(void)
27static void 27static void
28_teardown(void) 28_teardown(void)
29{ 29{
30 eo_unref(dbus_object1); 30 efl_unref(dbus_object1);
31 check_shutdown(); 31 check_shutdown();
32} 32}
33 33
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
index a3eeac77fc..a1082d0171 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
@@ -27,7 +27,7 @@ _setup(void)
27 27
28 fake_server = fake_server_start(&fake_server_data); 28 fake_server = fake_server_start(&fake_server_data);
29 29
30 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); 30 fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
31 ck_assert_ptr_ne(NULL, fake_server_object); 31 ck_assert_ptr_ne(NULL, fake_server_object);
32 32
33 fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE); 33 fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
@@ -40,7 +40,7 @@ _setup(void)
40static void 40static void
41_teardown(void) 41_teardown(void)
42{ 42{
43 eo_unref(fake_server_object); 43 efl_unref(fake_server_object);
44 44
45 fake_server_stop(fake_server); 45 fake_server_stop(fake_server);
46 46
diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
index 6936df9f04..7aa8314ab2 100644
--- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
@@ -33,7 +33,7 @@ _setup(void)
33 }; 33 };
34 fake_server = fake_server_start(&fake_server_data); 34 fake_server = fake_server_start(&fake_server_data);
35 35
36 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); 36 fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(efl_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
37 ck_assert_ptr_ne(NULL, fake_server_object); 37 ck_assert_ptr_ne(NULL, fake_server_object);
38 38
39 fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE); 39 fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
@@ -42,7 +42,7 @@ _setup(void)
42static void 42static void
43_teardown(void) 43_teardown(void)
44{ 44{
45 eo_unref(fake_server_object); 45 efl_unref(fake_server_object);
46 46
47 fake_server_stop(fake_server); 47 fake_server_stop(fake_server);
48 48
diff --git a/src/tests/elementary/elm_code_test_widget.c b/src/tests/elementary/elm_code_test_widget.c
index 2896162360..191c2725d3 100644
--- a/src/tests/elementary/elm_code_test_widget.c
+++ b/src/tests/elementary/elm_code_test_widget.c
@@ -96,7 +96,7 @@ START_TEST (elm_code_widget_construct_nocode)
96 elm_init(1, NULL); 96 elm_init(1, NULL);
97 97
98 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 98 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
99 widget = eo_add(ELM_CODE_WIDGET_CLASS, win); 99 widget = efl_add(ELM_CODE_WIDGET_CLASS, win);
100 ck_assert(!widget); 100 ck_assert(!widget);
101 101
102 elm_shutdown(); 102 elm_shutdown();
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 84c8a83555..630febc9c1 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -29,7 +29,7 @@ START_TEST (elm_atspi_app_obj_name_get)
29{ 29{
30 elm_init(0, NULL); 30 elm_init(0, NULL);
31 31
32 Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL); 32 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
33 33
34 ck_assert(root != NULL); 34 ck_assert(root != NULL);
35 35
@@ -41,7 +41,7 @@ START_TEST (elm_atspi_app_obj_name_get)
41 41
42 ck_assert_str_eq(ret, "Test name"); 42 ck_assert_str_eq(ret, "Test name");
43 43
44 eo_unref(root); 44 efl_unref(root);
45 elm_shutdown(); 45 elm_shutdown();
46} 46}
47END_TEST 47END_TEST
@@ -108,7 +108,7 @@ START_TEST (elm_atspi_role_get)
108{ 108{
109 elm_init(0, NULL); 109 elm_init(0, NULL);
110 110
111 Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL); 111 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
112 112
113 Elm_Atspi_Role role; 113 Elm_Atspi_Role role;
114 114
@@ -116,7 +116,7 @@ START_TEST (elm_atspi_role_get)
116 116
117 ck_assert(role == ELM_ATSPI_ROLE_APPLICATION); 117 ck_assert(role == ELM_ATSPI_ROLE_APPLICATION);
118 118
119 eo_unref(root); 119 efl_unref(root);
120 elm_shutdown(); 120 elm_shutdown();
121} 121}
122END_TEST 122END_TEST
@@ -149,7 +149,7 @@ START_TEST (elm_atspi_role_name_get)
149{ 149{
150 elm_init(0, NULL); 150 elm_init(0, NULL);
151 151
152 Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL); 152 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
153 153
154 const char *ret = NULL; 154 const char *ret = NULL;
155 155
@@ -157,7 +157,7 @@ START_TEST (elm_atspi_role_name_get)
157 157
158 ck_assert(ret != NULL); 158 ck_assert(ret != NULL);
159 159
160 eo_unref(root); 160 efl_unref(root);
161 elm_shutdown(); 161 elm_shutdown();
162} 162}
163END_TEST 163END_TEST
@@ -166,7 +166,7 @@ START_TEST (elm_atspi_localized_role_name_get)
166{ 166{
167 elm_init(0, NULL); 167 elm_init(0, NULL);
168 168
169 Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL); 169 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
170 170
171 const char *ret = NULL; 171 const char *ret = NULL;
172 172
@@ -174,7 +174,7 @@ START_TEST (elm_atspi_localized_role_name_get)
174 174
175 ck_assert(ret != NULL); 175 ck_assert(ret != NULL);
176 176
177 eo_unref(root); 177 efl_unref(root);
178 elm_shutdown(); 178 elm_shutdown();
179} 179}
180END_TEST 180END_TEST
@@ -183,7 +183,7 @@ START_TEST (elm_atspi_description_set)
183{ 183{
184 elm_init(0, NULL); 184 elm_init(0, NULL);
185 185
186 Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL); 186 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
187 187
188 const char *ret = NULL; 188 const char *ret = NULL;
189 189
@@ -204,7 +204,7 @@ START_TEST (elm_atspi_description_set)
204 204
205 ck_assert(ret == NULL); 205 ck_assert(ret == NULL);
206 206
207 eo_unref(root); 207 efl_unref(root);
208 elm_shutdown(); 208 elm_shutdown();
209} 209}
210END_TEST 210END_TEST
@@ -229,7 +229,7 @@ START_TEST (elm_atspi_children_and_parent)
229 elm_init(0, NULL); 229 elm_init(0, NULL);
230 230
231 generate_app(); 231 generate_app();
232 Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL); 232 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
233 233
234 Eina_List *child_list = NULL; 234 Eina_List *child_list = NULL;
235 235
@@ -246,7 +246,7 @@ START_TEST (elm_atspi_children_and_parent)
246 ck_assert(win != NULL); 246 ck_assert(win != NULL);
247 ck_assert(win == g_win); 247 ck_assert(win == g_win);
248 248
249 eo_unref(root); 249 efl_unref(root);
250 elm_shutdown(); 250 elm_shutdown();
251} 251}
252END_TEST 252END_TEST
@@ -256,7 +256,7 @@ START_TEST (elm_atspi_children_and_parent2)
256 elm_init(0, NULL); 256 elm_init(0, NULL);
257 257
258 generate_app(); 258 generate_app();
259 Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL); 259 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
260 260
261 Eo *win = NULL; 261 Eo *win = NULL;
262 262
@@ -275,7 +275,7 @@ START_TEST (elm_atspi_children_and_parent2)
275 ck_assert(btn != NULL); 275 ck_assert(btn != NULL);
276 ck_assert(btn == g_btn); 276 ck_assert(btn == g_btn);
277 277
278 eo_unref(root); 278 efl_unref(root);
279 elm_shutdown(); 279 elm_shutdown();
280} 280}
281END_TEST 281END_TEST
diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c
index afa1cadd46..73384d692b 100644
--- a/src/tests/elementary/elm_test_button.c
+++ b/src/tests/elementary/elm_test_button.c
@@ -34,9 +34,9 @@ START_TEST (elm_atspi_interfaces_check)
34 34
35 button = elm_button_add(win); 35 button = elm_button_add(win);
36 36
37 ck_assert(eo_isa(button, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)); 37 ck_assert(efl_isa(button, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN));
38 ck_assert(eo_isa(button, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN)); 38 ck_assert(efl_isa(button, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN));
39 ck_assert(eo_isa(button, ELM_INTERFACE_ATSPI_ACTION_MIXIN)); 39 ck_assert(efl_isa(button, ELM_INTERFACE_ATSPI_ACTION_MIXIN));
40 40
41 elm_shutdown(); 41 elm_shutdown();
42} 42}
diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c
index 26f80824fc..f1c6b14baf 100644
--- a/src/tests/elementary/elm_test_config.c
+++ b/src/tests/elementary/elm_test_config.c
@@ -153,7 +153,7 @@ START_TEST (elm_config_win)
153 Eo *cfg = efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_INTERFACE); 153 Eo *cfg = efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_INTERFACE);
154 fail_if(!cfg); 154 fail_if(!cfg);
155 155
156 Eo *win = eo_add(EFL_UI_WIN_CLASS, NULL); 156 Eo *win = efl_add(EFL_UI_WIN_CLASS, NULL);
157 Eo *cfg2 = efl_provider_find(win, EFL_CONFIG_INTERFACE); 157 Eo *cfg2 = efl_provider_find(win, EFL_CONFIG_INTERFACE);
158 fail_if(cfg != cfg2); 158 fail_if(cfg != cfg2);
159 159
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index 405c27b4cf..b89be351c9 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -32,12 +32,12 @@ START_TEST(elm_layout_swallows)
32 elm_init(1, NULL); 32 elm_init(1, NULL);
33 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); 33 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
34 34
35 ly = eo_add(ELM_LAYOUT_CLASS, win); 35 ly = efl_add(ELM_LAYOUT_CLASS, win);
36 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR); 36 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR);
37 elm_layout_file_set(ly, buf, "layout"); 37 elm_layout_file_set(ly, buf, "layout");
38 evas_object_show(ly); 38 evas_object_show(ly);
39 39
40 bt = eo_add(ELM_BUTTON_CLASS, ly); 40 bt = efl_add(ELM_BUTTON_CLASS, ly);
41 fail_if(!efl_content_set(efl_part(ly, "element1"), bt)); 41 fail_if(!efl_content_set(efl_part(ly, "element1"), bt));
42 ck_assert_ptr_eq(efl_parent_get(bt), ly); 42 ck_assert_ptr_eq(efl_parent_get(bt), ly);
43 43
@@ -47,7 +47,7 @@ START_TEST(elm_layout_swallows)
47 fail_if(!efl_content_set(efl_part(ly, "element1"), bt)); 47 fail_if(!efl_content_set(efl_part(ly, "element1"), bt));
48 ck_assert_ptr_eq(efl_parent_get(bt), ly); 48 ck_assert_ptr_eq(efl_parent_get(bt), ly);
49 49
50 bt2 = eo_add(ELM_BUTTON_CLASS, ly); 50 bt2 = efl_add(ELM_BUTTON_CLASS, ly);
51 fail_if(!efl_content_set(efl_part(ly, "element1"), bt2)); 51 fail_if(!efl_content_set(efl_part(ly, "element1"), bt2));
52 ck_assert_ptr_eq(efl_parent_get(bt2), ly); 52 ck_assert_ptr_eq(efl_parent_get(bt2), ly);
53 /* bt is deleted at this point. */ 53 /* bt is deleted at this point. */
diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c
index f3b7fea2d2..09944ee23c 100644
--- a/src/tests/elementary/elm_test_video.c
+++ b/src/tests/elementary/elm_test_video.c
@@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get)
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "video", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "video", ELM_WIN_BASIC);
17 17
18 video = elm_video_add(win); 18 video = elm_videfl_add(win);
19 role = elm_interface_atspi_accessible_role_get(video); 19 role = elm_interface_atspi_accessible_role_get(video);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_ANIMATION); 21 ck_assert(role == ELM_ATSPI_ROLE_ANIMATION);
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index 4bd7d30003..d861cefb58 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -157,7 +157,7 @@ START_TEST (elm_win_policy_quit_last_window_hidden)
157 visible = efl_gfx_visible_get(win); 157 visible = efl_gfx_visible_get(win);
158 158
159 ck_assert(fail_flag == EINA_FALSE); 159 ck_assert(fail_flag == EINA_FALSE);
160 ck_assert(eo_ref_get(win) >= 1); 160 ck_assert(efl_ref_get(win) >= 1);
161 ck_assert(visible == EINA_FALSE); 161 ck_assert(visible == EINA_FALSE);
162 162
163 elm_shutdown(); 163 elm_shutdown();
@@ -184,7 +184,7 @@ START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden)
184 visible = efl_gfx_visible_get(win); 184 visible = efl_gfx_visible_get(win);
185 185
186 ck_assert(fail_flag == EINA_FALSE); 186 ck_assert(fail_flag == EINA_FALSE);
187 ck_assert(eo_ref_get(win) >= 1); 187 ck_assert(efl_ref_get(win) >= 1);
188 ck_assert(visible == EINA_FALSE); 188 ck_assert(visible == EINA_FALSE);
189 189
190 elm_shutdown(); 190 elm_shutdown();
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");
diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c
index 825f1eb12a..0e5685bb8d 100644
--- a/src/tests/eo/access/access_inherit.c
+++ b/src/tests/eo/access/access_inherit.c
@@ -12,25 +12,25 @@
12static void 12static void
13_prot_print(Eo *obj, void *class_data EINA_UNUSED) 13_prot_print(Eo *obj, void *class_data EINA_UNUSED)
14{ 14{
15 Simple_Protected_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); 15 Simple_Protected_Data *pd = efl_data_scope_get(obj, SIMPLE_CLASS);
16 printf("%s %d\n", __func__, pd->protected_x1); 16 printf("%s %d\n", __func__, pd->protected_x1);
17} 17}
18 18
19EAPI EO_VOID_FUNC_BODY(inherit_prot_print); 19EAPI EFL_VOID_FUNC_BODY(inherit_prot_print);
20 20
21static Efl_Op_Description op_descs[] = { 21static Efl_Op_Description op_descs[] = {
22 EO_OP_FUNC(inherit_prot_print, _prot_print), 22 EFL_OBJECT_OP_FUNC(inherit_prot_print, _prot_print),
23}; 23};
24 24
25static const Efl_Class_Description class_desc = { 25static const Efl_Class_Description class_desc = {
26 EO_VERSION, 26 EO_VERSION,
27 "Inherit", 27 "Inherit",
28 EO_CLASS_TYPE_REGULAR, 28 EFL_CLASS_TYPE_REGULAR,
29 EO_CLASS_DESCRIPTION_OPS(op_descs), 29 EFL_CLASS_DESCRIPTION_OPS(op_descs),
30 NULL, 30 NULL,
31 0, 31 0,
32 NULL, 32 NULL,
33 NULL 33 NULL
34}; 34};
35 35
36EO_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, NULL) 36EFL_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, NULL)
diff --git a/src/tests/eo/access/access_main.c b/src/tests/eo/access/access_main.c
index d8d825bda2..1188a60694 100644
--- a/src/tests/eo/access/access_main.c
+++ b/src/tests/eo/access/access_main.c
@@ -11,18 +11,18 @@ main(int argc, char *argv[])
11{ 11{
12 (void) argc; 12 (void) argc;
13 (void) argv; 13 (void) argv;
14 eo_init(); 14 efl_object_init();
15 15
16 Eo *obj = eo_add(INHERIT_CLASS, NULL); 16 Eo *obj = efl_add(INHERIT_CLASS, NULL);
17 17
18 simple_a_set(obj, 1); 18 simple_a_set(obj, 1);
19 inherit_prot_print(obj); 19 inherit_prot_print(obj);
20 20
21 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); 21 Simple_Public_Data *pd = efl_data_scope_get(obj, SIMPLE_CLASS);
22 printf("Pub: %d\n", pd->public_x2); 22 printf("Pub: %d\n", pd->public_x2);
23 23
24 eo_unref(obj); 24 efl_unref(obj);
25 eo_shutdown(); 25 efl_object_shutdown();
26 return 0; 26 return 0;
27} 27}
28 28
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index 56cce70cd9..ed0c0195fb 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -30,10 +30,10 @@ _a_set(Eo *obj, void *class_data, int a)
30 efl_event_callback_call(obj, EV_A_CHANGED, &pd->a); 30 efl_event_callback_call(obj, EV_A_CHANGED, &pd->a);
31} 31}
32 32
33EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); 33EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
34 34
35static Efl_Op_Description op_descs[] = { 35static Efl_Op_Description op_descs[] = {
36 EO_OP_FUNC(simple_a_set, _a_set), 36 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
37}; 37};
38 38
39static const Efl_Event_Description *event_desc[] = { 39static const Efl_Event_Description *event_desc[] = {
@@ -44,13 +44,13 @@ static const Efl_Event_Description *event_desc[] = {
44static const Efl_Class_Description class_desc = { 44static const Efl_Class_Description class_desc = {
45 EO_VERSION, 45 EO_VERSION,
46 "Simple", 46 "Simple",
47 EO_CLASS_TYPE_REGULAR, 47 EFL_CLASS_TYPE_REGULAR,
48 EO_CLASS_DESCRIPTION_OPS(op_descs), 48 EFL_CLASS_DESCRIPTION_OPS(op_descs),
49 event_desc, 49 event_desc,
50 sizeof(Private_Data), 50 sizeof(Private_Data),
51 NULL, 51 NULL,
52 NULL 52 NULL
53}; 53};
54 54
55EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL) 55EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
56 56
diff --git a/src/tests/eo/children/children_main.c b/src/tests/eo/children/children_main.c
index 0034bd9840..e9292f2c90 100644
--- a/src/tests/eo/children/children_main.c
+++ b/src/tests/eo/children/children_main.c
@@ -20,13 +20,13 @@ main(int argc, char *argv[])
20 Eina_Iterator *iter = NULL; 20 Eina_Iterator *iter = NULL;
21 void *chld; 21 void *chld;
22 22
23 eo_init(); 23 efl_object_init();
24 24
25 Eo *parent = eo_add(SIMPLE_CLASS, NULL); 25 Eo *parent = efl_add(SIMPLE_CLASS, NULL);
26 26
27 Eo *child1 = eo_add(SIMPLE_CLASS, parent); 27 Eo *child1 = efl_add(SIMPLE_CLASS, parent);
28 Eo *child2 = eo_add(SIMPLE_CLASS, parent); 28 Eo *child2 = efl_add(SIMPLE_CLASS, parent);
29 Eo *child3 = eo_add(SIMPLE_CLASS, parent); 29 Eo *child3 = efl_add(SIMPLE_CLASS, parent);
30 30
31 iter = efl_children_iterator_new(parent); 31 iter = efl_children_iterator_new(parent);
32 fail_if(!iter); 32 fail_if(!iter);
@@ -67,8 +67,8 @@ main(int argc, char *argv[])
67 iter = efl_children_iterator_new(parent); 67 iter = efl_children_iterator_new(parent);
68 fail_if(iter); 68 fail_if(iter);
69 69
70 eo_unref(parent); 70 efl_unref(parent);
71 71
72 eo_shutdown(); 72 efl_object_shutdown();
73 return 0; 73 return 0;
74} 74}
diff --git a/src/tests/eo/children/children_simple.c b/src/tests/eo/children/children_simple.c
index c9f0c24cef..853381ffb7 100644
--- a/src/tests/eo/children/children_simple.c
+++ b/src/tests/eo/children/children_simple.c
@@ -10,13 +10,13 @@
10static const Efl_Class_Description class_desc = { 10static const Efl_Class_Description class_desc = {
11 EO_VERSION, 11 EO_VERSION,
12 "Simple", 12 "Simple",
13 EO_CLASS_TYPE_REGULAR, 13 EFL_CLASS_TYPE_REGULAR,
14 EO_CLASS_DESCRIPTION_NOOPS(), 14 EFL_CLASS_DESCRIPTION_NOOPS(),
15 NULL, 15 NULL,
16 0, 16 0,
17 NULL, 17 NULL,
18 NULL 18 NULL
19}; 19};
20 20
21EO_DEFINE_CLASS(simple_class_get, &class_desc, EFL_OBJECT_CLASS, NULL) 21EFL_DEFINE_CLASS(simple_class_get, &class_desc, EFL_OBJECT_CLASS, NULL)
22 22
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index bb64a12cb0..e51bf5db95 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -14,7 +14,7 @@ static int
14_a_get(Eo *obj, void *class_data EINA_UNUSED) 14_a_get(Eo *obj, void *class_data EINA_UNUSED)
15{ 15{
16 int a = 0; 16 int a = 0;
17 a = simple_a_get(eo_super(obj, MY_CLASS)); 17 a = simple_a_get(efl_super(obj, MY_CLASS));
18 18
19 return a; 19 return a;
20} 20}
@@ -22,9 +22,9 @@ _a_get(Eo *obj, void *class_data EINA_UNUSED)
22static Eo * 22static Eo *
23_constructor(Eo *obj, void *class_data EINA_UNUSED) 23_constructor(Eo *obj, void *class_data EINA_UNUSED)
24{ 24{
25 obj = efl_constructor(eo_super(obj, MY_CLASS)); 25 obj = efl_constructor(efl_super(obj, MY_CLASS));
26 26
27 Eo *simple = eo_add(SIMPLE_CLASS, obj); 27 Eo *simple = efl_add(SIMPLE_CLASS, obj);
28 efl_composite_attach(obj, simple); 28 efl_composite_attach(obj, simple);
29 efl_event_callback_forwarder_add(simple, EV_A_CHANGED, obj); 29 efl_event_callback_forwarder_add(simple, EV_A_CHANGED, obj);
30 30
@@ -37,21 +37,21 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
37} 37}
38 38
39static Efl_Op_Description op_descs[] = { 39static Efl_Op_Description op_descs[] = {
40 EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor), 40 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
41 EO_OP_FUNC_OVERRIDE(simple_a_get, _a_get), 41 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
42}; 42};
43 43
44static const Efl_Class_Description class_desc = { 44static const Efl_Class_Description class_desc = {
45 EO_VERSION, 45 EO_VERSION,
46 "Comp", 46 "Comp",
47 EO_CLASS_TYPE_REGULAR, 47 EFL_CLASS_TYPE_REGULAR,
48 EO_CLASS_DESCRIPTION_OPS(op_descs), 48 EFL_CLASS_DESCRIPTION_OPS(op_descs),
49 NULL, 49 NULL,
50 0, 50 0,
51 NULL, 51 NULL,
52 NULL 52 NULL
53}; 53};
54 54
55EO_DEFINE_CLASS(comp_class_get, &class_desc, EO_CLASS, 55EFL_DEFINE_CLASS(comp_class_get, &class_desc, EO_CLASS,
56 SIMPLE_CLASS, NULL); 56 SIMPLE_CLASS, NULL);
57 57
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index fae623855c..c37c851cd2 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -24,13 +24,13 @@ main(int argc, char *argv[])
24{ 24{
25 (void) argc; 25 (void) argc;
26 (void) argv; 26 (void) argv;
27 eo_init(); 27 efl_object_init();
28 28
29 Eo *obj = eo_add(COMP_CLASS, NULL); 29 Eo *obj = efl_add(COMP_CLASS, NULL);
30 efl_event_callback_add(obj, EV_A_CHANGED, _a_changed_cb, NULL); 30 efl_event_callback_add(obj, EV_A_CHANGED, _a_changed_cb, NULL);
31 31
32 fail_if(!eo_isa(obj, COMP_CLASS)); 32 fail_if(!efl_isa(obj, COMP_CLASS));
33 fail_if(!eo_isa(obj, SIMPLE_CLASS)); 33 fail_if(!efl_isa(obj, SIMPLE_CLASS));
34 34
35 int a = 0; 35 int a = 0;
36 cb_called = EINA_FALSE; 36 cb_called = EINA_FALSE;
@@ -54,7 +54,7 @@ main(int argc, char *argv[])
54 /* disable the callback forwarder, and fail if it's still called. */ 54 /* disable the callback forwarder, and fail if it's still called. */
55 Eo *simple = NULL; 55 Eo *simple = NULL;
56 simple = efl_key_data_get(obj, "simple-obj"); 56 simple = efl_key_data_get(obj, "simple-obj");
57 eo_ref(simple); 57 efl_ref(simple);
58 efl_event_callback_forwarder_del(simple, EV_A_CHANGED, obj); 58 efl_event_callback_forwarder_del(simple, EV_A_CHANGED, obj);
59 59
60 cb_called = EINA_FALSE; 60 cb_called = EINA_FALSE;
@@ -69,10 +69,10 @@ main(int argc, char *argv[])
69 fail_if(!efl_composite_part_is(simple)); 69 fail_if(!efl_composite_part_is(simple));
70 fail_if(efl_composite_attach(obj, simple)); 70 fail_if(efl_composite_attach(obj, simple));
71 71
72 eo_unref(simple); 72 efl_unref(simple);
73 eo_unref(obj); 73 efl_unref(obj);
74 74
75 eo_shutdown(); 75 efl_object_shutdown();
76 return 0; 76 return 0;
77} 77}
78 78
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index 13c8f6702a..520eaee61b 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -14,7 +14,7 @@ static void
14_a_set(Eo *obj, void *class_data, int a) 14_a_set(Eo *obj, void *class_data, int a)
15{ 15{
16 Simple_Public_Data *pd = class_data; 16 Simple_Public_Data *pd = class_data;
17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 17 printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
18 pd->a = a; 18 pd->a = a;
19 19
20 efl_event_callback_call(obj, EV_A_CHANGED, &pd->a); 20 efl_event_callback_call(obj, EV_A_CHANGED, &pd->a);
@@ -27,145 +27,145 @@ _a_get(Eo *obj EINA_UNUSED, void *class_data)
27 return pd->a; 27 return pd->a;
28} 28}
29 29
30EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); 30EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
31EAPI EO_FUNC_BODY(simple_a_get, int, 0); 31EAPI EFL_FUNC_BODY(simple_a_get, int, 0);
32 32
33EAPI EO_VOID_FUNC_BODYV(simple_a_set1, EO_FUNC_CALL(a), int a); 33EAPI EFL_VOID_FUNC_BODYV(simple_a_set1, EFL_FUNC_CALL(a), int a);
34EAPI EO_VOID_FUNC_BODYV(simple_a_set2, EO_FUNC_CALL(a), int a); 34EAPI EFL_VOID_FUNC_BODYV(simple_a_set2, EFL_FUNC_CALL(a), int a);
35EAPI EO_VOID_FUNC_BODYV(simple_a_set3, EO_FUNC_CALL(a), int a); 35EAPI EFL_VOID_FUNC_BODYV(simple_a_set3, EFL_FUNC_CALL(a), int a);
36EAPI EO_VOID_FUNC_BODYV(simple_a_set4, EO_FUNC_CALL(a), int a); 36EAPI EFL_VOID_FUNC_BODYV(simple_a_set4, EFL_FUNC_CALL(a), int a);
37EAPI EO_VOID_FUNC_BODYV(simple_a_set5, EO_FUNC_CALL(a), int a); 37EAPI EFL_VOID_FUNC_BODYV(simple_a_set5, EFL_FUNC_CALL(a), int a);
38EAPI EO_VOID_FUNC_BODYV(simple_a_set6, EO_FUNC_CALL(a), int a); 38EAPI EFL_VOID_FUNC_BODYV(simple_a_set6, EFL_FUNC_CALL(a), int a);
39EAPI EO_VOID_FUNC_BODYV(simple_a_set7, EO_FUNC_CALL(a), int a); 39EAPI EFL_VOID_FUNC_BODYV(simple_a_set7, EFL_FUNC_CALL(a), int a);
40EAPI EO_VOID_FUNC_BODYV(simple_a_set8, EO_FUNC_CALL(a), int a); 40EAPI EFL_VOID_FUNC_BODYV(simple_a_set8, EFL_FUNC_CALL(a), int a);
41EAPI EO_VOID_FUNC_BODYV(simple_a_set9, EO_FUNC_CALL(a), int a); 41EAPI EFL_VOID_FUNC_BODYV(simple_a_set9, EFL_FUNC_CALL(a), int a);
42EAPI EO_VOID_FUNC_BODYV(simple_a_set10, EO_FUNC_CALL(a), int a); 42EAPI EFL_VOID_FUNC_BODYV(simple_a_set10, EFL_FUNC_CALL(a), int a);
43EAPI EO_VOID_FUNC_BODYV(simple_a_set11, EO_FUNC_CALL(a), int a); 43EAPI EFL_VOID_FUNC_BODYV(simple_a_set11, EFL_FUNC_CALL(a), int a);
44EAPI EO_VOID_FUNC_BODYV(simple_a_set12, EO_FUNC_CALL(a), int a); 44EAPI EFL_VOID_FUNC_BODYV(simple_a_set12, EFL_FUNC_CALL(a), int a);
45EAPI EO_VOID_FUNC_BODYV(simple_a_set13, EO_FUNC_CALL(a), int a); 45EAPI EFL_VOID_FUNC_BODYV(simple_a_set13, EFL_FUNC_CALL(a), int a);
46EAPI EO_VOID_FUNC_BODYV(simple_a_set14, EO_FUNC_CALL(a), int a); 46EAPI EFL_VOID_FUNC_BODYV(simple_a_set14, EFL_FUNC_CALL(a), int a);
47EAPI EO_VOID_FUNC_BODYV(simple_a_set15, EO_FUNC_CALL(a), int a); 47EAPI EFL_VOID_FUNC_BODYV(simple_a_set15, EFL_FUNC_CALL(a), int a);
48EAPI EO_VOID_FUNC_BODYV(simple_a_set16, EO_FUNC_CALL(a), int a); 48EAPI EFL_VOID_FUNC_BODYV(simple_a_set16, EFL_FUNC_CALL(a), int a);
49EAPI EO_VOID_FUNC_BODYV(simple_a_set17, EO_FUNC_CALL(a), int a); 49EAPI EFL_VOID_FUNC_BODYV(simple_a_set17, EFL_FUNC_CALL(a), int a);
50EAPI EO_VOID_FUNC_BODYV(simple_a_set18, EO_FUNC_CALL(a), int a); 50EAPI EFL_VOID_FUNC_BODYV(simple_a_set18, EFL_FUNC_CALL(a), int a);
51EAPI EO_VOID_FUNC_BODYV(simple_a_set19, EO_FUNC_CALL(a), int a); 51EAPI EFL_VOID_FUNC_BODYV(simple_a_set19, EFL_FUNC_CALL(a), int a);
52EAPI EO_VOID_FUNC_BODYV(simple_a_set20, EO_FUNC_CALL(a), int a); 52EAPI EFL_VOID_FUNC_BODYV(simple_a_set20, EFL_FUNC_CALL(a), int a);
53EAPI EO_VOID_FUNC_BODYV(simple_a_set21, EO_FUNC_CALL(a), int a); 53EAPI EFL_VOID_FUNC_BODYV(simple_a_set21, EFL_FUNC_CALL(a), int a);
54EAPI EO_VOID_FUNC_BODYV(simple_a_set22, EO_FUNC_CALL(a), int a); 54EAPI EFL_VOID_FUNC_BODYV(simple_a_set22, EFL_FUNC_CALL(a), int a);
55EAPI EO_VOID_FUNC_BODYV(simple_a_set23, EO_FUNC_CALL(a), int a); 55EAPI EFL_VOID_FUNC_BODYV(simple_a_set23, EFL_FUNC_CALL(a), int a);
56EAPI EO_VOID_FUNC_BODYV(simple_a_set24, EO_FUNC_CALL(a), int a); 56EAPI EFL_VOID_FUNC_BODYV(simple_a_set24, EFL_FUNC_CALL(a), int a);
57EAPI EO_VOID_FUNC_BODYV(simple_a_set25, EO_FUNC_CALL(a), int a); 57EAPI EFL_VOID_FUNC_BODYV(simple_a_set25, EFL_FUNC_CALL(a), int a);
58EAPI EO_VOID_FUNC_BODYV(simple_a_set26, EO_FUNC_CALL(a), int a); 58EAPI EFL_VOID_FUNC_BODYV(simple_a_set26, EFL_FUNC_CALL(a), int a);
59EAPI EO_VOID_FUNC_BODYV(simple_a_set27, EO_FUNC_CALL(a), int a); 59EAPI EFL_VOID_FUNC_BODYV(simple_a_set27, EFL_FUNC_CALL(a), int a);
60EAPI EO_VOID_FUNC_BODYV(simple_a_set28, EO_FUNC_CALL(a), int a); 60EAPI EFL_VOID_FUNC_BODYV(simple_a_set28, EFL_FUNC_CALL(a), int a);
61EAPI EO_VOID_FUNC_BODYV(simple_a_set29, EO_FUNC_CALL(a), int a); 61EAPI EFL_VOID_FUNC_BODYV(simple_a_set29, EFL_FUNC_CALL(a), int a);
62EAPI EO_VOID_FUNC_BODYV(simple_a_set30, EO_FUNC_CALL(a), int a); 62EAPI EFL_VOID_FUNC_BODYV(simple_a_set30, EFL_FUNC_CALL(a), int a);
63EAPI EO_VOID_FUNC_BODYV(simple_a_set31, EO_FUNC_CALL(a), int a); 63EAPI EFL_VOID_FUNC_BODYV(simple_a_set31, EFL_FUNC_CALL(a), int a);
64EAPI EO_VOID_FUNC_BODYV(simple_a_set32, EO_FUNC_CALL(a), int a); 64EAPI EFL_VOID_FUNC_BODYV(simple_a_set32, EFL_FUNC_CALL(a), int a);
65EAPI EO_VOID_FUNC_BODYV(simple_a_get1, EO_FUNC_CALL(a), int a); 65EAPI EFL_VOID_FUNC_BODYV(simple_a_get1, EFL_FUNC_CALL(a), int a);
66EAPI EO_VOID_FUNC_BODYV(simple_a_get2, EO_FUNC_CALL(a), int a); 66EAPI EFL_VOID_FUNC_BODYV(simple_a_get2, EFL_FUNC_CALL(a), int a);
67EAPI EO_VOID_FUNC_BODYV(simple_a_get3, EO_FUNC_CALL(a), int a); 67EAPI EFL_VOID_FUNC_BODYV(simple_a_get3, EFL_FUNC_CALL(a), int a);
68EAPI EO_VOID_FUNC_BODYV(simple_a_get4, EO_FUNC_CALL(a), int a); 68EAPI EFL_VOID_FUNC_BODYV(simple_a_get4, EFL_FUNC_CALL(a), int a);
69EAPI EO_VOID_FUNC_BODYV(simple_a_get5, EO_FUNC_CALL(a), int a); 69EAPI EFL_VOID_FUNC_BODYV(simple_a_get5, EFL_FUNC_CALL(a), int a);
70EAPI EO_VOID_FUNC_BODYV(simple_a_get6, EO_FUNC_CALL(a), int a); 70EAPI EFL_VOID_FUNC_BODYV(simple_a_get6, EFL_FUNC_CALL(a), int a);
71EAPI EO_VOID_FUNC_BODYV(simple_a_get7, EO_FUNC_CALL(a), int a); 71EAPI EFL_VOID_FUNC_BODYV(simple_a_get7, EFL_FUNC_CALL(a), int a);
72EAPI EO_VOID_FUNC_BODYV(simple_a_get8, EO_FUNC_CALL(a), int a); 72EAPI EFL_VOID_FUNC_BODYV(simple_a_get8, EFL_FUNC_CALL(a), int a);
73EAPI EO_VOID_FUNC_BODYV(simple_a_get9, EO_FUNC_CALL(a), int a); 73EAPI EFL_VOID_FUNC_BODYV(simple_a_get9, EFL_FUNC_CALL(a), int a);
74EAPI EO_VOID_FUNC_BODYV(simple_a_get10, EO_FUNC_CALL(a), int a); 74EAPI EFL_VOID_FUNC_BODYV(simple_a_get10, EFL_FUNC_CALL(a), int a);
75EAPI EO_VOID_FUNC_BODYV(simple_a_get11, EO_FUNC_CALL(a), int a); 75EAPI EFL_VOID_FUNC_BODYV(simple_a_get11, EFL_FUNC_CALL(a), int a);
76EAPI EO_VOID_FUNC_BODYV(simple_a_get12, EO_FUNC_CALL(a), int a); 76EAPI EFL_VOID_FUNC_BODYV(simple_a_get12, EFL_FUNC_CALL(a), int a);
77EAPI EO_VOID_FUNC_BODYV(simple_a_get13, EO_FUNC_CALL(a), int a); 77EAPI EFL_VOID_FUNC_BODYV(simple_a_get13, EFL_FUNC_CALL(a), int a);
78EAPI EO_VOID_FUNC_BODYV(simple_a_get14, EO_FUNC_CALL(a), int a); 78EAPI EFL_VOID_FUNC_BODYV(simple_a_get14, EFL_FUNC_CALL(a), int a);
79EAPI EO_VOID_FUNC_BODYV(simple_a_get15, EO_FUNC_CALL(a), int a); 79EAPI EFL_VOID_FUNC_BODYV(simple_a_get15, EFL_FUNC_CALL(a), int a);
80EAPI EO_VOID_FUNC_BODYV(simple_a_get16, EO_FUNC_CALL(a), int a); 80EAPI EFL_VOID_FUNC_BODYV(simple_a_get16, EFL_FUNC_CALL(a), int a);
81EAPI EO_VOID_FUNC_BODYV(simple_a_get17, EO_FUNC_CALL(a), int a); 81EAPI EFL_VOID_FUNC_BODYV(simple_a_get17, EFL_FUNC_CALL(a), int a);
82EAPI EO_VOID_FUNC_BODYV(simple_a_get18, EO_FUNC_CALL(a), int a); 82EAPI EFL_VOID_FUNC_BODYV(simple_a_get18, EFL_FUNC_CALL(a), int a);
83EAPI EO_VOID_FUNC_BODYV(simple_a_get19, EO_FUNC_CALL(a), int a); 83EAPI EFL_VOID_FUNC_BODYV(simple_a_get19, EFL_FUNC_CALL(a), int a);
84EAPI EO_VOID_FUNC_BODYV(simple_a_get20, EO_FUNC_CALL(a), int a); 84EAPI EFL_VOID_FUNC_BODYV(simple_a_get20, EFL_FUNC_CALL(a), int a);
85EAPI EO_VOID_FUNC_BODYV(simple_a_get21, EO_FUNC_CALL(a), int a); 85EAPI EFL_VOID_FUNC_BODYV(simple_a_get21, EFL_FUNC_CALL(a), int a);
86EAPI EO_VOID_FUNC_BODYV(simple_a_get22, EO_FUNC_CALL(a), int a); 86EAPI EFL_VOID_FUNC_BODYV(simple_a_get22, EFL_FUNC_CALL(a), int a);
87EAPI EO_VOID_FUNC_BODYV(simple_a_get23, EO_FUNC_CALL(a), int a); 87EAPI EFL_VOID_FUNC_BODYV(simple_a_get23, EFL_FUNC_CALL(a), int a);
88EAPI EO_VOID_FUNC_BODYV(simple_a_get24, EO_FUNC_CALL(a), int a); 88EAPI EFL_VOID_FUNC_BODYV(simple_a_get24, EFL_FUNC_CALL(a), int a);
89EAPI EO_VOID_FUNC_BODYV(simple_a_get25, EO_FUNC_CALL(a), int a); 89EAPI EFL_VOID_FUNC_BODYV(simple_a_get25, EFL_FUNC_CALL(a), int a);
90EAPI EO_VOID_FUNC_BODYV(simple_a_get26, EO_FUNC_CALL(a), int a); 90EAPI EFL_VOID_FUNC_BODYV(simple_a_get26, EFL_FUNC_CALL(a), int a);
91EAPI EO_VOID_FUNC_BODYV(simple_a_get27, EO_FUNC_CALL(a), int a); 91EAPI EFL_VOID_FUNC_BODYV(simple_a_get27, EFL_FUNC_CALL(a), int a);
92EAPI EO_VOID_FUNC_BODYV(simple_a_get28, EO_FUNC_CALL(a), int a); 92EAPI EFL_VOID_FUNC_BODYV(simple_a_get28, EFL_FUNC_CALL(a), int a);
93EAPI EO_VOID_FUNC_BODYV(simple_a_get29, EO_FUNC_CALL(a), int a); 93EAPI EFL_VOID_FUNC_BODYV(simple_a_get29, EFL_FUNC_CALL(a), int a);
94EAPI EO_VOID_FUNC_BODYV(simple_a_get30, EO_FUNC_CALL(a), int a); 94EAPI EFL_VOID_FUNC_BODYV(simple_a_get30, EFL_FUNC_CALL(a), int a);
95EAPI EO_VOID_FUNC_BODYV(simple_a_get31, EO_FUNC_CALL(a), int a); 95EAPI EFL_VOID_FUNC_BODYV(simple_a_get31, EFL_FUNC_CALL(a), int a);
96EAPI EO_VOID_FUNC_BODYV(simple_a_get32, EO_FUNC_CALL(a), int a); 96EAPI EFL_VOID_FUNC_BODYV(simple_a_get32, EFL_FUNC_CALL(a), int a);
97 97
98/* XXX: This is fragile, and emulates many IDs in order to go to the next 98/* XXX: This is fragile, and emulates many IDs in order to go to the next
99 * op id chain (assuming chain size is as it is at the moment, 32). 99 * op id chain (assuming chain size is as it is at the moment, 32).
100 * This is needed in order to properly test some edge cases (see commit message 100 * This is needed in order to properly test some edge cases (see commit message
101 * for more info). */ 101 * for more info). */
102static Efl_Op_Description op_descs[] = { 102static Efl_Op_Description op_descs[] = {
103 EO_OP_FUNC(simple_a_set1, _a_set), 103 EFL_OBJECT_OP_FUNC(simple_a_set1, _a_set),
104 EO_OP_FUNC(simple_a_set2, _a_set), 104 EFL_OBJECT_OP_FUNC(simple_a_set2, _a_set),
105 EO_OP_FUNC(simple_a_set3, _a_set), 105 EFL_OBJECT_OP_FUNC(simple_a_set3, _a_set),
106 EO_OP_FUNC(simple_a_set4, _a_set), 106 EFL_OBJECT_OP_FUNC(simple_a_set4, _a_set),
107 EO_OP_FUNC(simple_a_set5, _a_set), 107 EFL_OBJECT_OP_FUNC(simple_a_set5, _a_set),
108 EO_OP_FUNC(simple_a_set6, _a_set), 108 EFL_OBJECT_OP_FUNC(simple_a_set6, _a_set),
109 EO_OP_FUNC(simple_a_set7, _a_set), 109 EFL_OBJECT_OP_FUNC(simple_a_set7, _a_set),
110 EO_OP_FUNC(simple_a_set8, _a_set), 110 EFL_OBJECT_OP_FUNC(simple_a_set8, _a_set),
111 EO_OP_FUNC(simple_a_set9, _a_set), 111 EFL_OBJECT_OP_FUNC(simple_a_set9, _a_set),
112 EO_OP_FUNC(simple_a_set10, _a_set), 112 EFL_OBJECT_OP_FUNC(simple_a_set10, _a_set),
113 EO_OP_FUNC(simple_a_set11, _a_set), 113 EFL_OBJECT_OP_FUNC(simple_a_set11, _a_set),
114 EO_OP_FUNC(simple_a_set12, _a_set), 114 EFL_OBJECT_OP_FUNC(simple_a_set12, _a_set),
115 EO_OP_FUNC(simple_a_set13, _a_set), 115 EFL_OBJECT_OP_FUNC(simple_a_set13, _a_set),
116 EO_OP_FUNC(simple_a_set14, _a_set), 116 EFL_OBJECT_OP_FUNC(simple_a_set14, _a_set),
117 EO_OP_FUNC(simple_a_set15, _a_set), 117 EFL_OBJECT_OP_FUNC(simple_a_set15, _a_set),
118 EO_OP_FUNC(simple_a_set16, _a_set), 118 EFL_OBJECT_OP_FUNC(simple_a_set16, _a_set),
119 EO_OP_FUNC(simple_a_set17, _a_set), 119 EFL_OBJECT_OP_FUNC(simple_a_set17, _a_set),
120 EO_OP_FUNC(simple_a_set18, _a_set), 120 EFL_OBJECT_OP_FUNC(simple_a_set18, _a_set),
121 EO_OP_FUNC(simple_a_set19, _a_set), 121 EFL_OBJECT_OP_FUNC(simple_a_set19, _a_set),
122 EO_OP_FUNC(simple_a_set20, _a_set), 122 EFL_OBJECT_OP_FUNC(simple_a_set20, _a_set),
123 EO_OP_FUNC(simple_a_set21, _a_set), 123 EFL_OBJECT_OP_FUNC(simple_a_set21, _a_set),
124 EO_OP_FUNC(simple_a_set22, _a_set), 124 EFL_OBJECT_OP_FUNC(simple_a_set22, _a_set),
125 EO_OP_FUNC(simple_a_set23, _a_set), 125 EFL_OBJECT_OP_FUNC(simple_a_set23, _a_set),
126 EO_OP_FUNC(simple_a_set24, _a_set), 126 EFL_OBJECT_OP_FUNC(simple_a_set24, _a_set),
127 EO_OP_FUNC(simple_a_set25, _a_set), 127 EFL_OBJECT_OP_FUNC(simple_a_set25, _a_set),
128 EO_OP_FUNC(simple_a_set26, _a_set), 128 EFL_OBJECT_OP_FUNC(simple_a_set26, _a_set),
129 EO_OP_FUNC(simple_a_set27, _a_set), 129 EFL_OBJECT_OP_FUNC(simple_a_set27, _a_set),
130 EO_OP_FUNC(simple_a_set28, _a_set), 130 EFL_OBJECT_OP_FUNC(simple_a_set28, _a_set),
131 EO_OP_FUNC(simple_a_set29, _a_set), 131 EFL_OBJECT_OP_FUNC(simple_a_set29, _a_set),
132 EO_OP_FUNC(simple_a_set30, _a_set), 132 EFL_OBJECT_OP_FUNC(simple_a_set30, _a_set),
133 EO_OP_FUNC(simple_a_set31, _a_set), 133 EFL_OBJECT_OP_FUNC(simple_a_set31, _a_set),
134 EO_OP_FUNC(simple_a_set32, _a_set), 134 EFL_OBJECT_OP_FUNC(simple_a_set32, _a_set),
135 EO_OP_FUNC(simple_a_get1, _a_get), 135 EFL_OBJECT_OP_FUNC(simple_a_get1, _a_get),
136 EO_OP_FUNC(simple_a_get2, _a_get), 136 EFL_OBJECT_OP_FUNC(simple_a_get2, _a_get),
137 EO_OP_FUNC(simple_a_get3, _a_get), 137 EFL_OBJECT_OP_FUNC(simple_a_get3, _a_get),
138 EO_OP_FUNC(simple_a_get4, _a_get), 138 EFL_OBJECT_OP_FUNC(simple_a_get4, _a_get),
139 EO_OP_FUNC(simple_a_get5, _a_get), 139 EFL_OBJECT_OP_FUNC(simple_a_get5, _a_get),
140 EO_OP_FUNC(simple_a_get6, _a_get), 140 EFL_OBJECT_OP_FUNC(simple_a_get6, _a_get),
141 EO_OP_FUNC(simple_a_get7, _a_get), 141 EFL_OBJECT_OP_FUNC(simple_a_get7, _a_get),
142 EO_OP_FUNC(simple_a_get8, _a_get), 142 EFL_OBJECT_OP_FUNC(simple_a_get8, _a_get),
143 EO_OP_FUNC(simple_a_get9, _a_get), 143 EFL_OBJECT_OP_FUNC(simple_a_get9, _a_get),
144 EO_OP_FUNC(simple_a_get10, _a_get), 144 EFL_OBJECT_OP_FUNC(simple_a_get10, _a_get),
145 EO_OP_FUNC(simple_a_get11, _a_get), 145 EFL_OBJECT_OP_FUNC(simple_a_get11, _a_get),
146 EO_OP_FUNC(simple_a_get12, _a_get), 146 EFL_OBJECT_OP_FUNC(simple_a_get12, _a_get),
147 EO_OP_FUNC(simple_a_get13, _a_get), 147 EFL_OBJECT_OP_FUNC(simple_a_get13, _a_get),
148 EO_OP_FUNC(simple_a_get14, _a_get), 148 EFL_OBJECT_OP_FUNC(simple_a_get14, _a_get),
149 EO_OP_FUNC(simple_a_get15, _a_get), 149 EFL_OBJECT_OP_FUNC(simple_a_get15, _a_get),
150 EO_OP_FUNC(simple_a_get16, _a_get), 150 EFL_OBJECT_OP_FUNC(simple_a_get16, _a_get),
151 EO_OP_FUNC(simple_a_get17, _a_get), 151 EFL_OBJECT_OP_FUNC(simple_a_get17, _a_get),
152 EO_OP_FUNC(simple_a_get18, _a_get), 152 EFL_OBJECT_OP_FUNC(simple_a_get18, _a_get),
153 EO_OP_FUNC(simple_a_get19, _a_get), 153 EFL_OBJECT_OP_FUNC(simple_a_get19, _a_get),
154 EO_OP_FUNC(simple_a_get20, _a_get), 154 EFL_OBJECT_OP_FUNC(simple_a_get20, _a_get),
155 EO_OP_FUNC(simple_a_get21, _a_get), 155 EFL_OBJECT_OP_FUNC(simple_a_get21, _a_get),
156 EO_OP_FUNC(simple_a_get22, _a_get), 156 EFL_OBJECT_OP_FUNC(simple_a_get22, _a_get),
157 EO_OP_FUNC(simple_a_get23, _a_get), 157 EFL_OBJECT_OP_FUNC(simple_a_get23, _a_get),
158 EO_OP_FUNC(simple_a_get24, _a_get), 158 EFL_OBJECT_OP_FUNC(simple_a_get24, _a_get),
159 EO_OP_FUNC(simple_a_get25, _a_get), 159 EFL_OBJECT_OP_FUNC(simple_a_get25, _a_get),
160 EO_OP_FUNC(simple_a_get26, _a_get), 160 EFL_OBJECT_OP_FUNC(simple_a_get26, _a_get),
161 EO_OP_FUNC(simple_a_get27, _a_get), 161 EFL_OBJECT_OP_FUNC(simple_a_get27, _a_get),
162 EO_OP_FUNC(simple_a_get28, _a_get), 162 EFL_OBJECT_OP_FUNC(simple_a_get28, _a_get),
163 EO_OP_FUNC(simple_a_get29, _a_get), 163 EFL_OBJECT_OP_FUNC(simple_a_get29, _a_get),
164 EO_OP_FUNC(simple_a_get30, _a_get), 164 EFL_OBJECT_OP_FUNC(simple_a_get30, _a_get),
165 EO_OP_FUNC(simple_a_get31, _a_get), 165 EFL_OBJECT_OP_FUNC(simple_a_get31, _a_get),
166 EO_OP_FUNC(simple_a_get32, _a_get), 166 EFL_OBJECT_OP_FUNC(simple_a_get32, _a_get),
167 EO_OP_FUNC(simple_a_set, _a_set), 167 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
168 EO_OP_FUNC(simple_a_get, _a_get), 168 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
169}; 169};
170 170
171static const Efl_Event_Description *event_desc[] = { 171static const Efl_Event_Description *event_desc[] = {
@@ -176,13 +176,13 @@ static const Efl_Event_Description *event_desc[] = {
176static const Efl_Class_Description class_desc = { 176static const Efl_Class_Description class_desc = {
177 EO_VERSION, 177 EO_VERSION,
178 "Simple", 178 "Simple",
179 EO_CLASS_TYPE_REGULAR, 179 EFL_CLASS_TYPE_REGULAR,
180 EO_CLASS_DESCRIPTION_OPS(op_descs), 180 EFL_CLASS_DESCRIPTION_OPS(op_descs),
181 event_desc, 181 event_desc,
182 sizeof(Simple_Public_Data), 182 sizeof(Simple_Public_Data),
183 NULL, 183 NULL,
184 NULL 184 NULL
185}; 185};
186 186
187EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL); 187EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
188 188
diff --git a/src/tests/eo/constructors/constructors_main.c b/src/tests/eo/constructors/constructors_main.c
index 45cd50dfb9..ffda7793db 100644
--- a/src/tests/eo/constructors/constructors_main.c
+++ b/src/tests/eo/constructors/constructors_main.c
@@ -22,9 +22,9 @@ main(int argc, char *argv[])
22 int ret = 0; 22 int ret = 0;
23 (void) argc; 23 (void) argc;
24 (void) argv; 24 (void) argv;
25 eo_init(); 25 efl_object_init();
26 26
27 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 27 Eo *obj = efl_add(SIMPLE_CLASS, NULL);
28 28
29 fail_if(my_init_count != 2); 29 fail_if(my_init_count != 2);
30 30
@@ -38,59 +38,59 @@ main(int argc, char *argv[])
38 fail_if(a != 1); 38 fail_if(a != 1);
39 fail_if(b != 2); 39 fail_if(b != 2);
40 40
41 eo_unref(obj); 41 efl_unref(obj);
42 42
43 fail_if(my_init_count != 0); 43 fail_if(my_init_count != 0);
44 44
45 obj = eo_add(SIMPLE2_CLASS, NULL); 45 obj = efl_add(SIMPLE2_CLASS, NULL);
46 fail_if(obj); 46 fail_if(obj);
47 47
48 obj = eo_add(SIMPLE3_CLASS, NULL); 48 obj = efl_add(SIMPLE3_CLASS, NULL);
49 fail_if(obj); 49 fail_if(obj);
50 50
51 my_init_count = 0; 51 my_init_count = 0;
52 obj = eo_add(SIMPLE4_CLASS, NULL); 52 obj = efl_add(SIMPLE4_CLASS, NULL);
53 53
54 fail_if(my_init_count != 2); 54 fail_if(my_init_count != 2);
55 55
56 eo_unref(obj); 56 efl_unref(obj);
57 57
58 fail_if(my_init_count != 0); 58 fail_if(my_init_count != 0);
59 59
60 obj = eo_add(SIMPLE5_CLASS, NULL); 60 obj = efl_add(SIMPLE5_CLASS, NULL);
61 fail_if(!obj); 61 fail_if(!obj);
62 eo_unref(obj); 62 efl_unref(obj);
63 63
64 obj = eo_add(SIMPLE6_CLASS, NULL); 64 obj = efl_add(SIMPLE6_CLASS, NULL);
65 fail_if(!obj); 65 fail_if(!obj);
66 eo_unref(obj); 66 efl_unref(obj);
67 67
68 obj = eo_add(SIMPLE7_CLASS, NULL); 68 obj = efl_add(SIMPLE7_CLASS, NULL);
69 fail_if(obj); 69 fail_if(obj);
70 70
71 my_init_count = 0; 71 my_init_count = 0;
72 obj = eo_add(SIMPLE_CLASS, NULL); 72 obj = efl_add(SIMPLE_CLASS, NULL);
73 fail_if(!obj); 73 fail_if(!obj);
74 fail_if(my_init_count != 2); 74 fail_if(my_init_count != 2);
75 a = simple_a_get(obj); 75 a = simple_a_get(obj);
76 fail_if(a != 0); 76 fail_if(a != 0);
77 77
78 my_init_count = 0; 78 my_init_count = 0;
79 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eo_self, 7)); 79 obj = efl_add(SIMPLE_CLASS, NULL, simple_a_set(efl_self, 7));
80 fail_if(!obj); 80 fail_if(!obj);
81 fail_if(my_init_count != 2); 81 fail_if(my_init_count != 2);
82 a = simple_a_get(obj); 82 a = simple_a_get(obj);
83 fail_if(a != 7); 83 fail_if(a != 7);
84 84
85 my_init_count = 0; 85 my_init_count = 0;
86 obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(eo_self, 6), simple_a_set(eo_self, -1), b = simple_b_get(eo_self)); 86 obj = efl_add(SIMPLE_CLASS, NULL, simple_b_set(efl_self, 6), simple_a_set(efl_self, -1), b = simple_b_get(efl_self));
87 fail_if(obj); 87 fail_if(obj);
88 fail_if(b != 6); 88 fail_if(b != 6);
89 fail_if(my_init_count != 0); 89 fail_if(my_init_count != 0);
90 90
91 eo_unref(obj); 91 efl_unref(obj);
92 92
93 eo_shutdown(); 93 efl_object_shutdown();
94 return ret; 94 return ret;
95} 95}
96 96
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 1ce5a1c263..417958941e 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -24,35 +24,35 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
24{ 24{
25 my_init_count++; 25 my_init_count++;
26 26
27 return efl_constructor(eo_super(obj, MY_CLASS)); 27 return efl_constructor(efl_super(obj, MY_CLASS));
28} 28}
29 29
30static void 30static void
31_destructor(Eo *obj, void *class_data EINA_UNUSED) 31_destructor(Eo *obj, void *class_data EINA_UNUSED)
32{ 32{
33 efl_destructor(eo_super(obj, MY_CLASS)); 33 efl_destructor(efl_super(obj, MY_CLASS));
34 34
35 my_init_count--; 35 my_init_count--;
36} 36}
37 37
38EAPI EO_VOID_FUNC_BODYV(mixin_add_and_print, EO_FUNC_CALL(x), int x); 38EAPI EFL_VOID_FUNC_BODYV(mixin_add_and_print, EFL_FUNC_CALL(x), int x);
39 39
40static Efl_Op_Description op_descs[] = { 40static Efl_Op_Description op_descs[] = {
41 EO_OP_FUNC(mixin_add_and_print, _add_and_print_set), 41 EFL_OBJECT_OP_FUNC(mixin_add_and_print, _add_and_print_set),
42 EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor), 42 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
43 EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor), 43 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
44}; 44};
45 45
46static const Efl_Class_Description class_desc = { 46static const Efl_Class_Description class_desc = {
47 EO_VERSION, 47 EO_VERSION,
48 "Mixin", 48 "Mixin",
49 EO_CLASS_TYPE_MIXIN, 49 EFL_CLASS_TYPE_MIXIN,
50 EO_CLASS_DESCRIPTION_OPS(op_descs), 50 EFL_CLASS_DESCRIPTION_OPS(op_descs),
51 NULL, 51 NULL,
52 0, 52 0,
53 NULL, 53 NULL,
54 NULL 54 NULL
55}; 55};
56 56
57EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL); 57EFL_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL);
58 58
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index a5a0732eae..6d12ef9fb8 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -31,8 +31,8 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
31 pd->name = name; \ 31 pd->name = name; \
32 printf("%s %d\n", __func__, pd->name); \ 32 printf("%s %d\n", __func__, pd->name); \
33} \ 33} \
34EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \ 34EFL_VOID_FUNC_BODYV(simple_##name##_set, EFL_FUNC_CALL(name), int name); \
35EO_FUNC_BODY(simple_##name##_get, int, 0); 35EFL_FUNC_BODY(simple_##name##_get, int, 0);
36 36
37_GET_SET_FUNC(a) 37_GET_SET_FUNC(a)
38_GET_SET_FUNC(b) 38_GET_SET_FUNC(b)
@@ -44,7 +44,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
44{ 44{
45 my_init_count++; 45 my_init_count++;
46 46
47 return efl_constructor(eo_super(obj, MY_CLASS)); 47 return efl_constructor(efl_super(obj, MY_CLASS));
48} 48}
49 49
50static Eo* 50static Eo*
@@ -53,7 +53,7 @@ _finalize(Eo *obj, void *class_data EINA_UNUSED)
53 Eo *ret; 53 Eo *ret;
54 Private_Data *pd = class_data; 54 Private_Data *pd = class_data;
55 55
56 ret = efl_finalize(eo_super(obj, MY_CLASS)); 56 ret = efl_finalize(efl_super(obj, MY_CLASS));
57 57
58 if (pd->a < 0) 58 if (pd->a < 0)
59 { 59 {
@@ -66,7 +66,7 @@ _finalize(Eo *obj, void *class_data EINA_UNUSED)
66static void 66static void
67_destructor(Eo *obj, void *class_data EINA_UNUSED) 67_destructor(Eo *obj, void *class_data EINA_UNUSED)
68{ 68{
69 efl_destructor(eo_super(obj, MY_CLASS)); 69 efl_destructor(efl_super(obj, MY_CLASS));
70 70
71 my_init_count--; 71 my_init_count--;
72} 72}
@@ -83,29 +83,29 @@ _class_destructor(Efl_Class *klass EINA_UNUSED)
83 free(class_var); 83 free(class_var);
84} 84}
85 85
86EO_VOID_FUNC_BODYV(simple_constructor, EO_FUNC_CALL(a), int a); 86EFL_VOID_FUNC_BODYV(simple_constructor, EFL_FUNC_CALL(a), int a);
87 87
88static Efl_Op_Description op_descs[] = { 88static Efl_Op_Description op_descs[] = {
89 EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor), 89 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
90 EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor), 90 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
91 EO_OP_FUNC_OVERRIDE(efl_finalize, _finalize), 91 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_finalize, _finalize),
92 EO_OP_FUNC(simple_a_set, _a_set), 92 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
93 EO_OP_FUNC(simple_a_get, _a_get), 93 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
94 EO_OP_FUNC(simple_b_set, _b_set), 94 EFL_OBJECT_OP_FUNC(simple_b_set, _b_set),
95 EO_OP_FUNC(simple_b_get, _b_get), 95 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
96}; 96};
97 97
98static const Efl_Class_Description class_desc = { 98static const Efl_Class_Description class_desc = {
99 EO_VERSION, 99 EO_VERSION,
100 "Simple", 100 "Simple",
101 EO_CLASS_TYPE_REGULAR, 101 EFL_CLASS_TYPE_REGULAR,
102 EO_CLASS_DESCRIPTION_OPS(op_descs), 102 EFL_CLASS_DESCRIPTION_OPS(op_descs),
103 NULL, 103 NULL,
104 sizeof(Private_Data), 104 sizeof(Private_Data),
105 _class_constructor, 105 _class_constructor,
106 _class_destructor 106 _class_destructor
107}; 107};
108 108
109EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, 109EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS,
110 MIXIN_CLASS, NULL); 110 MIXIN_CLASS, NULL);
111 111
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index 4e2c02cbc4..a7b7eb986d 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -11,25 +11,25 @@
11static Eo * 11static Eo *
12_constructor(Eo *obj, void *class_data EINA_UNUSED) 12_constructor(Eo *obj, void *class_data EINA_UNUSED)
13{ 13{
14 obj = efl_constructor(eo_super(obj, MY_CLASS)); 14 obj = efl_constructor(efl_super(obj, MY_CLASS));
15 15
16 return NULL; 16 return NULL;
17} 17}
18 18
19static Efl_Op_Description op_descs[] = { 19static Efl_Op_Description op_descs[] = {
20 EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor), 20 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
21}; 21};
22 22
23static const Efl_Class_Description class_desc = { 23static const Efl_Class_Description class_desc = {
24 EO_VERSION, 24 EO_VERSION,
25 "Simple2", 25 "Simple2",
26 EO_CLASS_TYPE_REGULAR, 26 EFL_CLASS_TYPE_REGULAR,
27 EO_CLASS_DESCRIPTION_OPS(op_descs), 27 EFL_CLASS_DESCRIPTION_OPS(op_descs),
28 NULL, 28 NULL,
29 0, 29 0,
30 NULL, 30 NULL,
31 NULL 31 NULL
32}; 32};
33 33
34EO_DEFINE_CLASS(simple2_class_get, &class_desc, EO_CLASS, NULL); 34EFL_DEFINE_CLASS(simple2_class_get, &class_desc, EO_CLASS, NULL);
35 35
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index bfde816a7d..a6e09606d1 100644
--- a/src/tests/eo/constructors/constructors_simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -15,19 +15,19 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
15} 15}
16 16
17static Efl_Op_Description op_descs[] = { 17static Efl_Op_Description op_descs[] = {
18 EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor), 18 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
19}; 19};
20 20
21static const Efl_Class_Description class_desc = { 21static const Efl_Class_Description class_desc = {
22 EO_VERSION, 22 EO_VERSION,
23 "Simple3", 23 "Simple3",
24 EO_CLASS_TYPE_REGULAR, 24 EFL_CLASS_TYPE_REGULAR,
25 EO_CLASS_DESCRIPTION_OPS(op_descs), 25 EFL_CLASS_DESCRIPTION_OPS(op_descs),
26 NULL, 26 NULL,
27 0, 27 0,
28 NULL, 28 NULL,
29 NULL 29 NULL
30}; 30};
31 31
32EO_DEFINE_CLASS(simple3_class_get, &class_desc, EO_CLASS, NULL); 32EFL_DEFINE_CLASS(simple3_class_get, &class_desc, EO_CLASS, NULL);
33 33
diff --git a/src/tests/eo/constructors/constructors_simple4.c b/src/tests/eo/constructors/constructors_simple4.c
index ca1389404a..e71cc9b5e5 100644
--- a/src/tests/eo/constructors/constructors_simple4.c
+++ b/src/tests/eo/constructors/constructors_simple4.c
@@ -12,13 +12,13 @@
12static const Efl_Class_Description class_desc = { 12static const Efl_Class_Description class_desc = {
13 EO_VERSION, 13 EO_VERSION,
14 "Simple4", 14 "Simple4",
15 EO_CLASS_TYPE_REGULAR, 15 EFL_CLASS_TYPE_REGULAR,
16 EO_CLASS_DESCRIPTION_NOOPS(), 16 EFL_CLASS_DESCRIPTION_NOOPS(),
17 NULL, 17 NULL,
18 0, 18 0,
19 NULL, 19 NULL,
20 NULL 20 NULL
21}; 21};
22 22
23EO_DEFINE_CLASS(simple4_class_get, &class_desc, SIMPLE_CLASS, MIXIN_CLASS, NULL); 23EFL_DEFINE_CLASS(simple4_class_get, &class_desc, SIMPLE_CLASS, MIXIN_CLASS, NULL);
24 24
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index 2881f782f4..b47f05b588 100644
--- a/src/tests/eo/constructors/constructors_simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -15,19 +15,19 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
15} 15}
16 16
17static Efl_Op_Description op_descs[] = { 17static Efl_Op_Description op_descs[] = {
18 EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor), 18 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
19}; 19};
20 20
21static const Efl_Class_Description class_desc = { 21static const Efl_Class_Description class_desc = {
22 EO_VERSION, 22 EO_VERSION,
23 "Simple5", 23 "Simple5",
24 EO_CLASS_TYPE_REGULAR, 24 EFL_CLASS_TYPE_REGULAR,
25 EO_CLASS_DESCRIPTION_OPS(op_descs), 25 EFL_CLASS_DESCRIPTION_OPS(op_descs),
26 NULL, 26 NULL,
27 0, 27 0,
28 NULL, 28 NULL,
29 NULL 29 NULL
30}; 30};
31 31
32EO_DEFINE_CLASS(simple5_class_get, &class_desc, EO_CLASS, NULL); 32EFL_DEFINE_CLASS(simple5_class_get, &class_desc, EO_CLASS, NULL);
33 33
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index ff1dcf47ed..7b41275938 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -11,23 +11,23 @@
11static void 11static void
12_destructor(Eo *obj, void *class_data EINA_UNUSED) 12_destructor(Eo *obj, void *class_data EINA_UNUSED)
13{ 13{
14 efl_destructor(eo_super(obj, MY_CLASS)); 14 efl_destructor(efl_super(obj, MY_CLASS));
15} 15}
16 16
17static Efl_Op_Description op_descs [] = { 17static Efl_Op_Description op_descs [] = {
18 EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor), 18 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
19}; 19};
20 20
21static const Efl_Class_Description class_desc = { 21static const Efl_Class_Description class_desc = {
22 EO_VERSION, 22 EO_VERSION,
23 "Simple6", 23 "Simple6",
24 EO_CLASS_TYPE_REGULAR, 24 EFL_CLASS_TYPE_REGULAR,
25 EO_CLASS_DESCRIPTION_OPS(op_descs), 25 EFL_CLASS_DESCRIPTION_OPS(op_descs),
26 NULL, 26 NULL,
27 0, 27 0,
28 NULL, 28 NULL,
29 NULL 29 NULL
30}; 30};
31 31
32EO_DEFINE_CLASS(simple6_class_get, &class_desc, EO_CLASS, NULL); 32EFL_DEFINE_CLASS(simple6_class_get, &class_desc, EO_CLASS, NULL);
33 33
diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c
index 5f3f0af074..b01987fd86 100644
--- a/src/tests/eo/constructors/constructors_simple7.c
+++ b/src/tests/eo/constructors/constructors_simple7.c
@@ -15,23 +15,23 @@ static Eo *
15_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 15_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
16{ 16{
17 /* FIXME: Actually test it. */ 17 /* FIXME: Actually test it. */
18 return efl_constructor(eo_super(obj, MY_CLASS)); 18 return efl_constructor(efl_super(obj, MY_CLASS));
19} 19}
20 20
21static Efl_Op_Description op_descs [] = { 21static Efl_Op_Description op_descs [] = {
22 EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor), 22 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
23}; 23};
24 24
25static const Efl_Class_Description class_desc = { 25static const Efl_Class_Description class_desc = {
26 EO_VERSION, 26 EO_VERSION,
27 "Simple7", 27 "Simple7",
28 EO_CLASS_TYPE_REGULAR, 28 EFL_CLASS_TYPE_REGULAR,
29 EO_CLASS_DESCRIPTION_OPS(op_descs), 29 EFL_CLASS_DESCRIPTION_OPS(op_descs),
30 NULL, 30 NULL,
31 0, 31 0,
32 NULL, 32 NULL,
33 NULL 33 NULL
34}; 34};
35 35
36EO_DEFINE_CLASS(simple7_class_get, &class_desc, SIMPLE2_CLASS, NULL); 36EFL_DEFINE_CLASS(simple7_class_get, &class_desc, SIMPLE2_CLASS, NULL);
37 37
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit.c b/src/tests/eo/function_overrides/function_overrides_inherit.c
index 845515128c..a473a89f3e 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit.c
@@ -11,12 +11,12 @@
11static const Efl_Class_Description class_desc = { 11static const Efl_Class_Description class_desc = {
12 EO_VERSION, 12 EO_VERSION,
13 "Inherit", 13 "Inherit",
14 EO_CLASS_TYPE_REGULAR, 14 EFL_CLASS_TYPE_REGULAR,
15 EO_CLASS_DESCRIPTION_NOOPS(), 15 EFL_CLASS_DESCRIPTION_NOOPS(),
16 NULL, 16 NULL,
17 0, 17 0,
18 NULL, 18 NULL,
19 NULL 19 NULL
20}; 20};
21 21
22EO_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, NULL); 22EFL_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, NULL);
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index 26e92e5212..7bae304b4c 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -14,12 +14,12 @@
14static void 14static void
15_a_set(Eo *obj, void *class_data EINA_UNUSED, int a) 15_a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
16{ 16{
17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 17 printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
18 simple_a_print(obj); 18 simple_a_print(obj);
19 simple_a_set(eo_super(obj, MY_CLASS), a + 1); 19 simple_a_set(efl_super(obj, MY_CLASS), a + 1);
20 20
21 Eina_Bool called = EINA_FALSE; 21 Eina_Bool called = EINA_FALSE;
22 called = simple_a_print(eo_super(obj, MY_CLASS)); 22 called = simple_a_print(efl_super(obj, MY_CLASS));
23 fail_if(!called); 23 fail_if(!called);
24} 24}
25 25
@@ -28,7 +28,7 @@ _print(Eo *obj, void *class_data EINA_UNUSED)
28{ 28{
29 Eina_Bool called = EINA_FALSE; 29 Eina_Bool called = EINA_FALSE;
30 printf("Hey\n"); 30 printf("Hey\n");
31 called = inherit2_print(eo_super(obj, MY_CLASS)); 31 called = inherit2_print(efl_super(obj, MY_CLASS));
32 fail_if(called); 32 fail_if(called);
33 33
34 return EINA_TRUE; 34 return EINA_TRUE;
@@ -46,36 +46,36 @@ static Eina_Bool
46_class_print(Efl_Class *klass, void *data EINA_UNUSED) 46_class_print(Efl_Class *klass, void *data EINA_UNUSED)
47{ 47{
48 Eina_Bool called = EINA_FALSE; 48 Eina_Bool called = EINA_FALSE;
49 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 49 printf("Print %s-%s\n", efl_class_name_get(klass), efl_class_name_get(MY_CLASS));
50 called = simple_class_print(eo_super(klass, MY_CLASS)); 50 called = simple_class_print(efl_super(klass, MY_CLASS));
51 fail_if(!called); 51 fail_if(!called);
52 52
53 called = simple_class_print2(eo_super(klass, MY_CLASS)); 53 called = simple_class_print2(efl_super(klass, MY_CLASS));
54 fail_if(!called); 54 fail_if(!called);
55 55
56 return EINA_TRUE; 56 return EINA_TRUE;
57} 57}
58 58
59EAPI EO_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE); 59EAPI EFL_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
60EAPI EO_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE); 60EAPI EFL_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
61 61
62static Efl_Op_Description op_descs[] = { 62static Efl_Op_Description op_descs[] = {
63 EO_OP_FUNC(inherit2_print, _print), 63 EFL_OBJECT_OP_FUNC(inherit2_print, _print),
64 EO_OP_FUNC(inherit2_print2, _print2), 64 EFL_OBJECT_OP_FUNC(inherit2_print2, _print2),
65 EO_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print), 65 EFL_OBJECT_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print),
66 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 66 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
67}; 67};
68 68
69static const Efl_Class_Description class_desc = { 69static const Efl_Class_Description class_desc = {
70 EO_VERSION, 70 EO_VERSION,
71 "Inherit2", 71 "Inherit2",
72 EO_CLASS_TYPE_REGULAR, 72 EFL_CLASS_TYPE_REGULAR,
73 EO_CLASS_DESCRIPTION_OPS(op_descs), 73 EFL_CLASS_DESCRIPTION_OPS(op_descs),
74 NULL, 74 NULL,
75 0, 75 0,
76 NULL, 76 NULL,
77 NULL 77 NULL
78}; 78};
79 79
80EO_DEFINE_CLASS(inherit2_class_get, &class_desc, INHERIT_CLASS, NULL); 80EFL_DEFINE_CLASS(inherit2_class_get, &class_desc, INHERIT_CLASS, NULL);
81 81
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index 3f09b19e78..2a66926f2d 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -12,24 +12,24 @@
12static void 12static void
13_a_set(Eo *obj, void *class_data EINA_UNUSED, int a) 13_a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
14{ 14{
15 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 15 printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
16 simple_a_set(eo_super(obj, MY_CLASS), a + 1); 16 simple_a_set(efl_super(obj, MY_CLASS), a + 1);
17} 17}
18 18
19static Efl_Op_Description op_descs[] = { 19static Efl_Op_Description op_descs[] = {
20 EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set), 20 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
21}; 21};
22 22
23static const Efl_Class_Description class_desc = { 23static const Efl_Class_Description class_desc = {
24 EO_VERSION, 24 EO_VERSION,
25 "Inherit3", 25 "Inherit3",
26 EO_CLASS_TYPE_REGULAR, 26 EFL_CLASS_TYPE_REGULAR,
27 EO_CLASS_DESCRIPTION_OPS(op_descs), 27 EFL_CLASS_DESCRIPTION_OPS(op_descs),
28 NULL, 28 NULL,
29 0, 29 0,
30 NULL, 30 NULL,
31 NULL 31 NULL
32}; 32};
33 33
34EO_DEFINE_CLASS(inherit3_class_get, &class_desc, INHERIT2_CLASS, NULL); 34EFL_DEFINE_CLASS(inherit3_class_get, &class_desc, INHERIT2_CLASS, NULL);
35 35
diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c
index d5fc195d23..091af5ebe1 100644
--- a/src/tests/eo/function_overrides/function_overrides_main.c
+++ b/src/tests/eo/function_overrides/function_overrides_main.c
@@ -15,34 +15,34 @@ main(int argc, char *argv[])
15{ 15{
16 (void) argc; 16 (void) argc;
17 (void) argv; 17 (void) argv;
18 eo_init(); 18 efl_object_init();
19 19
20 Eina_Bool called = EINA_FALSE; 20 Eina_Bool called = EINA_FALSE;
21 Eo *obj = eo_add(INHERIT2_CLASS, NULL); 21 Eo *obj = efl_add(INHERIT2_CLASS, NULL);
22 22
23 simple_a_set(obj, 1); 23 simple_a_set(obj, 1);
24 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); 24 Simple_Public_Data *pd = efl_data_scope_get(obj, SIMPLE_CLASS);
25 fail_if(pd->a != 2); 25 fail_if(pd->a != 2);
26 26
27 eo_unref(obj); 27 efl_unref(obj);
28 28
29 obj = eo_add(INHERIT3_CLASS, NULL); 29 obj = efl_add(INHERIT3_CLASS, NULL);
30 30
31 simple_a_set(obj, 1); 31 simple_a_set(obj, 1);
32 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 32 pd = efl_data_scope_get(obj, SIMPLE_CLASS);
33 fail_if(pd->a != 3); 33 fail_if(pd->a != 3);
34 34
35 eo_unref(obj); 35 efl_unref(obj);
36 36
37 obj = eo_add(INHERIT2_CLASS, NULL); 37 obj = efl_add(INHERIT2_CLASS, NULL);
38 called = inherit2_print(obj); 38 called = inherit2_print(obj);
39 fail_if(!called); 39 fail_if(!called);
40 called = inherit2_print(obj); 40 called = inherit2_print(obj);
41 called = inherit2_print(obj); 41 called = inherit2_print(obj);
42 fail_if(!called); 42 fail_if(!called);
43 eo_unref(obj); 43 efl_unref(obj);
44 44
45 obj = eo_add(SIMPLE_CLASS, NULL); 45 obj = efl_add(SIMPLE_CLASS, NULL);
46 called = inherit2_print(obj); 46 called = inherit2_print(obj);
47 fail_if(called); 47 fail_if(called);
48 48
@@ -68,12 +68,12 @@ main(int argc, char *argv[])
68 fail_if(called); 68 fail_if(called);
69#endif 69#endif
70 70
71 efl_constructor(eo_super(obj, SIMPLE_CLASS)); 71 efl_constructor(efl_super(obj, SIMPLE_CLASS));
72 efl_destructor(eo_super(obj, SIMPLE_CLASS)); 72 efl_destructor(efl_super(obj, SIMPLE_CLASS));
73 73
74 eo_unref(obj); 74 efl_unref(obj);
75 75
76 eo_shutdown(); 76 efl_object_shutdown();
77 return 0; 77 return 0;
78} 78}
79 79
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index dbdd935a10..45d19d2838 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -16,7 +16,7 @@ static void
16_a_set(Eo *obj EINA_UNUSED, void *class_data, int a) 16_a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
17{ 17{
18 Simple_Public_Data *pd = class_data; 18 Simple_Public_Data *pd = class_data;
19 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 19 printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
20 pd->a = a; 20 pd->a = a;
21} 21}
22 22
@@ -24,7 +24,7 @@ static Eina_Bool
24_a_print(Eo *obj EINA_UNUSED, void *class_data) 24_a_print(Eo *obj EINA_UNUSED, void *class_data)
25{ 25{
26 Simple_Public_Data *pd = class_data; 26 Simple_Public_Data *pd = class_data;
27 printf("Print %s %d\n", eo_class_name_get(MY_CLASS), pd->a); 27 printf("Print %s %d\n", efl_class_name_get(MY_CLASS), pd->a);
28 28
29 return EINA_TRUE; 29 return EINA_TRUE;
30} 30}
@@ -32,12 +32,12 @@ _a_print(Eo *obj EINA_UNUSED, void *class_data)
32static Eina_Bool 32static Eina_Bool
33_class_print(Efl_Class *klass, void *class_data EINA_UNUSED) 33_class_print(Efl_Class *klass, void *class_data EINA_UNUSED)
34{ 34{
35 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 35 printf("Print %s-%s\n", efl_class_name_get(klass), efl_class_name_get(MY_CLASS));
36 Eina_Bool called = EINA_FALSE; 36 Eina_Bool called = EINA_FALSE;
37 called = simple_class_print(eo_super(klass, MY_CLASS)); 37 called = simple_class_print(efl_super(klass, MY_CLASS));
38 fail_if(called); 38 fail_if(called);
39 39
40 called = simple_class_print2(eo_super(klass, MY_CLASS)); 40 called = simple_class_print2(efl_super(klass, MY_CLASS));
41 fail_if(called); 41 fail_if(called);
42 42
43 return EINA_TRUE; 43 return EINA_TRUE;
@@ -46,33 +46,33 @@ _class_print(Efl_Class *klass, void *class_data EINA_UNUSED)
46static Eina_Bool 46static Eina_Bool
47_class_print2(Efl_Class *klass, void *class_data EINA_UNUSED) 47_class_print2(Efl_Class *klass, void *class_data EINA_UNUSED)
48{ 48{
49 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 49 printf("Print %s-%s\n", efl_class_name_get(klass), efl_class_name_get(MY_CLASS));
50 50
51 return EINA_TRUE; 51 return EINA_TRUE;
52} 52}
53 53
54EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); 54EAPI EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
55EAPI EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE); 55EAPI EFL_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
56EAPI EO_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE); 56EAPI EFL_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE);
57EAPI EO_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE); 57EAPI EFL_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE);
58 58
59static Efl_Op_Description op_descs[] = { 59static Efl_Op_Description op_descs[] = {
60 EO_OP_FUNC(simple_a_set, _a_set), 60 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
61 EO_OP_FUNC(simple_a_print, _a_print), 61 EFL_OBJECT_OP_FUNC(simple_a_print, _a_print),
62 EO_OP_FUNC(simple_class_print, _class_print), 62 EFL_OBJECT_OP_FUNC(simple_class_print, _class_print),
63 EO_OP_FUNC(simple_class_print2, _class_print2), 63 EFL_OBJECT_OP_FUNC(simple_class_print2, _class_print2),
64}; 64};
65 65
66static const Efl_Class_Description class_desc = { 66static const Efl_Class_Description class_desc = {
67 EO_VERSION, 67 EO_VERSION,
68 "Simple", 68 "Simple",
69 EO_CLASS_TYPE_REGULAR, 69 EFL_CLASS_TYPE_REGULAR,
70 EO_CLASS_DESCRIPTION_OPS(op_descs), 70 EFL_CLASS_DESCRIPTION_OPS(op_descs),
71 NULL, 71 NULL,
72 sizeof(Simple_Public_Data), 72 sizeof(Simple_Public_Data),
73 NULL, 73 NULL,
74 NULL 74 NULL
75}; 75};
76 76
77EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL); 77EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL);
78 78
diff --git a/src/tests/eo/interface/interface_interface.c b/src/tests/eo/interface/interface_interface.c
index b730e749c6..9c699ecad0 100644
--- a/src/tests/eo/interface/interface_interface.c
+++ b/src/tests/eo/interface/interface_interface.c
@@ -8,22 +8,22 @@
8 8
9#define MY_CLASS INTERFACE_CLASS 9#define MY_CLASS INTERFACE_CLASS
10 10
11EO_FUNC_BODY(interface_ab_sum_get, int, 0); 11EFL_FUNC_BODY(interface_ab_sum_get, int, 0);
12 12
13static Efl_Op_Description op_descs[] = { 13static Efl_Op_Description op_descs[] = {
14 EO_OP_FUNC(interface_ab_sum_get, NULL), 14 EFL_OBJECT_OP_FUNC(interface_ab_sum_get, NULL),
15}; 15};
16 16
17static const Efl_Class_Description class_desc = { 17static const Efl_Class_Description class_desc = {
18 EO_VERSION, 18 EO_VERSION,
19 "Interface", 19 "Interface",
20 EO_CLASS_TYPE_INTERFACE, 20 EFL_CLASS_TYPE_INTERFACE,
21 EO_CLASS_DESCRIPTION_OPS(op_descs), 21 EFL_CLASS_DESCRIPTION_OPS(op_descs),
22 NULL, 22 NULL,
23 0, 23 0,
24 NULL, 24 NULL,
25 NULL 25 NULL
26}; 26};
27 27
28EO_DEFINE_CLASS(interface_class_get, &class_desc, NULL, NULL) 28EFL_DEFINE_CLASS(interface_class_get, &class_desc, NULL, NULL)
29 29
diff --git a/src/tests/eo/interface/interface_interface2.c b/src/tests/eo/interface/interface_interface2.c
index 78dbd644f4..ed0f6c219c 100644
--- a/src/tests/eo/interface/interface_interface2.c
+++ b/src/tests/eo/interface/interface_interface2.c
@@ -9,22 +9,22 @@
9 9
10#define MY_CLASS INTERFACE2_CLASS 10#define MY_CLASS INTERFACE2_CLASS
11 11
12EO_FUNC_BODY(interface2_ab_sum_get2, int, 0); 12EFL_FUNC_BODY(interface2_ab_sum_get2, int, 0);
13 13
14static Efl_Op_Description op_descs[] = { 14static Efl_Op_Description op_descs[] = {
15 EO_OP_FUNC(interface2_ab_sum_get2, NULL), 15 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, NULL),
16}; 16};
17 17
18static const Efl_Class_Description class_desc = { 18static const Efl_Class_Description class_desc = {
19 EO_VERSION, 19 EO_VERSION,
20 "Interface2", 20 "Interface2",
21 EO_CLASS_TYPE_INTERFACE, 21 EFL_CLASS_TYPE_INTERFACE,
22 EO_CLASS_DESCRIPTION_OPS(op_descs), 22 EFL_CLASS_DESCRIPTION_OPS(op_descs),
23 NULL, 23 NULL,
24 0, 24 0,
25 NULL, 25 NULL,
26 NULL 26 NULL
27}; 27};
28 28
29EO_DEFINE_CLASS(interface2_class_get, &class_desc, INTERFACE_CLASS, NULL) 29EFL_DEFINE_CLASS(interface2_class_get, &class_desc, INTERFACE_CLASS, NULL)
30 30
diff --git a/src/tests/eo/interface/interface_main.c b/src/tests/eo/interface/interface_main.c
index a85f030963..e9e145bd75 100644
--- a/src/tests/eo/interface/interface_main.c
+++ b/src/tests/eo/interface/interface_main.c
@@ -14,9 +14,9 @@ main(int argc, char *argv[])
14{ 14{
15 (void) argc; 15 (void) argc;
16 (void) argv; 16 (void) argv;
17 eo_init(); 17 efl_object_init();
18 18
19 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 19 Eo *obj = efl_add(SIMPLE_CLASS, NULL);
20 20
21 simple_a_set(obj, 1); 21 simple_a_set(obj, 1);
22 simple_b_set(obj, 2); 22 simple_b_set(obj, 2);
@@ -35,8 +35,8 @@ main(int argc, char *argv[])
35 sum = interface2_ab_sum_get2(obj); 35 sum = interface2_ab_sum_get2(obj);
36 fail_if(sum != a + b + 1); 36 fail_if(sum != a + b + 1);
37 37
38 eo_unref(obj); 38 efl_unref(obj);
39 eo_shutdown(); 39 efl_object_shutdown();
40 return 0; 40 return 0;
41} 41}
42 42
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index 902c094754..f13f1b7a23 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -30,8 +30,8 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
30 pd->name = name; \ 30 pd->name = name; \
31 printf("%s %d\n", __func__, pd->name); \ 31 printf("%s %d\n", __func__, pd->name); \
32} \ 32} \
33EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \ 33EFL_VOID_FUNC_BODYV(simple_##name##_set, EFL_FUNC_CALL(name), int name); \
34EO_FUNC_BODY(simple_##name##_get, int, 0); 34EFL_FUNC_BODY(simple_##name##_get, int, 0);
35 35
36_GET_SET_FUNC(a) 36_GET_SET_FUNC(a)
37_GET_SET_FUNC(b) 37_GET_SET_FUNC(b)
@@ -42,7 +42,7 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
42 int a = 0, b = 0; 42 int a = 0, b = 0;
43 a = simple_a_get(obj); 43 a = simple_a_get(obj);
44 b = simple_b_get(obj); 44 b = simple_b_get(obj);
45 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 45 printf("%s %s\n", efl_class_name_get(MY_CLASS), __func__);
46 return a + b; 46 return a + b;
47} 47}
48 48
@@ -52,28 +52,28 @@ _ab_sum_get2(Eo *obj, void *class_data EINA_UNUSED)
52 int a = 0, b = 0; 52 int a = 0, b = 0;
53 a = simple_a_get(obj); 53 a = simple_a_get(obj);
54 b = simple_b_get(obj); 54 b = simple_b_get(obj);
55 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 55 printf("%s %s\n", efl_class_name_get(MY_CLASS), __func__);
56 return a + b + 1; 56 return a + b + 1;
57} 57}
58 58
59static Efl_Op_Description op_descs[] = { 59static Efl_Op_Description op_descs[] = {
60 EO_OP_FUNC(simple_a_set, _a_set), 60 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
61 EO_OP_FUNC(simple_a_get, _a_get), 61 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
62 EO_OP_FUNC(simple_b_set, _b_set), 62 EFL_OBJECT_OP_FUNC(simple_b_set, _b_set),
63 EO_OP_FUNC(simple_b_get, _b_get), 63 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
64 EO_OP_FUNC_OVERRIDE(interface_ab_sum_get, _ab_sum_get), 64 EFL_OBJECT_OP_FUNC_OVERRIDE(interface_ab_sum_get, _ab_sum_get),
65 EO_OP_FUNC_OVERRIDE(interface2_ab_sum_get2, _ab_sum_get2), 65 EFL_OBJECT_OP_FUNC_OVERRIDE(interface2_ab_sum_get2, _ab_sum_get2),
66}; 66};
67 67
68static const Efl_Class_Description class_desc = { 68static const Efl_Class_Description class_desc = {
69 EO_VERSION, 69 EO_VERSION,
70 "Simple", 70 "Simple",
71 EO_CLASS_TYPE_REGULAR, 71 EFL_CLASS_TYPE_REGULAR,
72 EO_CLASS_DESCRIPTION_OPS(op_descs), 72 EFL_CLASS_DESCRIPTION_OPS(op_descs),
73 NULL, 73 NULL,
74 sizeof(Private_Data), 74 sizeof(Private_Data),
75 NULL, 75 NULL,
76 NULL 76 NULL
77}; 77};
78 78
79EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, INTERFACE2_CLASS, NULL); 79EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, INTERFACE2_CLASS, NULL);
diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c
index e3936653ea..f363bf7774 100644
--- a/src/tests/eo/mixin/mixin_inherit.c
+++ b/src/tests/eo/mixin/mixin_inherit.c
@@ -13,25 +13,25 @@ static int
13_a_get(Eo *obj, void *class_data EINA_UNUSED) 13_a_get(Eo *obj, void *class_data EINA_UNUSED)
14{ 14{
15 int ret = 0; 15 int ret = 0;
16 ret = simple_a_get(eo_super(obj, MY_CLASS)); 16 ret = simple_a_get(efl_super(obj, MY_CLASS));
17 printf("%s %d\n", __func__, ret); 17 printf("%s %d\n", __func__, ret);
18 18
19 return ret; 19 return ret;
20} 20}
21 21
22static Efl_Op_Description op_descs[] = { 22static Efl_Op_Description op_descs[] = {
23 EO_OP_FUNC_OVERRIDE(simple_a_get, _a_get), 23 EFL_OBJECT_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
24}; 24};
25 25
26static const Efl_Class_Description class_desc = { 26static const Efl_Class_Description class_desc = {
27 EO_VERSION, 27 EO_VERSION,
28 "Inherit", 28 "Inherit",
29 EO_CLASS_TYPE_REGULAR, 29 EFL_CLASS_TYPE_REGULAR,
30 EO_CLASS_DESCRIPTION_OPS(op_descs), 30 EFL_CLASS_DESCRIPTION_OPS(op_descs),
31 NULL, 31 NULL,
32 0, 32 0,
33 NULL, 33 NULL,
34 NULL 34 NULL
35}; 35};
36 36
37EO_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, MIXIN4_CLASS, NULL); 37EFL_DEFINE_CLASS(inherit_class_get, &class_desc, SIMPLE_CLASS, MIXIN4_CLASS, NULL);
diff --git a/src/tests/eo/mixin/mixin_main.c b/src/tests/eo/mixin/mixin_main.c
index d3c1dbf2ac..f3534cc7ed 100644
--- a/src/tests/eo/mixin/mixin_main.c
+++ b/src/tests/eo/mixin/mixin_main.c
@@ -16,9 +16,9 @@ main(int argc, char *argv[])
16{ 16{
17 (void) argc; 17 (void) argc;
18 (void) argv; 18 (void) argv;
19 eo_init(); 19 efl_object_init();
20 20
21 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 21 Eo *obj = efl_add(SIMPLE_CLASS, NULL);
22 22
23 simple_a_set(obj, 1); 23 simple_a_set(obj, 1);
24 simple_b_set(obj, 2); 24 simple_b_set(obj, 2);
@@ -32,22 +32,22 @@ main(int argc, char *argv[])
32 sum = mixin_ab_sum_get(obj); 32 sum = mixin_ab_sum_get(obj);
33 sum = mixin_ab_sum_get(obj); 33 sum = mixin_ab_sum_get(obj);
34 34
35 Mixin2_Public_Data *pd2 = eo_data_scope_get(obj, MIXIN2_CLASS); 35 Mixin2_Public_Data *pd2 = efl_data_scope_get(obj, MIXIN2_CLASS);
36 fail_if(pd2->count != 6); 36 fail_if(pd2->count != 6);
37 37
38 Mixin3_Public_Data *pd3 = eo_data_scope_get(obj, MIXIN3_CLASS); 38 Mixin3_Public_Data *pd3 = efl_data_scope_get(obj, MIXIN3_CLASS);
39 fail_if(pd3->count != 9); 39 fail_if(pd3->count != 9);
40 40
41 eo_unref(obj); 41 efl_unref(obj);
42 42
43 obj = eo_add(INHERIT_CLASS, NULL); 43 obj = efl_add(INHERIT_CLASS, NULL);
44 simple_a_set(obj, 5); 44 simple_a_set(obj, 5);
45 a = simple_a_get(obj); 45 a = simple_a_get(obj);
46 printf("%d\n", a); 46 printf("%d\n", a);
47 fail_if(a != 5); 47 fail_if(a != 5);
48 48
49 eo_unref(obj); 49 efl_unref(obj);
50 eo_shutdown(); 50 efl_object_shutdown();
51 return 0; 51 return 0;
52} 52}
53 53
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index 191b5ec0e2..a79c5e5910 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -14,40 +14,40 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
14 int a = 0, b = 0; 14 int a = 0, b = 0;
15 a = simple_a_get(obj); 15 a = simple_a_get(obj);
16 b = simple_b_get(obj); 16 b = simple_b_get(obj);
17 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 17 printf("%s %s\n", efl_class_name_get(MY_CLASS), __func__);
18 return a + b; 18 return a + b;
19} 19}
20 20
21static Eo * 21static Eo *
22_constructor(Eo *obj, void *class_data EINA_UNUSED) 22_constructor(Eo *obj, void *class_data EINA_UNUSED)
23{ 23{
24 return efl_constructor(eo_super(obj, MY_CLASS)); 24 return efl_constructor(efl_super(obj, MY_CLASS));
25} 25}
26 26
27static void 27static void
28_destructor(Eo *obj, void *class_data EINA_UNUSED) 28_destructor(Eo *obj, void *class_data EINA_UNUSED)
29{ 29{
30 efl_destructor(eo_super(obj, MY_CLASS)); 30 efl_destructor(efl_super(obj, MY_CLASS));
31} 31}
32 32
33EAPI EO_FUNC_BODY(mixin_ab_sum_get, int, 0); 33EAPI EFL_FUNC_BODY(mixin_ab_sum_get, int, 0);
34 34
35static Efl_Op_Description op_descs[] = { 35static Efl_Op_Description op_descs[] = {
36 EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor), 36 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
37 EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor), 37 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
38 EO_OP_FUNC(mixin_ab_sum_get, _ab_sum_get), 38 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
39}; 39};
40 40
41static const Efl_Class_Description class_desc = { 41static const Efl_Class_Description class_desc = {
42 EO_VERSION, 42 EO_VERSION,
43 "Mixin", 43 "Mixin",
44 EO_CLASS_TYPE_MIXIN, 44 EFL_CLASS_TYPE_MIXIN,
45 EO_CLASS_DESCRIPTION_OPS(op_descs), 45 EFL_CLASS_DESCRIPTION_OPS(op_descs),
46 NULL, 46 NULL,
47 0, 47 0,
48 NULL, 48 NULL,
49 NULL 49 NULL
50}; 50};
51 51
52EO_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL) 52EFL_DEFINE_CLASS(mixin_class_get, &class_desc, NULL, EO_CLASS, NULL)
53 53
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index f4f49f6d7a..8c1c60404c 100644
--- a/src/tests/eo/mixin/mixin_mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -17,8 +17,8 @@ _ab_sum_get(Eo *obj, void *class_data)
17 /* This cast is a hack just for the tests... */ 17 /* This cast is a hack just for the tests... */
18 Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data; 18 Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data;
19 int sum = 0; 19 int sum = 0;
20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 20 printf("%s %s\n", efl_class_name_get(MY_CLASS), __func__);
21 sum = mixin_ab_sum_get(eo_super(obj, MY_CLASS)); 21 sum = mixin_ab_sum_get(efl_super(obj, MY_CLASS));
22 22
23 ++sum; 23 ++sum;
24 pd->count += 2; 24 pd->count += 2;
@@ -36,32 +36,32 @@ _ab_sum_get(Eo *obj, void *class_data)
36static Eo * 36static Eo *
37_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 37_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
38{ 38{
39 obj = efl_constructor(eo_super(obj, MY_CLASS)); 39 obj = efl_constructor(efl_super(obj, MY_CLASS));
40 return obj; 40 return obj;
41} 41}
42 42
43static void 43static void
44_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 44_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
45{ 45{
46 efl_destructor(eo_super(obj, MY_CLASS)); 46 efl_destructor(efl_super(obj, MY_CLASS));
47} 47}
48 48
49static Efl_Op_Description op_descs[] = { 49static Efl_Op_Description op_descs[] = {
50 EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor), 50 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
51 EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor), 51 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
52 EO_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get), 52 EFL_OBJECT_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
53}; 53};
54 54
55static const Efl_Class_Description class_desc = { 55static const Efl_Class_Description class_desc = {
56 EO_VERSION, 56 EO_VERSION,
57 "Mixin2", 57 "Mixin2",
58 EO_CLASS_TYPE_MIXIN, 58 EFL_CLASS_TYPE_MIXIN,
59 EO_CLASS_DESCRIPTION_OPS(op_descs), 59 EFL_CLASS_DESCRIPTION_OPS(op_descs),
60 NULL, 60 NULL,
61 sizeof(Mixin2_Public_Data), 61 sizeof(Mixin2_Public_Data),
62 NULL, 62 NULL,
63 NULL 63 NULL
64}; 64};
65 65
66EO_DEFINE_CLASS(mixin2_class_get, &class_desc, MIXIN_CLASS, NULL); 66EFL_DEFINE_CLASS(mixin2_class_get, &class_desc, MIXIN_CLASS, NULL);
67 67
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c
index d98b8c87f6..5a29e9d3ae 100644
--- a/src/tests/eo/mixin/mixin_mixin3.c
+++ b/src/tests/eo/mixin/mixin_mixin3.c
@@ -17,8 +17,8 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
17 /* This cast is just a hack for the test. */ 17 /* This cast is just a hack for the test. */
18 Mixin3_Public_Data *pd = (Mixin3_Public_Data *) class_data; 18 Mixin3_Public_Data *pd = (Mixin3_Public_Data *) class_data;
19 int sum = 0; 19 int sum = 0;
20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 20 printf("%s %s\n", efl_class_name_get(MY_CLASS), __func__);
21 sum = mixin_ab_sum_get(eo_super(obj, MY_CLASS)); 21 sum = mixin_ab_sum_get(efl_super(obj, MY_CLASS));
22 22
23 ++sum; 23 ++sum;
24 pd->count += 3; 24 pd->count += 3;
@@ -36,31 +36,31 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
36static Eo * 36static Eo *
37_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 37_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
38{ 38{
39 return efl_constructor(eo_super(obj, MY_CLASS)); 39 return efl_constructor(efl_super(obj, MY_CLASS));
40} 40}
41 41
42static void 42static void
43_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 43_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
44{ 44{
45 efl_destructor(eo_super(obj, MY_CLASS)); 45 efl_destructor(efl_super(obj, MY_CLASS));
46} 46}
47 47
48static Efl_Op_Description op_descs[] = { 48static Efl_Op_Description op_descs[] = {
49 EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor), 49 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor),
50 EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor), 50 EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor),
51 EO_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get), 51 EFL_OBJECT_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
52}; 52};
53 53
54static const Efl_Class_Description class_desc = { 54static const Efl_Class_Description class_desc = {
55 EO_VERSION, 55 EO_VERSION,
56 "Mixin3", 56 "Mixin3",
57 EO_CLASS_TYPE_MIXIN, 57 EFL_CLASS_TYPE_MIXIN,
58 EO_CLASS_DESCRIPTION_OPS(op_descs), 58 EFL_CLASS_DESCRIPTION_OPS(op_descs),
59 NULL, 59 NULL,
60 sizeof(Mixin3_Public_Data), 60 sizeof(Mixin3_Public_Data),
61 NULL, 61 NULL,
62 NULL 62 NULL
63}; 63};
64 64
65EO_DEFINE_CLASS(mixin3_class_get, &class_desc, MIXIN_CLASS, NULL); 65EFL_DEFINE_CLASS(mixin3_class_get, &class_desc, MIXIN_CLASS, NULL);
66 66
diff --git a/src/tests/eo/mixin/mixin_mixin4.c b/src/tests/eo/mixin/mixin_mixin4.c
index 7a2eaea77d..cfe41c0e20 100644
--- a/src/tests/eo/mixin/mixin_mixin4.c
+++ b/src/tests/eo/mixin/mixin_mixin4.c
@@ -14,13 +14,13 @@
14static const Efl_Class_Description class_desc = { 14static const Efl_Class_Description class_desc = {
15 EO_VERSION, 15 EO_VERSION,
16 "Mixin4", 16 "Mixin4",
17 EO_CLASS_TYPE_MIXIN, 17 EFL_CLASS_TYPE_MIXIN,
18 EO_CLASS_DESCRIPTION_NOOPS(), 18 EFL_CLASS_DESCRIPTION_NOOPS(),
19 NULL, 19 NULL,
20 0, 20 0,
21 NULL, 21 NULL,
22 NULL 22 NULL
23}; 23};
24 24
25EO_DEFINE_CLASS(mixin4_class_get, &class_desc, NULL, NULL); 25EFL_DEFINE_CLASS(mixin4_class_get, &class_desc, NULL, NULL);
26 26
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index a55ff9ba0b..8aef3dc4f5 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -31,30 +31,30 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
31 pd->name = name; \ 31 pd->name = name; \
32 printf("%s %d\n", __func__, pd->name); \ 32 printf("%s %d\n", __func__, pd->name); \
33} \ 33} \
34EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \ 34EFL_VOID_FUNC_BODYV(simple_##name##_set, EFL_FUNC_CALL(name), int name); \
35EO_FUNC_BODY(simple_##name##_get, int, 0); 35EFL_FUNC_BODY(simple_##name##_get, int, 0);
36 36
37_GET_SET_FUNC(a) 37_GET_SET_FUNC(a)
38_GET_SET_FUNC(b) 38_GET_SET_FUNC(b)
39 39
40static Efl_Op_Description op_descs[] = { 40static Efl_Op_Description op_descs[] = {
41 EO_OP_FUNC(simple_a_set, _a_set), 41 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
42 EO_OP_FUNC(simple_a_get, _a_get), 42 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
43 EO_OP_FUNC(simple_b_set, _b_set), 43 EFL_OBJECT_OP_FUNC(simple_b_set, _b_set),
44 EO_OP_FUNC(simple_b_get, _b_get), 44 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
45}; 45};
46 46
47static const Efl_Class_Description class_desc = { 47static const Efl_Class_Description class_desc = {
48 EO_VERSION, 48 EO_VERSION,
49 "Simple", 49 "Simple",
50 EO_CLASS_TYPE_REGULAR, 50 EFL_CLASS_TYPE_REGULAR,
51 EO_CLASS_DESCRIPTION_OPS(op_descs), 51 EFL_CLASS_DESCRIPTION_OPS(op_descs),
52 NULL, 52 NULL,
53 sizeof(Private_Data), 53 sizeof(Private_Data),
54 NULL, 54 NULL,
55 NULL 55 NULL
56}; 56};
57 57
58EO_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, 58EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS,
59 MIXIN3_CLASS, MIXIN2_CLASS, NULL); 59 MIXIN3_CLASS, MIXIN2_CLASS, NULL);
60 60
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 9013e2c3a5..84de464742 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -22,7 +22,7 @@ _a_changed_cb(void *data, const Eo_Event *event)
22 22
23 cb_count++; 23 cb_count++;
24 24
25 efl_event_callback_priority_add(event->object, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423); 25 efl_event_callback_priority_add(event->object, EV_A_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423);
26 efl_event_callback_del(event->object, EV_A_CHANGED, _null_cb, (void *) 23423); 26 efl_event_callback_del(event->object, EV_A_CHANGED, _null_cb, (void *) 23423);
27 27
28 /* Stop as we reached the 3rd one. */ 28 /* Stop as we reached the 3rd one. */
@@ -63,18 +63,18 @@ main(int argc, char *argv[])
63{ 63{
64 (void) argc; 64 (void) argc;
65 (void) argv; 65 (void) argv;
66 eo_init(); 66 efl_object_init();
67 67
68 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 68 Eo *obj = efl_add(SIMPLE_CLASS, NULL);
69 Simple_Public_Data *pd = e