summaryrefslogtreecommitdiff
path: root/src/tests/ecore/ecore_test_ecore.c
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-01-02 15:41:46 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-01-02 16:13:54 +0900
commit9bedda14b3a3edb972bb231dd1e727c86355d6da (patch)
tree9b6c18ce786621dfcc94e7c8728a5b8dcbbc5a48 /src/tests/ecore/ecore_test_ecore.c
parent44b6aa16c1054b545583408c31c4243144852960 (diff)
efl loop - rename ecore_main_loop_get to efl_main_loop_get
ecore_main_loop_get() is really a new "eo api" but it's using our old ecore_* namespace, so move to the new efl namespace.
Diffstat (limited to 'src/tests/ecore/ecore_test_ecore.c')
-rw-r--r--src/tests/ecore/ecore_test_ecore.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index 905af936dd..89f3c0dbef 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -291,7 +291,7 @@ START_TEST(ecore_test_efl_loop_fd)
291 ret = pipe(comm); 291 ret = pipe(comm);
292 fail_if(ret != 0); 292 fail_if(ret != 0);
293 293
294 fd = efl_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(), 294 fd = efl_add(EFL_LOOP_FD_CLASS, efl_main_loop_get(),
295 efl_loop_fd_set(efl_added, comm[0]), 295 efl_loop_fd_set(efl_added, comm[0]),
296 efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did)); 296 efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did));
297 fail_if(fd == NULL); 297 fail_if(fd == NULL);
@@ -334,7 +334,7 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
334 ret = pipe(comm); 334 ret = pipe(comm);
335 fail_if(ret != 0); 335 fail_if(ret != 0);
336 336
337 fd = efl_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(), 337 fd = efl_add(EFL_LOOP_FD_CLASS, efl_main_loop_get(),
338 efl_loop_fd_set(efl_added, comm[0]), 338 efl_loop_fd_set(efl_added, comm[0]),
339 efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did), 339 efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did),
340 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _efl_del_cb, &dead)); 340 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _efl_del_cb, &dead));
@@ -832,26 +832,26 @@ START_TEST(ecore_test_efl_loop_register)
832 832
833 ecore_init(); 833 ecore_init();
834 834
835 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_CLASS); 835 t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_CLASS);
836 fail_if(!efl_isa(t, EFL_LOOP_CLASS)); 836 fail_if(!efl_isa(t, EFL_LOOP_CLASS));
837 837
838 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS); 838 t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS);
839 fail_if(t != NULL); 839 fail_if(t != NULL);
840 840
841 n = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get()); 841 n = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get());
842 fail_if(n != NULL); 842 fail_if(n != NULL);
843 843
844 n = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(), 844 n = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
845 efl_loop_timer_interval_set(efl_added, 1.0)); 845 efl_loop_timer_interval_set(efl_added, 1.0));
846 efl_loop_register(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n); 846 efl_loop_register(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
847 847
848 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS); 848 t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS);
849 fail_if(!efl_isa(t, EFL_LOOP_TIMER_CLASS)); 849 fail_if(!efl_isa(t, EFL_LOOP_TIMER_CLASS));
850 fail_if(t != n); 850 fail_if(t != n);
851 851
852 efl_loop_unregister(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n); 852 efl_loop_unregister(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
853 853
854 t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS); 854 t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS);
855 fail_if(t != NULL); 855 fail_if(t != NULL);
856 856
857 ecore_shutdown(); 857 ecore_shutdown();