summaryrefslogtreecommitdiff
path: root/src/tests/ecore
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-08 16:33:05 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-03-08 16:38:46 +0100
commit632bd45825e7c63f09f25d6585404d011ff1994a (patch)
tree55c884b5045627dbc2947ca8ffef760f97e87f88 /src/tests/ecore
parentcf200a7d28aada7fff7d01fe3e353bf8359addc0 (diff)
efl.loop_timer: rename all methods/properties/events
Summary: avoid potential future conflict by not using conflict-able names ref T7731 Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7731 Differential Revision: https://phab.enlightenment.org/D8256
Diffstat (limited to 'src/tests/ecore')
-rw-r--r--src/tests/ecore/efl_app_test_loop.c4
-rw-r--r--src/tests/ecore/efl_app_test_loop_timer.c2
-rw-r--r--src/tests/ecore/efl_app_test_promise.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/tests/ecore/efl_app_test_loop.c b/src/tests/ecore/efl_app_test_loop.c
index 4325be2a9e..88b4dd2fd5 100644
--- a/src/tests/ecore/efl_app_test_loop.c
+++ b/src/tests/ecore/efl_app_test_loop.c
@@ -79,11 +79,11 @@ EFL_START_TEST(efl_app_test_efl_loop_concentric)
79 efl_event_callback_add(loop, EFL_LOOP_EVENT_IDLE_ENTER, loop_idle_enter, NULL); 79 efl_event_callback_add(loop, EFL_LOOP_EVENT_IDLE_ENTER, loop_idle_enter, NULL);
80 timer = efl_add(EFL_LOOP_TIMER_CLASS, loop2, 80 timer = efl_add(EFL_LOOP_TIMER_CLASS, loop2,
81 efl_loop_timer_interval_set(efl_added, 0.01), 81 efl_loop_timer_interval_set(efl_added, 0.01),
82 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, loop_timer_tick, loop) 82 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, loop_timer_tick, loop)
83 ); 83 );
84 timer2 = efl_add(EFL_LOOP_TIMER_CLASS, loop, 84 timer2 = efl_add(EFL_LOOP_TIMER_CLASS, loop,
85 efl_loop_timer_interval_set(efl_added, 0.5), 85 efl_loop_timer_interval_set(efl_added, 0.5),
86 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, efl_app_test_efl_loop_concentric_fail, NULL) 86 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, efl_app_test_efl_loop_concentric_fail, NULL)
87 ); 87 );
88 exitcode = efl_loop_exit_code_process(efl_loop_begin(loop)); 88 exitcode = efl_loop_exit_code_process(efl_loop_begin(loop));
89 ck_assert_int_eq(exitcode, 0); 89 ck_assert_int_eq(exitcode, 0);
diff --git a/src/tests/ecore/efl_app_test_loop_timer.c b/src/tests/ecore/efl_app_test_loop_timer.c
index 38d16a9728..e866689012 100644
--- a/src/tests/ecore/efl_app_test_loop_timer.c
+++ b/src/tests/ecore/efl_app_test_loop_timer.c
@@ -47,7 +47,7 @@ EFL_START_TEST(ecore_test_timer_lifecycle)
47 efl_event_callback_add((Eo*) t, EFL_EVENT_DEL, _test_death_cb, &dl); 47 efl_event_callback_add((Eo*) t, EFL_EVENT_DEL, _test_death_cb, &dl);
48 48
49 et = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(), 49 et = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
50 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _test_run_cb, &re), 50 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _test_run_cb, &re),
51 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _test_death_cb, &de), 51 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _test_death_cb, &de),
52 efl_loop_timer_interval_set(efl_added, 1.0)); 52 efl_loop_timer_interval_set(efl_added, 1.0));
53 efl_ref(et); 53 efl_ref(et);
diff --git a/src/tests/ecore/efl_app_test_promise.c b/src/tests/ecore/efl_app_test_promise.c
index 610851045c..276629754a 100644
--- a/src/tests/ecore/efl_app_test_promise.c
+++ b/src/tests/ecore/efl_app_test_promise.c
@@ -176,7 +176,7 @@ _future_get(PromiseCtx *ctx, double timeout)
176 f = eina_future_new(ctx->p); 176 f = eina_future_new(ctx->p);
177 fail_if(!f); 177 fail_if(!f);
178 ctx->t = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(), 178 ctx->t = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
179 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _simple_timeout, ctx), 179 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _simple_timeout, ctx),
180 efl_loop_timer_interval_set(efl_added, timeout)); 180 efl_loop_timer_interval_set(efl_added, timeout));
181 fail_if(!ctx->t); 181 fail_if(!ctx->t);
182 return f; 182 return f;