summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2016-05-18 08:17:36 -0700
committerCedric Bail <cedric@osg.samsung.com>2016-05-18 08:18:04 -0700
commit75a53ece1007d927b8f0b6c5d3f269726afb9108 (patch)
tree034e6bcccf51916512c5e361666f9f46a1b97069 /src/tests
parent72adab722226b664ce0b63be46650874cd8b0ef9 (diff)
eo: for consistency use object like all our API.
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c2
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c2
-rw-r--r--src/tests/elementary/elm_test_genlist.c2
-rw-r--r--src/tests/elementary/elm_test_image.c8
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c42
-rw-r--r--src/tests/eo/signals/signals_main.c6
-rw-r--r--src/tests/eo/signals/signals_simple.c8
-rw-r--r--src/tests/eolian_cxx/callback.c2
8 files changed, 36 insertions, 36 deletions
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 9112b89..2174f9a 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -34,7 +34,7 @@ static Eina_Bool _finished_cb(void *data EINA_UNUSED, const Eo_Event *event EINA
34 34
35static Eina_Bool _looped_cb(void *data EINA_UNUSED, const Eo_Event *event) 35static Eina_Bool _looped_cb(void *data EINA_UNUSED, const Eo_Event *event)
36{ 36{
37 ecore_audio_obj_in_looped_set(event->obj, EINA_FALSE); 37 ecore_audio_obj_in_looped_set(event->object, EINA_FALSE);
38 38
39 return EINA_TRUE; 39 return EINA_TRUE;
40} 40}
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index 09c0f13..5ddec2b 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -56,7 +56,7 @@ _children_added_cb(void *data EINA_UNUSED, const Eo_Event* event)
56 if(temp_filename && strcmp(temp_filename, filename) == 0) 56 if(temp_filename && strcmp(temp_filename, filename) == 0)
57 { 57 {
58 children_deleted = EINA_TRUE; 58 children_deleted = EINA_TRUE;
59 efl_model_child_del(event->obj, evt->child); 59 efl_model_child_del(event->object, evt->child);
60 } 60 }
61 free(filename); 61 free(filename);
62 62
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index c56ee46..aeab090 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -87,7 +87,7 @@ _children_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
87 return EINA_TRUE; 87 return EINA_TRUE;
88 88
89 ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info; 89 ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info;
90 current = event->obj; 90 current = event->object;
91 counter++; 91 counter++;
92 92
93 return EINA_TRUE; 93 return EINA_TRUE;
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index ef631c7..755f5be 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -40,7 +40,7 @@ _async_error_cb(void *data, const Eo_Event *event)
40 Test_Data *td = data; 40 Test_Data *td = data;
41 char path[PATH_MAX]; 41 char path[PATH_MAX];
42 sprintf(path, pathfmt, td->image_id); 42 sprintf(path, pathfmt, td->image_id);
43 efl_file_set(event->obj, path, NULL); 43 efl_file_set(event->object, path, NULL);
44 return EO_CALLBACK_CONTINUE; 44 return EO_CALLBACK_CONTINUE;
45} 45}
46 46
@@ -52,7 +52,7 @@ _async_opened_cb(void *data, const Eo_Event *event)
52 char path[PATH_MAX]; 52 char path[PATH_MAX];
53 53
54 sprintf(path, pathfmt, td->image_id); 54 sprintf(path, pathfmt, td->image_id);
55 efl_file_get(event->obj, &ff, &kk); 55 efl_file_get(event->object, &ff, &kk);
56 r1 = strrchr(ff, '/'); 56 r1 = strrchr(ff, '/');
57 r2 = strrchr(path, '/'); 57 r2 = strrchr(path, '/');
58 ck_assert(!strcmp(r1, r2)); 58 ck_assert(!strcmp(r1, r2));
@@ -62,7 +62,7 @@ _async_opened_cb(void *data, const Eo_Event *event)
62 { 62 {
63 td->image_id++; 63 td->image_id++;
64 sprintf(path, pathfmt, td->image_id); 64 sprintf(path, pathfmt, td->image_id);
65 efl_file_set(event->obj, path, NULL); 65 efl_file_set(event->object, path, NULL);
66 return EO_CALLBACK_CONTINUE; 66 return EO_CALLBACK_CONTINUE;
67 } 67 }
68 else if (td->image_id < MAX_IMAGE_ID) 68 else if (td->image_id < MAX_IMAGE_ID)
@@ -71,7 +71,7 @@ _async_opened_cb(void *data, const Eo_Event *event)
71 for (; td->image_id < MAX_IMAGE_ID;) 71 for (; td->image_id < MAX_IMAGE_ID;)
72 { 72 {
73 sprintf(path, pathfmt, ++td->image_id); 73 sprintf(path, pathfmt, ++td->image_id);
74 efl_file_set(event->obj, path, NULL); 74 efl_file_set(event->object, path, NULL);
75 } 75 }
76 return EO_CALLBACK_CONTINUE; 76 return EO_CALLBACK_CONTINUE;
77 } 77 }
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index e372e2c..8393742 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -326,7 +326,7 @@ video_obj_time_changed(Evas_Object *obj, Evas_Object *edje)
326static Eina_Bool 326static Eina_Bool
327video_obj_frame_decode_cb(void *data, const Eo_Event *event) 327video_obj_frame_decode_cb(void *data, const Eo_Event *event)
328{ 328{
329 video_obj_time_changed(event->obj, data); 329 video_obj_time_changed(event->object, data);
330 330
331 if (0) 331 if (0)
332 { 332 {
@@ -348,16 +348,16 @@ video_obj_frame_resize_cb(void *data, const Eo_Event *event)
348 double ratio; 348 double ratio;
349 349
350 oe = data; 350 oe = data;
351 emotion_object_size_get(event->obj, &iw, &ih); 351 emotion_object_size_get(event->object, &iw, &ih);
352 ratio = emotion_object_ratio_get(event->obj); 352 ratio = emotion_object_ratio_get(event->object);
353 printf("HANDLE %ix%i @ %3.3f\n", iw, ih, ratio); 353 printf("HANDLE %ix%i @ %3.3f\n", iw, ih, ratio);
354 if (ratio > 0.0) iw = (ih * ratio) + 0.5; 354 if (ratio > 0.0) iw = (ih * ratio) + 0.5;
355 evas_object_size_hint_min_set(event->obj, iw, ih); 355 evas_object_size_hint_min_set(event->object, iw, ih);
356 edje_object_part_swallow(oe, "video_swallow", event->obj); 356 edje_object_part_swallow(oe, "video_swallow", event->object);
357 edje_obj_size_min_calc(oe, &w, &h); 357 edje_obj_size_min_calc(oe, &w, &h);
358 efl_gfx_size_set(oe, w, h); 358 efl_gfx_size_set(oe, w, h);
359 evas_object_size_hint_min_set(event->obj, 0, 0); 359 evas_object_size_hint_min_set(event->object, 0, 0);
360 edje_object_part_swallow(oe, "video_swallow", event->obj); 360 edje_object_part_swallow(oe, "video_swallow", event->object);
361 361
362 return EINA_TRUE; 362 return EINA_TRUE;
363} 363}
@@ -366,7 +366,7 @@ static Eina_Bool
366video_obj_length_change_cb(void *data, const Eo_Event *event) 366video_obj_length_change_cb(void *data, const Eo_Event *event)
367{ 367{
368 printf("len change!\n"); 368 printf("len change!\n");
369 video_obj_time_changed(event->obj, data); 369 video_obj_time_changed(event->object, data);
370 370
371 return EINA_TRUE; 371 return EINA_TRUE;
372} 372}
@@ -375,7 +375,7 @@ static Eina_Bool
375video_obj_position_update_cb(void *data, const Eo_Event *event) 375video_obj_position_update_cb(void *data, const Eo_Event *event)
376{ 376{
377 printf("pos up!\n"); 377 printf("pos up!\n");
378 video_obj_time_changed(event->obj, data); 378 video_obj_time_changed(event->object, data);
379 379
380 return EINA_TRUE; 380 return EINA_TRUE;
381} 381}
@@ -386,8 +386,8 @@ video_obj_stopped_cb(void *data EINA_UNUSED, const Eo_Event *event)
386 printf("video stopped!!!\n"); 386 printf("video stopped!!!\n");
387 if (loop) 387 if (loop)
388 { 388 {
389 emotion_object_position_set(event->obj, 0.0); 389 emotion_object_position_set(event->object, 0.0);
390 emotion_object_play_set(event->obj, EINA_TRUE); 390 emotion_object_play_set(event->object, EINA_TRUE);
391 } 391 }
392 392
393 return EINA_TRUE; 393 return EINA_TRUE;
@@ -397,9 +397,9 @@ static Eina_Bool
397video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event) 397video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event)
398{ 398{
399 printf("channels changed: [AUD %i][VID %i][SPU %i]\n", 399 printf("channels changed: [AUD %i][VID %i][SPU %i]\n",
400 emotion_object_audio_channel_count(event->obj), 400 emotion_object_audio_channel_count(event->object),
401 emotion_object_video_channel_count(event->obj), 401 emotion_object_video_channel_count(event->object),
402 emotion_object_spu_channel_count(event->obj)); 402 emotion_object_spu_channel_count(event->object));
403 403
404 return EINA_TRUE; 404 return EINA_TRUE;
405} 405}
@@ -407,7 +407,7 @@ video_obj_channels_cb(void *data EINA_UNUSED, const Eo_Event *event)
407static Eina_Bool 407static Eina_Bool
408 video_obj_title_cb(void *data EINA_UNUSED, const Eo_Event *event) 408 video_obj_title_cb(void *data EINA_UNUSED, const Eo_Event *event)
409{ 409{
410 printf("video title to: \"%s\"\n", emotion_object_title_get(event->obj)); 410 printf("video title to: \"%s\"\n", emotion_object_title_get(event->object));
411 411
412 return EINA_TRUE; 412 return EINA_TRUE;
413} 413}
@@ -416,8 +416,8 @@ static Eina_Bool
416video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event) 416video_obj_progress_cb(void *data EINA_UNUSED, const Eo_Event *event)
417{ 417{
418 printf("progress: \"%s\" %3.3f\n", 418 printf("progress: \"%s\" %3.3f\n",
419 emotion_object_progress_info_get(event->obj), 419 emotion_object_progress_info_get(event->object),
420 emotion_object_progress_status_get(event->obj)); 420 emotion_object_progress_status_get(event->object));
421 421
422 return EINA_TRUE; 422 return EINA_TRUE;
423} 423}
@@ -426,8 +426,8 @@ static Eina_Bool
426video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event) 426video_obj_ref_cb(void *data EINA_UNUSED, const Eo_Event *event)
427{ 427{
428 printf("video ref to: \"%s\" %i\n", 428 printf("video ref to: \"%s\" %i\n",
429 emotion_object_ref_file_get(event->obj), 429 emotion_object_ref_file_get(event->object),
430 emotion_object_ref_num_get(event->obj)); 430 emotion_object_ref_num_get(event->object));
431 431
432 return EINA_TRUE; 432 return EINA_TRUE;
433} 433}
@@ -436,7 +436,7 @@ static Eina_Bool
436video_obj_button_num_cb(void *data EINA_UNUSED, const Eo_Event *event) 436video_obj_button_num_cb(void *data EINA_UNUSED, const Eo_Event *event)
437{ 437{
438 printf("video spu buttons to: %i\n", 438 printf("video spu buttons to: %i\n",
439 emotion_object_spu_button_count_get(event->obj)); 439 emotion_object_spu_button_count_get(event->object));
440 440
441 return EINA_TRUE; 441 return EINA_TRUE;
442} 442}
@@ -445,7 +445,7 @@ static Eina_Bool
445video_obj_button_cb(void *data EINA_UNUSED, const Eo_Event *event) 445video_obj_button_cb(void *data EINA_UNUSED, const Eo_Event *event)
446{ 446{
447 printf("video selected spu button: %i\n", 447 printf("video selected spu button: %i\n",
448 emotion_object_spu_button_get(event->obj)); 448 emotion_object_spu_button_get(event->object));
449 449
450 return EINA_TRUE; 450 return EINA_TRUE;
451} 451}
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 496e107..5c33bc5 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -23,8 +23,8 @@ _a_changed_cb(void *data, const Eo_Event *event)
23 23
24 cb_count++; 24 cb_count++;
25 25
26 eo_event_callback_priority_add(event->obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423); 26 eo_event_callback_priority_add(event->object, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423);
27 eo_event_callback_del(event->obj, EV_A_CHANGED, _null_cb, (void *) 23423); 27 eo_event_callback_del(event->object, EV_A_CHANGED, _null_cb, (void *) 23423);
28 28
29 /* Stop as we reached the 3rd one. */ 29 /* Stop as we reached the 3rd one. */
30 return (cb_count != 3); 30 return (cb_count != 3);
@@ -49,7 +49,7 @@ _restart_2_cb(void *data, const Eo_Event *event)
49 fail_if(inside); 49 fail_if(inside);
50 50
51 inside = EINA_TRUE; 51 inside = EINA_TRUE;
52 eo_event_callback_call(event->obj, event->desc, data); 52 eo_event_callback_call(event->object, event->desc, data);
53 inside = EINA_FALSE; 53 inside = EINA_FALSE;
54 54
55 called++; 55 called++;
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 01eec45..f7cad68 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -31,7 +31,7 @@ _a_set(Eo *obj, void *class_data, int a)
31Eina_Bool 31Eina_Bool
32_cb_added(void *data EINA_UNUSED, const Eo_Event *event) 32_cb_added(void *data EINA_UNUSED, const Eo_Event *event)
33{ 33{
34 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS); 34 Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS);
35 const Eo_Callback_Array_Item *callback_array = event->info; 35 const Eo_Callback_Array_Item *callback_array = event->info;
36 36
37 if (callback_array->desc != EV_A_CHANGED) 37 if (callback_array->desc != EV_A_CHANGED)
@@ -39,14 +39,14 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *event)
39 39
40 pd->cb_count++; 40 pd->cb_count++;
41 41
42 printf("Added EV_A_CHANGED callback to %p. Count: %d\n", event->obj, pd->cb_count); 42 printf("Added EV_A_CHANGED callback to %p. Count: %d\n", event->object, pd->cb_count);
43 return EO_CALLBACK_CONTINUE; 43 return EO_CALLBACK_CONTINUE;
44} 44}
45 45
46Eina_Bool 46Eina_Bool
47_cb_deled(void *data EINA_UNUSED, const Eo_Event *event) 47_cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
48{ 48{
49 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS); 49 Simple_Public_Data *pd = eo_data_scope_get(event->object, MY_CLASS);
50 const Eo_Callback_Array_Item *callback_array = event->info; 50 const Eo_Callback_Array_Item *callback_array = event->info;
51 51
52 if (callback_array->desc != EV_A_CHANGED) 52 if (callback_array->desc != EV_A_CHANGED)
@@ -54,7 +54,7 @@ _cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
54 54
55 pd->cb_count--; 55 pd->cb_count--;
56 56
57 printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", event->obj, pd->cb_count); 57 printf("Removed EV_A_CHANGED callback from %p. Count: %d\n", event->object, pd->cb_count);
58 return EO_CALLBACK_CONTINUE; 58 return EO_CALLBACK_CONTINUE;
59} 59}
60 60
diff --git a/src/tests/eolian_cxx/callback.c b/src/tests/eolian_cxx/callback.c
index 28e20ce..aee3237 100644
--- a/src/tests/eolian_cxx/callback.c
+++ b/src/tests/eolian_cxx/callback.c
@@ -21,7 +21,7 @@ static Eina_Bool _callback_callback_added(void* data EINA_UNUSED, Eo_Event const
21{ 21{
22 Callback_Data* pd = event->info; 22 Callback_Data* pd = event->info;
23 ++pd->callbacks; 23 ++pd->callbacks;
24 eo_event_callback_call(event->obj, CALLBACK_EVENT_CALL_ON_ADD, &pd->callbacks); 24 eo_event_callback_call(event->object, CALLBACK_EVENT_CALL_ON_ADD, &pd->callbacks);
25 return EINA_TRUE; 25 return EINA_TRUE;
26} 26}
27 27