summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-30 13:34:10 +0100
committerTom Hacohen <tom@stosb.com>2016-08-30 13:34:10 +0100
commitd5e321466e550620e8a1c6df5d5e598787a6a7d9 (patch)
treef749e5112fa486af1668785a63dfd9afbc331183 /src/tests
parentba80f7e5b027eebcfcbcb2b9758c2047383ec9ca (diff)
Efl object: Rename Eo_Event -> Efl_Event.
This is the last step of the Eo renaming efforts.
Diffstat (limited to '')
-rw-r--r--src/tests/ecore/ecore_test_args.c6
-rw-r--r--src/tests/ecore/ecore_test_ecore.c4
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c6
-rw-r--r--src/tests/ecore/ecore_test_timer.c4
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c4
-rw-r--r--src/tests/eio/eio_test_manager.c4
-rw-r--r--src/tests/eio/eio_test_manager_xattr.c2
-rw-r--r--src/tests/eio/eio_test_sentry.c6
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c2
-rw-r--r--src/tests/elementary/elm_test_genlist.c2
-rw-r--r--src/tests/elementary/elm_test_image.c4
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c28
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c2
-rw-r--r--src/tests/eo/signals/signals_main.c8
-rw-r--r--src/tests/eo/signals/signals_simple.c4
-rw-r--r--src/tests/eo/suite/eo_test_general.c12
-rw-r--r--src/tests/eolian/data/typedef_ref.c2
-rw-r--r--src/tests/eolian/data/typedef_ref_stub.c2
18 files changed, 51 insertions, 51 deletions
diff --git a/src/tests/ecore/ecore_test_args.c b/src/tests/ecore/ecore_test_args.c
index cffdbcff05..88e0241967 100644
--- a/src/tests/ecore/ecore_test_args.c
+++ b/src/tests/ecore/ecore_test_args.c
@@ -11,7 +11,7 @@ static const char *args[] = {
11}; 11};
12 12
13static void 13static void
14_cb_args1(void *data EINA_UNUSED, const Eo_Event *event) 14_cb_args1(void *data EINA_UNUSED, const Efl_Event *event)
15{ 15{
16 Efl_Loop_Arguments *arge = event->info; 16 Efl_Loop_Arguments *arge = event->info;
17 unsigned int i; 17 unsigned int i;
@@ -36,7 +36,7 @@ START_TEST(ecore_test_args1)
36END_TEST 36END_TEST
37 37
38static void 38static void
39_cb_args2(void *data EINA_UNUSED, const Eo_Event *event) 39_cb_args2(void *data EINA_UNUSED, const Efl_Event *event)
40{ 40{
41 Efl_Loop_Arguments *arge = event->info; 41 Efl_Loop_Arguments *arge = event->info;
42 42
@@ -61,7 +61,7 @@ START_TEST(ecore_test_args2)
61END_TEST 61END_TEST
62 62
63static void 63static void
64_cb_args3(void *data EINA_UNUSED, const Eo_Event *event) 64_cb_args3(void *data EINA_UNUSED, const Efl_Event *event)
65{ 65{
66 Efl_Loop_Arguments *arge = event->info; 66 Efl_Loop_Arguments *arge = event->info;
67 67
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index 98484e22a4..e91984bcc3 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -268,7 +268,7 @@ START_TEST(ecore_test_ecore_main_loop_fd_handler)
268END_TEST 268END_TEST
269 269
270static void 270static void
271_eo_read_cb(void *data, const Eo_Event *info EINA_UNUSED) 271_eo_read_cb(void *data, const Efl_Event *info EINA_UNUSED)
272{ 272{
273 Eina_Bool *did = data; 273 Eina_Bool *did = data;
274 274
@@ -309,7 +309,7 @@ START_TEST(ecore_test_efl_loop_fd)
309END_TEST 309END_TEST
310 310
311static void 311static void
312_efl_del_cb(void *data, const Eo_Event *ev EINA_UNUSED) 312_efl_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
313{ 313{
314 Eina_Bool *dead = data; 314 Eina_Bool *dead = data;
315 315
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 254db11b38..1a88adff3d 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -11,19 +11,19 @@
11 11
12#include "ecore_suite.h" 12#include "ecore_suite.h"
13 13
14static void _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 14static void _finished_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
15{ 15{
16 ecore_main_loop_quit(); 16 ecore_main_loop_quit();
17} 17}
18 18
19static void _looped_cb(void *data EINA_UNUSED, const Eo_Event *event) 19static void _looped_cb(void *data EINA_UNUSED, const Efl_Event *event)
20{ 20{
21 ecore_audio_obj_in_looped_set(event->object, EINA_FALSE); 21 ecore_audio_obj_in_looped_set(event->object, EINA_FALSE);
22} 22}
23 23
24#ifdef HAVE_PULSE 24#ifdef HAVE_PULSE
25#if 0 25#if 0
26static void _failed_cb(void *data, const Eo_Event *event EINA_UNUSED) 26static void _failed_cb(void *data, const Efl_Event *event EINA_UNUSED)
27{ 27{
28 Eina_Bool *pulse_context_failed = data; 28 Eina_Bool *pulse_context_failed = data;
29 29
diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c
index 7550bdffd0..ed326585a8 100644
--- a/src/tests/ecore/ecore_test_timer.c
+++ b/src/tests/ecore/ecore_test_timer.c
@@ -253,7 +253,7 @@ _test_time_cb(void *data)
253} 253}
254 254
255static void 255static void
256_test_death_cb(void *data, const Eo_Event *ev EINA_UNUSED) 256_test_death_cb(void *data, const Efl_Event *ev EINA_UNUSED)
257{ 257{
258 Eina_Bool *die = data; 258 Eina_Bool *die = data;
259 259
@@ -261,7 +261,7 @@ _test_death_cb(void *data, const Eo_Event *ev EINA_UNUSED)
261} 261}
262 262
263static void 263static void
264_test_run_cb(void *data, const Eo_Event *ev EINA_UNUSED) 264_test_run_cb(void *data, const Efl_Event *ev EINA_UNUSED)
265{ 265{
266 _test_time_cb(data); 266 _test_time_cb(data);
267} 267}
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index d0ff492643..0623ee960b 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -22,7 +22,7 @@ struct _pair
22}; 22};
23 23
24static void 24static void
25_children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event) 25_children_removed_cb(void *data EINA_UNUSED, const Efl_Event* event)
26{ 26{
27 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__); 27 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__);
28 if(children_deleted) 28 if(children_deleted)
@@ -42,7 +42,7 @@ _children_removed_cb(void *data EINA_UNUSED, const Eo_Event* event)
42} 42}
43 43
44static void 44static void
45_children_added_cb(void *data EINA_UNUSED, const Eo_Event* event) 45_children_added_cb(void *data EINA_UNUSED, const Efl_Event* event)
46{ 46{
47 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__); 47 fprintf(stderr, __FILE__ ":%d %s\n", __LINE__, __func__);
48 Efl_Model_Children_Event* evt = event->info; 48 Efl_Model_Children_Event* evt = event->info;
diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c
index c1ac397c8a..cdf0644663 100644
--- a/src/tests/eio/eio_test_manager.c
+++ b/src/tests/eio/eio_test_manager.c
@@ -18,7 +18,7 @@ static int test_count = 0;
18static int DONE_CALLED = 0xdeadbeef; 18static int DONE_CALLED = 0xdeadbeef;
19 19
20static void 20static void
21_filter_direct_cb(void *data EINA_UNUSED, const Eo_Event *event) 21_filter_direct_cb(void *data EINA_UNUSED, const Efl_Event *event)
22{ 22{
23 Eio_Filter_Direct_Data *event_info = event->info; 23 Eio_Filter_Direct_Data *event_info = event->info;
24 char *last_slash = strrchr(event_info->info->path, '/'); 24 char *last_slash = strrchr(event_info->info->path, '/');
@@ -40,7 +40,7 @@ _main_direct_cb(void *data, const Eina_File_Direct_Info *info)
40} 40}
41 41
42static void 42static void
43_filter_cb(void *data EINA_UNUSED, const Eo_Event *event) 43_filter_cb(void *data EINA_UNUSED, const Efl_Event *event)
44{ 44{
45 Eio_Filter_Name_Data *event_info = event->info; 45 Eio_Filter_Name_Data *event_info = event->info;
46 char *last_slash = strrchr(event_info->file, '/'); 46 char *last_slash = strrchr(event_info->file, '/');
diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c
index 3733589a3d..acee0b4707 100644
--- a/src/tests/eio/eio_test_manager_xattr.c
+++ b/src/tests/eio/eio_test_manager_xattr.c
@@ -36,7 +36,7 @@ static const char *attr_data[] =
36int total_attributes = sizeof(attribute)/sizeof(attribute[0]); 36int total_attributes = sizeof(attribute)/sizeof(attribute[0]);
37 37
38static void 38static void
39_filter_cb(void *data EINA_UNUSED, const Eo_Event *event) 39_filter_cb(void *data EINA_UNUSED, const Efl_Event *event)
40{ 40{
41 Eio_Filter_Name_Data *event_info = event->info; 41 Eio_Filter_Name_Data *event_info = event->info;
42 42
diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index 902d6532bb..fb07e842f1 100644
--- a/src/tests/eio/eio_test_sentry.c
+++ b/src/tests/eio/eio_test_sentry.c
@@ -104,7 +104,7 @@ static Eina_Bool _modify_attrib_file(void *data)
104 104
105/////// helper functions 105/////// helper functions
106 106
107static void _check_event_path(void *data, const Eo_Event *event) 107static void _check_event_path(void *data, const Efl_Event *event)
108{ 108{
109 Eio_Sentry_Event *event_info = event->info; 109 Eio_Sentry_Event *event_info = event->info;
110 ck_assert_str_eq((const char*)data, event_info->trigger); 110 ck_assert_str_eq((const char*)data, event_info->trigger);
@@ -217,7 +217,7 @@ START_TEST(eio_test_sentry_add_add_remove_remove)
217} 217}
218END_TEST 218END_TEST
219 219
220static void _target_notified_cb(void *data, const Eo_Event *event) 220static void _target_notified_cb(void *data, const Efl_Event *event)
221{ 221{
222 _check_event_path(data, event); 222 _check_event_path(data, event);
223 _cancel_timeout(); 223 _cancel_timeout();
@@ -609,7 +609,7 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_one_event)
609} 609}
610END_TEST 610END_TEST
611 611
612static void _unexpected_event_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 612static void _unexpected_event_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
613{ 613{
614 ck_abort_msg("unexpected event"); 614 ck_abort_msg("unexpected event");
615} 615}
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index 524d53df27..15e8cffad4 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -65,7 +65,7 @@ _error_then_cb(void* data EINA_UNUSED, Eina_Error error)
65} 65}
66 66
67static void 67static void
68_efl_event_quit_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 68_efl_event_quit_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
69{ 69{
70 ecore_main_loop_quit(); 70 ecore_main_loop_quit();
71 efl_event_callback_stop(event->object); 71 efl_event_callback_stop(event->object);
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index 3bd1790bb7..dd43419dff 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -81,7 +81,7 @@ START_TEST(elm_atspi_children_get2)
81END_TEST 81END_TEST
82 82
83static void 83static void
84_children_changed_cb(void *data EINA_UNUSED, const Eo_Event *event) 84_children_changed_cb(void *data EINA_UNUSED, const Efl_Event *event)
85{ 85{
86 if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED) 86 if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED)
87 return; 87 return;
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index bfbed5f6ec..3ae76f7a73 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -35,7 +35,7 @@ START_TEST (elm_atspi_role_get)
35END_TEST 35END_TEST
36 36
37static void 37static void
38_async_error_cb(void *data, const Eo_Event *event) 38_async_error_cb(void *data, const Efl_Event *event)
39{ 39{
40 Test_Data *td = data; 40 Test_Data *td = data;
41 char path[PATH_MAX]; 41 char path[PATH_MAX];
@@ -44,7 +44,7 @@ _async_error_cb(void *data, const Eo_Event *event)
44} 44}
45 45
46static void 46static void
47_async_opened_cb(void *data, const Eo_Event *event) 47_async_opened_cb(void *data, const Efl_Event *event)
48{ 48{
49 Test_Data *td = data; 49 Test_Data *td = data;
50 const char *ff, *kk, *r1, *r2; 50 const char *ff, *kk, *r1, *r2;
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index 07ad64aec7..bf3d1a9ce7 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -56,7 +56,7 @@ struct _Frame_Data
56 Evas_Coord x, y; 56 Evas_Coord x, y;
57}; 57};
58 58
59static void bg_key_down(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED); 59static void bg_key_down(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED);
60 60
61 61
62static Evas_Object *o_bg = NULL; 62static Evas_Object *o_bg = NULL;
@@ -132,7 +132,7 @@ broadcast_event(Emotion_Event ev)
132} 132}
133 133
134static void 134static void
135bg_key_down(void *data EINA_UNUSED, const Eo_Event *event) 135bg_key_down(void *data EINA_UNUSED, const Efl_Event *event)
136{ 136{
137 Efl_Input_Key *ev = event->info; 137 Efl_Input_Key *ev = event->info;
138 Eina_List *l; 138 Eina_List *l;
@@ -291,7 +291,7 @@ bg_key_down(void *data EINA_UNUSED, const Eo_Event *event)
291} 291}
292 292
293static void 293static void
294_oe_free_cb(void *data, const Eo_Event *event EINA_UNUSED) 294_oe_free_cb(void *data, const Efl_Event *event EINA_UNUSED)
295{ 295{
296 free(data); 296 free(data);
297} 297}
@@ -324,7 +324,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje)
324} 324}
325 325
326static void 326static void
327video_obj_frame_decode_cb(void *data, const Eo_Event *event) 327video_obj_frame_decode_cb(void *data, const Efl_Event *event)
328{ 328{
329 video_obj_time_changed(event->object, data); 329 video_obj_time_changed(event->object, data);
330 330
@@ -339,7 +339,7 @@ video_obj_frame_decode_cb(void *data, const Eo_Event *event)
339} 339}
340 340
341static void 341static void
342video_obj_frame_resize_cb(void *data, const Eo_Event *event) 342video_obj_frame_resize_cb(void *data, const Efl_Event *event)
343{ 343{
344 Evas_Object *oe; 344 Evas_Object *oe;
345 int iw, ih; 345 int iw, ih;
@@ -360,21 +360,21 @@ video_obj_frame_resize_cb(void *data, const Eo_Event *event)
360} 360}
361 361
362static void 362static void
363video_obj_length_change_cb(void *data, const Eo_Event *event) 363video_obj_length_change_cb(void *data, const Efl_Event *event)
364{ 364{
365 printf("len change!\n"); 365 printf("len change!\n");
366 video_obj_time_changed(event->object, data); 366 video_obj_time_changed(event->object, data);
367} 367}
368 368
369static void 369static void
370video_obj_position_update_cb(void *data, const Eo_Event *event) 370video_obj_position_update_cb(void *data, const Efl_Event *event)
371{ 371{
372 printf("pos up!\n"); 372 printf("pos up!\n");
373 video_obj_time_changed(event->object, data); 373 video_obj_time_changed(event->object, data);
374} 374}
375 375
376static void 376static void
377video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event) 377video_obj_stopped_cb(void *data EINA_UNUSED, const Efl_Event *event)
378{ 378{
379 printf("video stopped!!!\n"); 379 printf("video stopped!!!\n");
380 if (loop) 380 if (loop)
@@ -385,7 +385,7 @@ video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event)
385} 385}
386 386
387static void 387static void
388video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event) 388video_obj_channels_cb(void *data EINA_UNUSED, const Efl_Event *event)
389{ 389{
390 printf("channels changed: [AUD %i][VID %i][SPU %i]\n", 390 printf("channels changed: [AUD %i][VID %i][SPU %i]\n",
391 emotion_object_audio_channel_count(event->object), 391 emotion_object_audio_channel_count(event->object),
@@ -394,13 +394,13 @@ video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event)
394} 394}
395 395
396static void 396static void
397 video_obj_title_cb(void *data EINA_UNUSED, const Eo_Event *event) 397 video_obj_title_cb(void *data EINA_UNUSED, const Efl_Event *event)
398{ 398{
399 printf("video title to: \"%s\"\n", emotion_object_title_get(event->object)); 399 printf("video title to: \"%s\"\n", emotion_object_title_get(event->object));
400} 400}
401 401
402static void 402static void
403video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) 403video_obj_progress_cb(void *data EINA_UNUSED, const Efl_Event *event)
404{ 404{
405 printf("progress: \"%s\" %3.3f\n", 405 printf("progress: \"%s\" %3.3f\n",
406 emotion_object_progress_info_get(event->object), 406 emotion_object_progress_info_get(event->object),
@@ -408,7 +408,7 @@ video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event)
408} 408}
409 409
410static void 410static void
411video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event) 411video_obj_ref_cb(void *data EINA_UNUSED, const Efl_Event *event)
412{ 412{
413 printf("video ref to: \"%s\" %i\n", 413 printf("video ref to: \"%s\" %i\n",
414 emotion_object_ref_file_get(event->object), 414 emotion_object_ref_file_get(event->object),
@@ -416,14 +416,14 @@ video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event)
416} 416}
417 417
418static void 418static void
419video_obj_button_num_cb(void *data EINA_UNUSED, const Eo_Event *event) 419video_obj_button_num_cb(void *data EINA_UNUSED, const Efl_Event *event)
420{ 420{
421 printf("video spu buttons to: %i\n", 421 printf("video spu buttons to: %i\n",
422 emotion_object_spu_button_count_get(event->object)); 422 emotion_object_spu_button_count_get(event->object));
423} 423}
424 424
425static void 425static void
426video_obj_button_cb(void *data EINA_UNUSED, const Eo_Event *event) 426video_obj_button_cb(void *data EINA_UNUSED, const Efl_Event *event)
427{ 427{
428 printf("video selected spu button: %i\n", 428 printf("video selected spu button: %i\n",
429 emotion_object_spu_button_get(event->object)); 429 emotion_object_spu_button_get(event->object));
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index c37c851cd2..438492e51c 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -11,7 +11,7 @@
11static int cb_called = EINA_FALSE; 11static int cb_called = EINA_FALSE;
12 12
13static void 13static void
14_a_changed_cb(void *data, const Eo_Event *event) 14_a_changed_cb(void *data, const Efl_Event *event)
15{ 15{
16 int new_a = *((int *) event->info); 16 int new_a = *((int *) event->info);
17 printf("%s event_info:'%d' data:'%s'\n", __func__, new_a, (const char *) data); 17 printf("%s event_info:'%d' data:'%s'\n", __func__, new_a, (const char *) data);
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 498f3c138d..51fca1f39e 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -10,12 +10,12 @@
10static int cb_count = 0; 10static int cb_count = 0;
11 11
12static void 12static void
13_null_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 13_null_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
14{ 14{
15} 15}
16 16
17static void 17static void
18_a_changed_cb(void *data, const Eo_Event *event) 18_a_changed_cb(void *data, const Efl_Event *event)
19{ 19{
20 int new_a = *((int *) event->info); 20 int new_a = *((int *) event->info);
21 printf("%s event_info:'%d' data:'%d'\n", __func__, new_a, (int) (intptr_t) data); 21 printf("%s event_info:'%d' data:'%d'\n", __func__, new_a, (int) (intptr_t) data);
@@ -34,7 +34,7 @@ static Eina_Bool inside = EINA_FALSE;
34static int called = 0; 34static int called = 0;
35 35
36static void 36static void
37_restart_1_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 37_restart_1_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
38{ 38{
39 fprintf(stderr, "restart 1 inside: %i\n", inside); 39 fprintf(stderr, "restart 1 inside: %i\n", inside);
40 fail_if(!inside); 40 fail_if(!inside);
@@ -43,7 +43,7 @@ _restart_1_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
43} 43}
44 44
45static void 45static void
46_restart_2_cb(void *data, const Eo_Event *event) 46_restart_2_cb(void *data, const Efl_Event *event)
47{ 47{
48 fprintf(stderr, "restart 2 inside: %i\n", inside); 48 fprintf(stderr, "restart 2 inside: %i\n", inside);
49 fail_if(inside); 49 fail_if(inside);
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 5404f4da76..74b569be63 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -29,7 +29,7 @@ _a_set(Eo *obj, void *class_data, int a)
29} 29}
30 30
31void 31void
32_cb_added(void *data EINA_UNUSED, const Eo_Event *event) 32_cb_added(void *data EINA_UNUSED, const Efl_Event *event)
33{ 33{
34 Simple_Public_Data *pd = efl_data_scope_get(event->object, MY_CLASS); 34 Simple_Public_Data *pd = efl_data_scope_get(event->object, MY_CLASS);
35 const Efl_Callback_Array_Item *callback_array = event->info; 35 const Efl_Callback_Array_Item *callback_array = event->info;
@@ -43,7 +43,7 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *event)
43} 43}
44 44
45void 45void
46_cb_deled(void *data EINA_UNUSED, const Eo_Event *event) 46_cb_deled(void *data EINA_UNUSED, const Efl_Event *event)
47{ 47{
48 Simple_Public_Data *pd = efl_data_scope_get(event->object, MY_CLASS); 48 Simple_Public_Data *pd = efl_data_scope_get(event->object, MY_CLASS);
49 const Efl_Callback_Array_Item *callback_array = event->info; 49 const Efl_Callback_Array_Item *callback_array = event->info;
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index d6ab99ea55..36c3b5a6f9 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -120,7 +120,7 @@ static int _eo_signals_cb_current = 0;
120static int _eo_signals_cb_flag = 0; 120static int _eo_signals_cb_flag = 0;
121 121
122static void 122static void
123_eo_signals_a_changed_cb(void *_data, const Eo_Event *event EINA_UNUSED) 123_eo_signals_a_changed_cb(void *_data, const Efl_Event *event EINA_UNUSED)
124{ 124{
125 int data = (intptr_t) _data; 125 int data = (intptr_t) _data;
126 _eo_signals_cb_current++; 126 _eo_signals_cb_current++;
@@ -129,14 +129,14 @@ _eo_signals_a_changed_cb(void *_data, const Eo_Event *event EINA_UNUSED)
129} 129}
130 130
131static void 131static void
132_eo_signals_a_changed_cb2(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 132_eo_signals_a_changed_cb2(void *_data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
133{ 133{
134 _eo_signals_cb_flag |= 0x2; 134 _eo_signals_cb_flag |= 0x2;
135 efl_event_callback_stop(event->object); 135 efl_event_callback_stop(event->object);
136} 136}
137 137
138static void 138static void
139_eo_signals_a_changed_within_cb(void *_data EINA_UNUSED, const Eo_Event *event) 139_eo_signals_a_changed_within_cb(void *_data EINA_UNUSED, const Efl_Event *event)
140{ 140{
141 int a = 3; 141 int a = 3;
142 efl_event_callback_legacy_call(event->object, EV_A_CHANGED, &a); 142 efl_event_callback_legacy_call(event->object, EV_A_CHANGED, &a);
@@ -144,20 +144,20 @@ _eo_signals_a_changed_within_cb(void *_data EINA_UNUSED, const Eo_Event *event)
144} 144}
145 145
146static void 146static void
147_eo_signals_a_changed_never(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 147_eo_signals_a_changed_never(void *_data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
148{ 148{
149 /* This one should never be called. */ 149 /* This one should never be called. */
150 fail_if(1); 150 fail_if(1);
151} 151}
152 152
153static void 153static void
154_eo_signals_efl_del_cb(void *_data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 154_eo_signals_efl_del_cb(void *_data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
155{ 155{
156 _eo_signals_cb_flag |= 0x4; 156 _eo_signals_cb_flag |= 0x4;
157} 157}
158 158
159void 159void
160_eo_signals_cb_added_deled(void *data, const Eo_Event *event) 160_eo_signals_cb_added_deled(void *data, const Efl_Event *event)
161{ 161{
162 const Efl_Callback_Array_Item *callback_array = event->info; 162 const Efl_Callback_Array_Item *callback_array = event->info;
163 const Efl_Callback_Array_Item *(*callback_data)(void) = data; 163 const Efl_Callback_Array_Item *(*callback_data)(void) = data;
diff --git a/src/tests/eolian/data/typedef_ref.c b/src/tests/eolian/data/typedef_ref.c
index 11d549fe9f..fa9a655eb7 100644
--- a/src/tests/eolian/data/typedef_ref.c
+++ b/src/tests/eolian/data/typedef_ref.c
@@ -19,7 +19,7 @@ typedef Evas_Coord Evas_Coord2;
19 19
20typedef Evas_Coord2 Evas_Coord3; 20typedef Evas_Coord2 Evas_Coord3;
21 21
22typedef void (*Event)(void *data, const Eo_Event *event); 22typedef void (*Event)(void *data, const Efl_Event *event);
23 23
24typedef enum 24typedef enum
25{ 25{
diff --git a/src/tests/eolian/data/typedef_ref_stub.c b/src/tests/eolian/data/typedef_ref_stub.c
index 033d5dac53..2e52edc8e5 100644
--- a/src/tests/eolian/data/typedef_ref_stub.c
+++ b/src/tests/eolian/data/typedef_ref_stub.c
@@ -11,7 +11,7 @@ typedef Evas_Coord Evas_Coord2;
11 11
12typedef Evas_Coord2 Evas_Coord3; 12typedef Evas_Coord2 Evas_Coord3;
13 13
14typedef void (*Event)(void *data, const Eo_Event *event); 14typedef void (*Event)(void *data, const Efl_Event *event);
15 15
16 16
17#endif 17#endif