summaryrefslogtreecommitdiff
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
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
-rw-r--r--src/examples/ecore/efl_thread.c4
-rw-r--r--src/lib/ecore/ecore.c2
-rw-r--r--src/lib/ecore/ecore_exe_posix.c6
-rw-r--r--src/lib/ecore/ecore_signal.c2
-rw-r--r--src/lib/ecore/ecore_timer.c20
-rw-r--r--src/lib/ecore/efl_loop.c8
-rw-r--r--src/lib/ecore/efl_loop_timer.eo14
-rw-r--r--src/lib/ecore/efl_loop_timer_eo.legacy.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c2
-rwxr-xr-xsrc/scripts/pyolian/test_eolian.py2
-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
-rw-r--r--src/tests/elementary/efl_ui_test_grid.c2
-rw-r--r--src/tests/elementary/suite_helpers.c2
15 files changed, 37 insertions, 37 deletions
diff --git a/src/examples/ecore/efl_thread.c b/src/examples/ecore/efl_thread.c
index 48a20e9ccc..a0b1a3a4eb 100644
--- a/src/examples/ecore/efl_thread.c
+++ b/src/examples/ecore/efl_thread.c
@@ -53,11 +53,11 @@ _th_read_change(void *data EINA_UNUSED, const Efl_Event *ev)
53 if (!strcmp(s, "one")) 53 if (!strcmp(s, "one"))
54 efl_add(EFL_LOOP_TIMER_CLASS, obj, 54 efl_add(EFL_LOOP_TIMER_CLASS, obj,
55 efl_loop_timer_interval_set(efl_added, 2.0), 55 efl_loop_timer_interval_set(efl_added, 2.0),
56 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _th_timeout, obj)); 56 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _th_timeout, obj));
57 else 57 else
58 efl_add(EFL_LOOP_TIMER_CLASS, obj, 58 efl_add(EFL_LOOP_TIMER_CLASS, obj,
59 efl_loop_timer_interval_set(efl_added, 1.0), 59 efl_loop_timer_interval_set(efl_added, 1.0),
60 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _th_timeout, obj)); 60 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _th_timeout, obj));
61 eina_accessor_free(args_access); 61 eina_accessor_free(args_access);
62 } 62 }
63 } 63 }
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index af81e0751c..1c8c6ec960 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -321,7 +321,7 @@ ecore_init(void)
321 efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(), 321 efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
322 efl_loop_timer_interval_set(efl_added, sec / 2), 322 efl_loop_timer_interval_set(efl_added, sec / 2),
323 efl_event_callback_add(efl_added, 323 efl_event_callback_add(efl_added,
324 EFL_LOOP_TIMER_EVENT_TICK, 324 EFL_LOOP_TIMER_EVENT_TIMER_TICK,
325 _systemd_watchdog_cb, NULL)); 325 _systemd_watchdog_cb, NULL));
326 unsetenv("WATCHDOG_USEC"); 326 unsetenv("WATCHDOG_USEC");
327 327
diff --git a/src/lib/ecore/ecore_exe_posix.c b/src/lib/ecore/ecore_exe_posix.c
index a9332d1832..6a0cc3b79e 100644
--- a/src/lib/ecore/ecore_exe_posix.c
+++ b/src/lib/ecore/ecore_exe_posix.c
@@ -858,7 +858,7 @@ _impl_ecore_exe_kill(Ecore_Exe *obj EINA_UNUSED, Ecore_Exe_Data *exe)
858 efl_del(exe->doomsday_clock); 858 efl_del(exe->doomsday_clock);
859 exe->doomsday_clock = efl_add(EFL_LOOP_TIMER_CLASS, obj, 859 exe->doomsday_clock = efl_add(EFL_LOOP_TIMER_CLASS, obj,
860 efl_event_callback_add(efl_added, 860 efl_event_callback_add(efl_added,
861 EFL_LOOP_TIMER_EVENT_TICK, 861 EFL_LOOP_TIMER_EVENT_TIMER_TICK,
862 _ecore_exe_make_sure_its_really_dead, 862 _ecore_exe_make_sure_its_really_dead,
863 obj), 863 obj),
864 efl_loop_timer_interval_set(efl_added, 10.0)); 864 efl_loop_timer_interval_set(efl_added, 10.0));
@@ -896,7 +896,7 @@ _ecore_exe_make_sure_its_dead(void *data, const Efl_Event *event)
896 INF("Sending KILL signal to allegedly dead PID %d.", exe->pid); 896 INF("Sending KILL signal to allegedly dead PID %d.", exe->pid);
897 exe->doomsday_clock = efl_add(EFL_LOOP_TIMER_CLASS, exe_obj, 897 exe->doomsday_clock = efl_add(EFL_LOOP_TIMER_CLASS, exe_obj,
898 efl_event_callback_add(efl_added, 898 efl_event_callback_add(efl_added,
899 EFL_LOOP_TIMER_EVENT_TICK, 899 EFL_LOOP_TIMER_EVENT_TIMER_TICK,
900 _ecore_exe_make_sure_its_really_dead, 900 _ecore_exe_make_sure_its_really_dead,
901 exe_obj), 901 exe_obj),
902 efl_loop_timer_interval_set(efl_added, 10.0)); 902 efl_loop_timer_interval_set(efl_added, 10.0));
@@ -1295,7 +1295,7 @@ _ecore_exe_dead_attach(Ecore_Exe *obj)
1295 if (exe->doomsday_clock) return; 1295 if (exe->doomsday_clock) return;
1296 exe->doomsday_clock = efl_add(EFL_LOOP_TIMER_CLASS, obj, 1296 exe->doomsday_clock = efl_add(EFL_LOOP_TIMER_CLASS, obj,
1297 efl_event_callback_add(efl_added, 1297 efl_event_callback_add(efl_added,
1298 EFL_LOOP_TIMER_EVENT_TICK, 1298 EFL_LOOP_TIMER_EVENT_TIMER_TICK,
1299 _ecore_exe_make_sure_its_dead, 1299 _ecore_exe_make_sure_its_dead,
1300 obj), 1300 obj),
1301 efl_loop_timer_interval_set(efl_added, 10.0)); 1301 efl_loop_timer_interval_set(efl_added, 10.0));
diff --git a/src/lib/ecore/ecore_signal.c b/src/lib/ecore/ecore_signal.c
index 1138c7be53..e16694b55a 100644
--- a/src/lib/ecore/ecore_signal.c
+++ b/src/lib/ecore/ecore_signal.c
@@ -447,7 +447,7 @@ _ecore_signal_waitpid(Eina_Bool once, siginfo_t info)
447 efl_add(EFL_LOOP_TIMER_CLASS, ML_OBJ, 447 efl_add(EFL_LOOP_TIMER_CLASS, ML_OBJ,
448 efl_loop_timer_interval_set(efl_added, 0.1), 448 efl_loop_timer_interval_set(efl_added, 0.1),
449 efl_event_callback_add 449 efl_event_callback_add
450 (efl_added, EFL_LOOP_TIMER_EVENT_TICK, 450 (efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK,
451 _ecore_signal_exe_exit_delay, e)); 451 _ecore_signal_exe_exit_delay, e));
452 _ecore_exe_doomsday_clock_set(e->exe, doomsday_clock); 452 _ecore_exe_doomsday_clock_set(e->exe, doomsday_clock);
453 } 453 }
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index cf9be54239..37280e8ee3 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -79,7 +79,7 @@ _check_timer_event_catcher_add(void *data, const Efl_Event *event)
79 79
80 for (i = 0; array[i].desc != NULL; i++) 80 for (i = 0; array[i].desc != NULL; i++)
81 { 81 {
82 if (array[i].desc == EFL_LOOP_TIMER_EVENT_TICK) 82 if (array[i].desc == EFL_LOOP_TIMER_EVENT_TIMER_TICK)
83 { 83 {
84 if (timer->listening++ > 0) return; 84 if (timer->listening++ > 0) return;
85 _efl_loop_timer_util_instanciate(timer->loop_data, timer); 85 _efl_loop_timer_util_instanciate(timer->loop_data, timer);
@@ -99,7 +99,7 @@ _check_timer_event_catcher_del(void *data, const Efl_Event *event)
99 99
100 for (i = 0; array[i].desc != NULL; i++) 100 for (i = 0; array[i].desc != NULL; i++)
101 { 101 {
102 if (array[i].desc == EFL_LOOP_TIMER_EVENT_TICK) 102 if (array[i].desc == EFL_LOOP_TIMER_EVENT_TIMER_TICK)
103 { 103 {
104 if ((--timer->listening) > 0) return; 104 if ((--timer->listening) > 0) return;
105 _efl_loop_timer_util_instanciate(timer->loop_data, timer); 105 _efl_loop_timer_util_instanciate(timer->loop_data, timer);
@@ -164,7 +164,7 @@ _ecore_timer_legacy_tick(void *data, const Efl_Event *event)
164} 164}
165 165
166EFL_CALLBACKS_ARRAY_DEFINE(legacy_timer, 166EFL_CALLBACKS_ARRAY_DEFINE(legacy_timer,
167 { EFL_LOOP_TIMER_EVENT_TICK, _ecore_timer_legacy_tick }, 167 { EFL_LOOP_TIMER_EVENT_TIMER_TICK, _ecore_timer_legacy_tick },
168 { EFL_EVENT_DEL, _ecore_timer_legacy_del }); 168 { EFL_EVENT_DEL, _ecore_timer_legacy_del });
169 169
170EAPI Ecore_Timer * 170EAPI Ecore_Timer *
@@ -240,26 +240,26 @@ ecore_timer_del(Ecore_Timer *timer)
240} 240}
241 241
242EOLIAN static void 242EOLIAN static void
243_efl_loop_timer_interval_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer, double in) 243_efl_loop_timer_timer_interval_set(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer, double in)
244{ 244{
245 if (in < 0.0) in = 0.0; 245 if (in < 0.0) in = 0.0;
246 timer->in = in; 246 timer->in = in;
247} 247}
248 248
249EOLIAN static double 249EOLIAN static double
250_efl_loop_timer_interval_get(const Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer) 250_efl_loop_timer_timer_interval_get(const Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
251{ 251{
252 return timer->in; 252 return timer->in;
253} 253}
254 254
255EOLIAN static void 255EOLIAN static void
256_efl_loop_timer_delay(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd, double add) 256_efl_loop_timer_timer_delay(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *pd, double add)
257{ 257{
258 _efl_loop_timer_util_delay(pd, add); 258 _efl_loop_timer_util_delay(pd, add);
259} 259}
260 260
261EOLIAN static void 261EOLIAN static void
262_efl_loop_timer_reset(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer) 262_efl_loop_timer_timer_reset(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
263{ 263{
264 double now, add; 264 double now, add;
265 265
@@ -280,7 +280,7 @@ _efl_loop_timer_reset(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
280} 280}
281 281
282EOLIAN static void 282EOLIAN static void
283_efl_loop_timer_loop_reset(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer) 283_efl_loop_timer_timer_loop_reset(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
284{ 284{
285 double now, add; 285 double now, add;
286 286
@@ -301,7 +301,7 @@ _efl_loop_timer_loop_reset(Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
301} 301}
302 302
303EOLIAN static double 303EOLIAN static double
304_efl_loop_timer_pending_get(const Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer) 304_efl_loop_timer_time_pending_get(const Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data *timer)
305{ 305{
306 double now, ret = 0.0; 306 double now, ret = 0.0;
307 307
@@ -639,7 +639,7 @@ _efl_loop_timer_expired_call(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd, double when
639 639
640 efl_ref(timer->object); 640 efl_ref(timer->object);
641 eina_evlog("+timer", timer, 0.0, NULL); 641 eina_evlog("+timer", timer, 0.0, NULL);
642 efl_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TICK, NULL); 642 efl_event_callback_call(timer->object, EFL_LOOP_TIMER_EVENT_TIMER_TICK, NULL);
643 eina_evlog("-timer", timer, 0.0, NULL); 643 eina_evlog("-timer", timer, 0.0, NULL);
644 644
645 // may have changed in recursive main loops 645 // may have changed in recursive main loops
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 9b36b5b613..7a61cabdd7 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -192,7 +192,7 @@ _check_event_catcher_add(void *data, const Efl_Event *event)
192 pd->poll_high = efl_add 192 pd->poll_high = efl_add
193 (EFL_LOOP_TIMER_CLASS, event->object, 193 (EFL_LOOP_TIMER_CLASS, event->object,
194 efl_event_callback_add(efl_added, 194 efl_event_callback_add(efl_added,
195 EFL_LOOP_TIMER_EVENT_TICK, 195 EFL_LOOP_TIMER_EVENT_TIMER_TICK,
196 _poll_trigger, 196 _poll_trigger,
197 EFL_LOOP_EVENT_POLL_HIGH), 197 EFL_LOOP_EVENT_POLL_HIGH),
198 efl_loop_timer_interval_set(efl_added, 1.0 / 60.0)); 198 efl_loop_timer_interval_set(efl_added, 1.0 / 60.0));
@@ -206,7 +206,7 @@ _check_event_catcher_add(void *data, const Efl_Event *event)
206 pd->poll_medium = efl_add 206 pd->poll_medium = efl_add
207 (EFL_LOOP_TIMER_CLASS, event->object, 207 (EFL_LOOP_TIMER_CLASS, event->object,
208 efl_event_callback_add(efl_added, 208 efl_event_callback_add(efl_added,
209 EFL_LOOP_TIMER_EVENT_TICK, 209 EFL_LOOP_TIMER_EVENT_TIMER_TICK,
210 _poll_trigger, 210 _poll_trigger,
211 EFL_LOOP_EVENT_POLL_MEDIUM), 211 EFL_LOOP_EVENT_POLL_MEDIUM),
212 efl_loop_timer_interval_set(efl_added, 6)); 212 efl_loop_timer_interval_set(efl_added, 6));
@@ -220,7 +220,7 @@ _check_event_catcher_add(void *data, const Efl_Event *event)
220 pd->poll_low = efl_add 220 pd->poll_low = efl_add
221 (EFL_LOOP_TIMER_CLASS, event->object, 221 (EFL_LOOP_TIMER_CLASS, event->object,
222 efl_event_callback_add(efl_added, 222 efl_event_callback_add(efl_added,
223 EFL_LOOP_TIMER_EVENT_TICK, 223 EFL_LOOP_TIMER_EVENT_TIMER_TICK,
224 _poll_trigger, 224 _poll_trigger,
225 EFL_LOOP_EVENT_POLL_LOW), 225 EFL_LOOP_EVENT_POLL_LOW),
226 efl_loop_timer_interval_set(efl_added, 66)); 226 efl_loop_timer_interval_set(efl_added, 66));
@@ -493,7 +493,7 @@ _efl_loop_timeout(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, double tim)
493 d->timer = efl_add(EFL_LOOP_TIMER_CLASS, obj, 493 d->timer = efl_add(EFL_LOOP_TIMER_CLASS, obj,
494 efl_loop_timer_interval_set(efl_added, tim), 494 efl_loop_timer_interval_set(efl_added, tim),
495 efl_event_callback_add(efl_added, 495 efl_event_callback_add(efl_added,
496 EFL_LOOP_TIMER_EVENT_TICK, 496 EFL_LOOP_TIMER_EVENT_TIMER_TICK,
497 _efl_loop_timeout_done, d), 497 _efl_loop_timeout_done, d),
498 efl_event_callback_add(efl_added, 498 efl_event_callback_add(efl_added,
499 EFL_EVENT_DEL, 499 EFL_EVENT_DEL,
diff --git a/src/lib/ecore/efl_loop_timer.eo b/src/lib/ecore/efl_loop_timer.eo
index 97812a976d..059ac345cc 100644
--- a/src/lib/ecore/efl_loop_timer.eo
+++ b/src/lib/ecore/efl_loop_timer.eo
@@ -10,7 +10,7 @@ class @beta Efl.Loop_Timer extends Efl.Loop_Consumer
10 The @Efl.Object.event_freeze and @Efl.Object.event_thaw calls are used to pause and unpause the timer. 10 The @Efl.Object.event_freeze and @Efl.Object.event_thaw calls are used to pause and unpause the timer.
11 ]] 11 ]]
12 methods { 12 methods {
13 @property interval { 13 @property timer_interval {
14 [[Interval the timer ticks on.]] 14 [[Interval the timer ticks on.]]
15 set { 15 set {
16 [[If set during a timer call this will affect the next interval.]] 16 [[If set during a timer call this will affect the next interval.]]
@@ -21,13 +21,13 @@ class @beta Efl.Loop_Timer extends Efl.Loop_Consumer
21 in: double(-1.0); [[The new interval in seconds]] 21 in: double(-1.0); [[The new interval in seconds]]
22 } 22 }
23 } 23 }
24 @property pending { 24 @property time_pending {
25 [[Pending time regarding a timer.]] 25 [[Pending time regarding a timer.]]
26 get { 26 get {
27 return: double; [[Pending time]] 27 return: double; [[Pending time]]
28 } 28 }
29 } 29 }
30 reset { 30 timer_reset {
31 [[Resets a timer to its full interval. This effectively makes the 31 [[Resets a timer to its full interval. This effectively makes the
32 timer start ticking off from zero now. 32 timer start ticking off from zero now.
33 33
@@ -36,12 +36,12 @@ class @beta Efl.Loop_Timer extends Efl.Loop_Consumer
36 @since 1.2 36 @since 1.2
37 ]] 37 ]]
38 } 38 }
39 loop_reset { 39 timer_loop_reset {
40 [[This effectively resets a timer but based on the time when this iteration of the main loop started. 40 [[This effectively resets a timer but based on the time when this iteration of the main loop started.
41 @since 1.18 41 @since 1.18
42 ]] 42 ]]
43 } 43 }
44 delay { 44 timer_delay {
45 [[Adds a delay to the next occurrence of a timer. 45 [[Adds a delay to the next occurrence of a timer.
46 This doesn't affect the timer interval. 46 This doesn't affect the timer interval.
47 ]] 47 ]]
@@ -51,10 +51,10 @@ class @beta Efl.Loop_Timer extends Efl.Loop_Consumer
51 } 51 }
52 } 52 }
53 events { 53 events {
54 tick: void; [[Event triggered when the specified time as passed.]] 54 timer,tick: void; [[Event triggered when the specified time as passed.]]
55 } 55 }
56 constructors { 56 constructors {
57 .interval; 57 .timer_interval;
58 } 58 }
59 implements { 59 implements {
60 Efl.Object.constructor; 60 Efl.Object.constructor;
diff --git a/src/lib/ecore/efl_loop_timer_eo.legacy.c b/src/lib/ecore/efl_loop_timer_eo.legacy.c
index a479bdb6f5..b3d2765122 100644
--- a/src/lib/ecore/efl_loop_timer_eo.legacy.c
+++ b/src/lib/ecore/efl_loop_timer_eo.legacy.c
@@ -14,7 +14,7 @@ ecore_timer_interval_get(const Efl_Loop_Timer *obj)
14EAPI double 14EAPI double
15ecore_timer_pending_get(const Efl_Loop_Timer *obj) 15ecore_timer_pending_get(const Efl_Loop_Timer *obj)
16{ 16{
17 return efl_loop_timer_pending_get(obj); 17 return efl_loop_timer_time_pending_get(obj);
18} 18}
19 19
20EAPI void 20EAPI void
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index 40503c83c0..aa7698afa6 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -369,7 +369,7 @@ _efl_net_dialer_http_curlm_timer_schedule(CURLM *multi EINA_UNUSED, long timeout
369 { 369 {
370 cm->timer = efl_add(EFL_LOOP_TIMER_CLASS, cm->loop, 370 cm->timer = efl_add(EFL_LOOP_TIMER_CLASS, cm->loop,
371 efl_loop_timer_interval_set(efl_added, seconds), 371 efl_loop_timer_interval_set(efl_added, seconds),
372 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _efl_net_dialer_http_curlm_timer_do, cm)); 372 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _efl_net_dialer_http_curlm_timer_do, cm));
373 EINA_SAFETY_ON_NULL_RETURN_VAL(cm->timer, -1); 373 EINA_SAFETY_ON_NULL_RETURN_VAL(cm->timer, -1);
374 } 374 }
375 375
diff --git a/src/scripts/pyolian/test_eolian.py b/src/scripts/pyolian/test_eolian.py
index 2a30cbeefe..990fcfc6c9 100755
--- a/src/scripts/pyolian/test_eolian.py
+++ b/src/scripts/pyolian/test_eolian.py
@@ -413,7 +413,7 @@ class TestEolianEvent(unittest.TestCase):
413 ev = cls.event_by_name_get('tick') 413 ev = cls.event_by_name_get('tick')
414 self.assertIsInstance(ev, eolian.Event) 414 self.assertIsInstance(ev, eolian.Event)
415 self.assertEqual(ev.name, 'tick') 415 self.assertEqual(ev.name, 'tick')
416 self.assertEqual(ev.c_name, 'EFL_LOOP_TIMER_EVENT_TICK') 416 self.assertEqual(ev.c_name, 'EFL_LOOP_TIMER_EVENT_TIMER_TICK')
417 self.assertIsNone(ev.type) # TODO is this correct 417 self.assertIsNone(ev.type) # TODO is this correct
418 self.assertIsInstance(ev.documentation, eolian.Documentation) 418 self.assertIsInstance(ev.documentation, eolian.Documentation)
419 self.assertEqual(ev.scope, eolian.Eolian_Object_Scope.PUBLIC) 419 self.assertEqual(ev.scope, eolian.Eolian_Object_Scope.PUBLIC)
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;
diff --git a/src/tests/elementary/efl_ui_test_grid.c b/src/tests/elementary/efl_ui_test_grid.c
index 1df8e4ad1b..07b8cd0aca 100644
--- a/src/tests/elementary/efl_ui_test_grid.c
+++ b/src/tests/elementary/efl_ui_test_grid.c
@@ -298,7 +298,7 @@ EFL_START_TEST(efl_ui_grid_scroll)
298 item = efl_pack_content_get(grid, 50); 298 item = efl_pack_content_get(grid, 50);
299 299
300 timer = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(), 300 timer = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
301 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, grid_timer_cb, NULL), 301 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, grid_timer_cb, NULL),
302 efl_loop_timer_loop_reset(efl_added), 302 efl_loop_timer_loop_reset(efl_added),
303 efl_loop_timer_interval_set(efl_added, 3.0)); 303 efl_loop_timer_interval_set(efl_added, 3.0));
304 304
diff --git a/src/tests/elementary/suite_helpers.c b/src/tests/elementary/suite_helpers.c
index 682a30753e..2427ccfcaf 100644
--- a/src/tests/elementary/suite_helpers.c
+++ b/src/tests/elementary/suite_helpers.c
@@ -187,7 +187,7 @@ _elm_suite_win_create()
187 timer = efl_add(EFL_LOOP_TIMER_CLASS, loop, 187 timer = efl_add(EFL_LOOP_TIMER_CLASS, loop,
188 efl_loop_timer_interval_set(efl_added, BUFFER_RENDER_INTERVAL), 188 efl_loop_timer_interval_set(efl_added, BUFFER_RENDER_INTERVAL),
189 efl_event_freeze(efl_added), 189 efl_event_freeze(efl_added),
190 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _win_manual_render, win) 190 efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _win_manual_render, win)
191 ); 191 );
192 evas_object_data_set(win, "timer", timer); 192 evas_object_data_set(win, "timer", timer);
193 ecore_evas_manual_render_set(ecore_evas_ecore_evas_get(evas_object_evas_get(win)), EINA_TRUE); 193 ecore_evas_manual_render_set(ecore_evas_ecore_evas_get(evas_object_evas_get(win)), EINA_TRUE);