aboutsummaryrefslogtreecommitdiffstats
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
parentEfl.Gfx.Color: add color_class_code.set/get{} method (diff)
downloadefl-9bedda14b3a3edb972bb231dd1e727c86355d6da.tar.gz
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.
-rw-r--r--src/bin/eeze/eeze_scanner/eeze_scanner.c2
-rw-r--r--src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c2
-rw-r--r--src/bin/efl/efl_debugd.c4
-rw-r--r--src/bindings/cxx/eo_cxx/eo_promise.hh2
-rw-r--r--src/examples/ecore/ecore_promise2_example.c2
-rw-r--r--src/examples/ecore/efl_io_buffered_stream_example.c2
-rw-r--r--src/examples/ecore/efl_io_copier_example.c30
-rw-r--r--src/examples/ecore/efl_io_copier_simple_example.c2
-rw-r--r--src/examples/ecore/efl_io_queue_example.c2
-rw-r--r--src/examples/ecore/efl_net_control_example.c6
-rw-r--r--src/examples/ecore/efl_net_dialer_http_example.c2
-rw-r--r--src/examples/ecore/efl_net_dialer_simple_example.c2
-rw-r--r--src/examples/ecore/efl_net_dialer_udp_example.c2
-rw-r--r--src/examples/ecore/efl_net_dialer_unix_example.c2
-rw-r--r--src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c2
-rw-r--r--src/examples/ecore/efl_net_dialer_websocket_example.c2
-rw-r--r--src/examples/ecore/efl_net_dialer_windows_example.c2
-rw-r--r--src/examples/ecore/efl_net_server_example.c2
-rw-r--r--src/examples/ecore/efl_net_server_simple_example.c2
-rw-r--r--src/examples/ecore/efl_net_session_example.c2
-rw-r--r--src/examples/ecore/efl_net_socket_ssl_dialer_example.c2
-rw-r--r--src/examples/ecore/efl_net_socket_ssl_server_example.c2
-rw-r--r--src/examples/eio/efl_io_manager_ls.c2
-rw-r--r--src/examples/eio/efl_io_manager_open.c2
-rw-r--r--src/examples/eio/efl_io_manager_open_multi.c2
-rw-r--r--src/examples/eldbus/dbusmodel.c2
-rw-r--r--src/lib/ecore/Ecore_Eo.h2
-rw-r--r--src/lib/ecore/ecore.c6
-rw-r--r--src/lib/ecore/ecore_main.c2
-rw-r--r--src/lib/ecore/ecore_thread.c2
-rw-r--r--src/lib/ecore/ecore_timer.c4
-rw-r--r--src/lib/ecore/efl_general.h8
-rw-r--r--src/lib/ecore/efl_loop.c10
-rw-r--r--src/lib/ecore/efl_loop_consumer.c2
-rw-r--r--src/lib/ecore/efl_model_composite_boolean.c14
-rw-r--r--src/lib/ecore/efl_model_composite_selection.c2
-rw-r--r--src/lib/ecore/efl_model_container.c8
-rw-r--r--src/lib/ecore/efl_model_container_item.c8
-rw-r--r--src/lib/ecore/efl_model_item.c8
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c12
-rw-r--r--src/lib/ecore_con/ecore_con_url.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c2
-rw-r--r--src/lib/ecore_con/efl_net_ip_address.c2
-rw-r--r--src/lib/ecore_file/ecore_file_download.c2
-rw-r--r--src/lib/ecore_ipc/ecore_ipc.c20
-rw-r--r--src/lib/edje/edje_main.c18
-rw-r--r--src/lib/edje/edje_private.h2
-rw-r--r--src/lib/eio/eio_main.c6
-rw-r--r--src/lib/eio/eio_model.c2
-rw-r--r--src/lib/elementary/efl_ui_win.c2
-rw-r--r--src/lib/elementary/elm_config.c8
-rw-r--r--src/lib/elementary/elm_glview.c10
-rw-r--r--src/lib/elementary/elm_main.c10
-rw-r--r--src/lib/evas/canvas/evas_main.c4
-rw-r--r--src/lib/evas/canvas/evas_object_main.c4
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c2
-rw-r--r--src/tests/ecore/ecore_test_args.c6
-rw-r--r--src/tests/ecore/ecore_test_ecore.c20
-rw-r--r--src/tests/ecore/ecore_test_promise.c58
-rw-r--r--src/tests/ecore/ecore_test_promise2.c8
-rw-r--r--src/tests/ecore/ecore_test_timer.c2
-rw-r--r--src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c2
-rw-r--r--src/tests/eio/eio_model_test_file.c2
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c2
-rw-r--r--src/tests/eio/eio_test_manager.c12
-rw-r--r--src/tests/eio/eio_test_manager_xattr.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_method.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_signal.c2
-rw-r--r--src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c2
-rw-r--r--src/tests/elementary/elm_test_config.c6
-rw-r--r--src/tests/eo_cxx/eo_cxx_test_promise.cc66
72 files changed, 233 insertions, 233 deletions
diff --git a/src/bin/eeze/eeze_scanner/eeze_scanner.c b/src/bin/eeze/eeze_scanner/eeze_scanner.c
index e732f4f9f6..c4d23ea34f 100644
--- a/src/bin/eeze/eeze_scanner/eeze_scanner.c
+++ b/src/bin/eeze/eeze_scanner/eeze_scanner.c
@@ -494,7 +494,7 @@ main(void)
goto end;
}
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
#ifdef EFL_NET_SERVER_UNIX_CLASS
server = efl_add(EFL_NET_SERVER_SIMPLE_CLASS, loop,
diff --git a/src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c b/src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c
index c5a6a057cb..02d22ecdb6 100644
--- a/src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c
+++ b/src/bin/eeze/eeze_scanner_monitor/eeze_scanner_monitor.c
@@ -151,7 +151,7 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
goto error_path;
}
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
#ifdef EFL_NET_DIALER_UNIX_CLASS
dialer = efl_add(EFL_NET_DIALER_SIMPLE_CLASS, loop,
diff --git a/src/bin/efl/efl_debugd.c b/src/bin/efl/efl_debugd.c
index f03317b2cb..cd4a819eaf 100644
--- a/src/bin/efl/efl_debugd.c
+++ b/src/bin/efl/efl_debugd.c
@@ -569,7 +569,7 @@ _local_server_create(void)
snprintf(path, sizeof(path) - 1, "%s/%s/%s/%i", socket_path,
LOCAL_SERVER_PATH, LOCAL_SERVER_NAME, LOCAL_SERVER_PORT);
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
#ifdef EFL_NET_SERVER_UNIX_CLASS
_local_server = efl_add(EFL_NET_SERVER_SIMPLE_CLASS, loop,
@@ -624,7 +624,7 @@ _remote_server_create(void)
Eina_Bool ret = EINA_FALSE;
char address[256];
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
_remote_server = efl_add(EFL_NET_SERVER_SIMPLE_CLASS, loop,
efl_net_server_simple_inner_class_set(efl_added, EFL_NET_SERVER_TCP_CLASS));
diff --git a/src/bindings/cxx/eo_cxx/eo_promise.hh b/src/bindings/cxx/eo_cxx/eo_promise.hh
index 943507fc55..5e18e69986 100644
--- a/src/bindings/cxx/eo_cxx/eo_promise.hh
+++ b/src/bindings/cxx/eo_cxx/eo_promise.hh
@@ -30,7 +30,7 @@ struct promise_common
explicit promise_common(std::nullptr_t) : _promise(nullptr) {}
promise_common()
{
- _promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ _promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
}
~promise_common()
{
diff --git a/src/examples/ecore/ecore_promise2_example.c b/src/examples/ecore/ecore_promise2_example.c
index 34fffc0759..4c971c9bef 100644
--- a/src/examples/ecore/ecore_promise2_example.c
+++ b/src/examples/ecore/ecore_promise2_example.c
@@ -56,7 +56,7 @@ _promise_cancel(void *data, const Eina_Promise *dead EINA_UNUSED)
static Eina_Future_Scheduler *
_future_scheduler_get(void)
{
- return efl_loop_future_scheduler_get(ecore_main_loop_get());
+ return efl_loop_future_scheduler_get(efl_main_loop_get());
}
static Ctx *
diff --git a/src/examples/ecore/efl_io_buffered_stream_example.c b/src/examples/ecore/efl_io_buffered_stream_example.c
index 1017b2731e..aaf1a997bf 100644
--- a/src/examples/ecore/efl_io_buffered_stream_example.c
+++ b/src/examples/ecore/efl_io_buffered_stream_example.c
@@ -237,7 +237,7 @@ main(int argc, char **argv)
* Efl.Net.Dialer.Tcp depend on main loop, thus their parent must
* be a loop provider. We use the loop itself.
*/
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
/* The TCP client to use to send/receive network data */
dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop,
diff --git a/src/examples/ecore/efl_io_copier_example.c b/src/examples/ecore/efl_io_copier_example.c
index 1abb486985..603da4dda0 100644
--- a/src/examples/ecore/efl_io_copier_example.c
+++ b/src/examples/ecore/efl_io_copier_example.c
@@ -446,7 +446,7 @@ main(int argc, char **argv)
*/
const char *address = input_fname + strlen("tcp://");
Eina_Error err;
- input = efl_add(EFL_NET_DIALER_TCP_CLASS, ecore_main_loop_get(),
+ input = efl_add(EFL_NET_DIALER_TCP_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
);
@@ -470,7 +470,7 @@ main(int argc, char **argv)
{
Eina_Error err;
- input = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(),
+ input = efl_add(EFL_NET_DIALER_HTTP_CLASS, efl_main_loop_get(),
efl_net_dialer_http_method_set(efl_added, "GET"),
efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL), /* optional */
@@ -496,7 +496,7 @@ main(int argc, char **argv)
{
Eina_Error err;
- input = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(),
+ input = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, efl_main_loop_get(),
efl_net_dialer_websocket_streaming_mode_set(efl_added, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT),
efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
@@ -525,7 +525,7 @@ main(int argc, char **argv)
const char *bind_address = input_fname + strlen("udp://");
const char *address;
Eina_Error err;
- input = efl_add(EFL_NET_DIALER_UDP_CLASS, ecore_main_loop_get(),
+ input = efl_add(EFL_NET_DIALER_UDP_CLASS, efl_main_loop_get(),
efl_net_socket_udp_bind_set(efl_added, bind_address), /* use the address as the bind, so we can get data at it */
efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
@@ -557,7 +557,7 @@ main(int argc, char **argv)
*/
const char *address = input_fname + strlen("unix://");
Eina_Error err;
- input = efl_add(EFL_NET_DIALER_UNIX_CLASS, ecore_main_loop_get(),
+ input = efl_add(EFL_NET_DIALER_UNIX_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
);
@@ -586,7 +586,7 @@ main(int argc, char **argv)
*/
const char *address = input_fname + strlen("windows://");
Eina_Error err;
- input = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, ecore_main_loop_get(),
+ input = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
);
@@ -614,7 +614,7 @@ main(int argc, char **argv)
*/
const char *address = input_fname + strlen("ssl://");
Eina_Error err;
- input = efl_add(EFL_NET_DIALER_SSL_CLASS, ecore_main_loop_get(),
+ input = efl_add(EFL_NET_DIALER_SSL_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
);
@@ -725,7 +725,7 @@ main(int argc, char **argv)
*/
const char *address = output_fname + strlen("tcp://");
Eina_Error err;
- output = efl_add(EFL_NET_DIALER_TCP_CLASS, ecore_main_loop_get(),
+ output = efl_add(EFL_NET_DIALER_TCP_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
);
@@ -749,7 +749,7 @@ main(int argc, char **argv)
{
Eina_Error err;
- output = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(),
+ output = efl_add(EFL_NET_DIALER_HTTP_CLASS, efl_main_loop_get(),
efl_net_dialer_http_method_set(efl_added, "PUT"),
efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL), /* optional */
@@ -775,7 +775,7 @@ main(int argc, char **argv)
{
Eina_Error err;
- output = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(),
+ output = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, efl_main_loop_get(),
efl_net_dialer_websocket_streaming_mode_set(efl_added, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT),
efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
@@ -803,7 +803,7 @@ main(int argc, char **argv)
*/
const char *address = output_fname + strlen("udp://");
Eina_Error err;
- output = efl_add(EFL_NET_DIALER_UDP_CLASS, ecore_main_loop_get(),
+ output = efl_add(EFL_NET_DIALER_UDP_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
);
@@ -831,7 +831,7 @@ main(int argc, char **argv)
*/
const char *address = output_fname + strlen("unix://");
Eina_Error err;
- output = efl_add(EFL_NET_DIALER_UNIX_CLASS, ecore_main_loop_get(),
+ output = efl_add(EFL_NET_DIALER_UNIX_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
);
@@ -860,7 +860,7 @@ main(int argc, char **argv)
*/
const char *address = output_fname + strlen("windows://");
Eina_Error err;
- output = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, ecore_main_loop_get(),
+ output = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
);
@@ -888,7 +888,7 @@ main(int argc, char **argv)
*/
const char *address = output_fname + strlen("ssl://");
Eina_Error err;
- output = efl_add(EFL_NET_DIALER_SSL_CLASS, ecore_main_loop_get(),
+ output = efl_add(EFL_NET_DIALER_SSL_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
);
@@ -941,7 +941,7 @@ main(int argc, char **argv)
if (line_delimiter)
line_delm_slice = (Eina_Slice)EINA_SLICE_STR(line_delimiter);
- copier = efl_add(EFL_IO_COPIER_CLASS, ecore_main_loop_get(),
+ copier = efl_add(EFL_IO_COPIER_CLASS, efl_main_loop_get(),
efl_io_copier_source_set(efl_added, input), /* mandatory */
efl_io_copier_destination_set(efl_added, output), /* optional, see :none: */
efl_io_copier_line_delimiter_set(efl_added, line_delm_slice), /* optional */
diff --git a/src/examples/ecore/efl_io_copier_simple_example.c b/src/examples/ecore/efl_io_copier_simple_example.c
index 303008e461..0b0410401e 100644
--- a/src/examples/ecore/efl_io_copier_simple_example.c
+++ b/src/examples/ecore/efl_io_copier_simple_example.c
@@ -31,7 +31,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
ecore_init();
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
input = efl_add(EFL_IO_STDIN_CLASS, loop);
output = efl_add(EFL_IO_STDOUT_CLASS, loop);
copier = efl_add(EFL_IO_COPIER_CLASS, loop,
diff --git a/src/examples/ecore/efl_io_queue_example.c b/src/examples/ecore/efl_io_queue_example.c
index 8242a71e3b..4f75c47ce7 100644
--- a/src/examples/ecore/efl_io_queue_example.c
+++ b/src/examples/ecore/efl_io_queue_example.c
@@ -285,7 +285,7 @@ main(int argc, char **argv)
* depend on main loop, thus their parent must be a loop
* provider. We use the loop itself.
*/
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
/* The TCP client to use to send/receive network data */
dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop,
diff --git a/src/examples/ecore/efl_net_control_example.c b/src/examples/ecore/efl_net_control_example.c
index 4dd596e0ba..ac9a4d6f5b 100644
--- a/src/examples/ecore/efl_net_control_example.c
+++ b/src/examples/ecore/efl_net_control_example.c
@@ -1423,7 +1423,7 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
ecore_init();
ecore_con_init();
- ctl = efl_add(EFL_NET_CONTROL_CLASS, ecore_main_loop_get(),
+ ctl = efl_add(EFL_NET_CONTROL_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, ctl_events_cbs(), NULL));
if (!ctl)
{
@@ -1432,8 +1432,8 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
goto end;
}
- input = efl_add(EFL_IO_STDIN_CLASS, ecore_main_loop_get());
- copier = efl_add(EFL_IO_COPIER_CLASS, ecore_main_loop_get(),
+ input = efl_add(EFL_IO_STDIN_CLASS, efl_main_loop_get());
+ copier = efl_add(EFL_IO_COPIER_CLASS, efl_main_loop_get(),
efl_io_copier_source_set(efl_added, input),
efl_io_copier_line_delimiter_set(efl_added, line_delimiter),
efl_io_copier_buffer_limit_set(efl_added, 8192),
diff --git a/src/examples/ecore/efl_net_dialer_http_example.c b/src/examples/ecore/efl_net_dialer_http_example.c
index effaeef2a4..2eae870a7e 100644
--- a/src/examples/ecore/efl_net_dialer_http_example.c
+++ b/src/examples/ecore/efl_net_dialer_http_example.c
@@ -269,7 +269,7 @@ main(int argc, char **argv)
if (quit_option) goto end;
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
if (args < 0)
diff --git a/src/examples/ecore/efl_net_dialer_simple_example.c b/src/examples/ecore/efl_net_dialer_simple_example.c
index 35a2fd89d7..0c7ac0fead 100644
--- a/src/examples/ecore/efl_net_dialer_simple_example.c
+++ b/src/examples/ecore/efl_net_dialer_simple_example.c
@@ -326,7 +326,7 @@ main(int argc, char **argv)
if (quit_option) goto end;
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
if (args < 0)
diff --git a/src/examples/ecore/efl_net_dialer_udp_example.c b/src/examples/ecore/efl_net_dialer_udp_example.c
index 8f8ac53cda..35336235aa 100644
--- a/src/examples/ecore/efl_net_dialer_udp_example.c
+++ b/src/examples/ecore/efl_net_dialer_udp_example.c
@@ -254,7 +254,7 @@ main(int argc, char **argv)
if (quit_option) goto end;
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
if (args < 0)
diff --git a/src/examples/ecore/efl_net_dialer_unix_example.c b/src/examples/ecore/efl_net_dialer_unix_example.c
index e890a3a21f..e2a9358ca4 100644
--- a/src/examples/ecore/efl_net_dialer_unix_example.c
+++ b/src/examples/ecore/efl_net_dialer_unix_example.c
@@ -181,7 +181,7 @@ main(int argc, char **argv)
if (quit_option) goto end;
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
if (args < 0)
diff --git a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
index da68ebe6a0..fa3dc0f6f4 100644
--- a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
+++ b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
@@ -261,7 +261,7 @@ _websocket_new(const char *name)
{
Eo *dialer;
- dialer = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(),
+ dialer = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, efl_main_loop_get(),
efl_name_set(efl_added, name),
efl_event_callback_array_add(efl_added, dialer_cbs(), NULL));
if (!dialer)
diff --git a/src/examples/ecore/efl_net_dialer_websocket_example.c b/src/examples/ecore/efl_net_dialer_websocket_example.c
index 84e0140d94..d051c3941e 100644
--- a/src/examples/ecore/efl_net_dialer_websocket_example.c
+++ b/src/examples/ecore/efl_net_dialer_websocket_example.c
@@ -286,7 +286,7 @@ main(int argc, char **argv)
if (quit_option) goto end;
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
if (args < 0)
diff --git a/src/examples/ecore/efl_net_dialer_windows_example.c b/src/examples/ecore/efl_net_dialer_windows_example.c
index 88c23d0d63..87919227ca 100644
--- a/src/examples/ecore/efl_net_dialer_windows_example.c
+++ b/src/examples/ecore/efl_net_dialer_windows_example.c
@@ -181,7 +181,7 @@ main(int argc, char **argv)
if (quit_option) goto end;
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
if (args < 0)
diff --git a/src/examples/ecore/efl_net_server_example.c b/src/examples/ecore/efl_net_server_example.c
index 943bf41e06..570123eb46 100644
--- a/src/examples/ecore/efl_net_server_example.c
+++ b/src/examples/ecore/efl_net_server_example.c
@@ -637,7 +637,7 @@ main(int argc, char **argv)
goto end;
}
- server = efl_add(cls, ecore_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */
+ server = efl_add(cls, efl_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */
efl_net_server_clients_limit_set(efl_added,
clients_limit,
clients_reject_excess), /* optional */
diff --git a/src/examples/ecore/efl_net_server_simple_example.c b/src/examples/ecore/efl_net_server_simple_example.c
index d0d3c9d828..c5d889e42a 100644
--- a/src/examples/ecore/efl_net_server_simple_example.c
+++ b/src/examples/ecore/efl_net_server_simple_example.c
@@ -441,7 +441,7 @@ main(int argc, char **argv)
goto end;
}
- simple_server = efl_add(EFL_NET_SERVER_SIMPLE_CLASS, ecore_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */
+ simple_server = efl_add(EFL_NET_SERVER_SIMPLE_CLASS, efl_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */
efl_net_server_simple_inner_class_set(efl_added, cls), /* alternatively you could create the inner server and set with efl_net_server_simple_inner_server_set() */
efl_net_server_clients_limit_set(efl_added,
clients_limit,
diff --git a/src/examples/ecore/efl_net_session_example.c b/src/examples/ecore/efl_net_session_example.c
index 9409b707f9..dfc827bcfa 100644
--- a/src/examples/ecore/efl_net_session_example.c
+++ b/src/examples/ecore/efl_net_session_example.c
@@ -152,7 +152,7 @@ main(int argc, char **argv)
}
}
- session = efl_add(EFL_NET_SESSION_CLASS, ecore_main_loop_get(),
+ session = efl_add(EFL_NET_SESSION_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, session_events_cbs(), NULL));
if (!session)
{
diff --git a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
index 7a06379b79..0aab135ec2 100644
--- a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
@@ -352,7 +352,7 @@ main(int argc, char **argv)
if (quit_option) goto end;
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
if (args < 0)
diff --git a/src/examples/ecore/efl_net_socket_ssl_server_example.c b/src/examples/ecore/efl_net_socket_ssl_server_example.c
index 6fc867d922..bfd6adc412 100644
--- a/src/examples/ecore/efl_net_socket_ssl_server_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_server_example.c
@@ -310,7 +310,7 @@ main(int argc, char **argv)
fprintf(stderr, "INFO: * %s\n", str);
eina_iterator_free(it);
- server = efl_add(EFL_NET_SERVER_TCP_CLASS, ecore_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */
+ server = efl_add(EFL_NET_SERVER_TCP_CLASS, efl_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */
efl_net_server_ip_ipv6_only_set(efl_added, EINA_FALSE), /* optional, but helps testing IPv4 on IPv6 servers */
efl_net_server_fd_reuse_address_set(efl_added, EINA_TRUE), /* optional, but nice for testing */
efl_net_server_fd_reuse_port_set(efl_added, EINA_TRUE), /* optional, but nice for testing... not secure unless you know what you're doing */
diff --git a/src/examples/eio/efl_io_manager_ls.c b/src/examples/eio/efl_io_manager_ls.c
index 9649a28e4e..65d5511026 100644
--- a/src/examples/eio/efl_io_manager_ls.c
+++ b/src/examples/eio/efl_io_manager_ls.c
@@ -50,7 +50,7 @@ progress_cb(void *data EINA_UNUSED, Eina_Accessor *access)
void list_files(void *data)
{
- Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get());
+ Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
const char *path = data;
eina_future_then(efl_io_manager_ls(job, path, NULL, progress_cb, NULL), done_cb, NULL);
diff --git a/src/examples/eio/efl_io_manager_open.c b/src/examples/eio/efl_io_manager_open.c
index dfc96e4dfe..5c731c1186 100644
--- a/src/examples/eio/efl_io_manager_open.c
+++ b/src/examples/eio/efl_io_manager_open.c
@@ -65,7 +65,7 @@ void open_file(const char *path)
{
Efl_Io_Manager *job;
- job = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get());
+ job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
eina_future_chain(efl_io_manager_open(job, path, EINA_FALSE),
{ .cb = _open_cb, .data = job },
diff --git a/src/examples/eio/efl_io_manager_open_multi.c b/src/examples/eio/efl_io_manager_open_multi.c
index 9937b9b8e6..3c39d3fc49 100644
--- a/src/examples/eio/efl_io_manager_open_multi.c
+++ b/src/examples/eio/efl_io_manager_open_multi.c
@@ -83,7 +83,7 @@ int main(int argc, char const *argv[])
eio_init();
ecore_init();
- job = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get());
+ job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
path = getenv("HOME");
path2 = "./";
diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c
index 47aecd369e..a6c2d15e0f 100644
--- a/src/examples/eldbus/dbusmodel.c
+++ b/src/examples/eldbus/dbusmodel.c
@@ -249,7 +249,7 @@ main(int argc, char **argv EINA_UNUSED)
ELDBUS_CONNECTION_TYPE_SYSTEM :
ELDBUS_CONNECTION_TYPE_SESSION);
- root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, ecore_main_loop_get(),
+ root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(),
eldbus_model_object_constructor(efl_added, conn_type, NULL, EINA_FALSE, bus_name, path),
efl_event_callback_array_add(efl_added, event_cbs(), NULL));
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index bc8174196e..77cc3d45e4 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -80,7 +80,7 @@ EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(Eo *obj);
#include "efl_interpolator_cubic_bezier.eo.h"
/* We ue the factory pattern here, so you shouldn't call eo_add directly. */
-EAPI Eo *ecore_main_loop_get(void);
+EAPI Eo *efl_main_loop_get(void);
typedef struct _Efl_Future_Composite_Progress Efl_Future_All_Progress;
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index deba63533f..586f3588a4 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -323,7 +323,7 @@ ecore_init(void)
sec = ((double) atoi(getenv("WATCHDOG_USEC"))) / 1000 / 1000;
_systemd_watchdog =
- efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(),
+ efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
efl_loop_timer_interval_set(efl_added, sec / 2),
efl_event_callback_add(efl_added,
EFL_LOOP_TIMER_EVENT_TICK,
@@ -347,7 +347,7 @@ ecore_init(void)
ecore_system_modules_load();
if (getenv("EFL_FIRST_LOOP"))
- efl_event_callback_add(ecore_main_loop_get(),
+ efl_event_callback_add(efl_main_loop_get(),
EFL_LOOP_EVENT_RESUME,
_efl_first_loop_iterate,
getenv("EFL_FIRST_LOOP"));
@@ -391,7 +391,7 @@ ecore_shutdown(void)
if (_ecore_init_count-- != _ecore_init_count_threshold)
goto end;
- efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_TERMINATE, NULL);
+ efl_event_callback_call(efl_main_loop_get(), EFL_LOOP_EVENT_TERMINATE, NULL);
ecore_system_modules_unload();
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 00266b88f2..4c4c81772a 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -1058,7 +1058,7 @@ void
_ecore_main_loop_init(void)
{
DBG("_ecore_main_loop_init");
- if (!ecore_main_loop_get()) ERR("Cannot create main loop object");
+ if (!efl_main_loop_get()) ERR("Cannot create main loop object");
_ecore_main_loop_setup(ML_OBJ, ML_DAT);
}
diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c
index 2c887e5de2..abef08f4ad 100644
--- a/src/lib/ecore/ecore_thread.c
+++ b/src/lib/ecore/ecore_thread.c
@@ -1635,7 +1635,7 @@ ecore_thread_future_run(Ecore_Thread_Future_Cb heavy, const void *data, Eina_Fre
efl_domain_current_push(EFL_ID_DOMAIN_SHARED);
- efl_wref_add(efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()), &p);
+ efl_wref_add(efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()), &p);
if (!p) goto end;
efl_object_override(p, &thread_safe_call);
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 712bd17a85..c473b3e50d 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -179,7 +179,7 @@ ecore_timer_add(double in, Ecore_Task_Cb func, const void *data)
legacy->func = func;
legacy->data = data;
- timer = efl_add(MY_CLASS, ecore_main_loop_get(),
+ timer = efl_add(MY_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, legacy_timer(), legacy),
efl_key_data_set(efl_added, "_legacy", legacy),
efl_loop_timer_interval_set(efl_added, in));
@@ -198,7 +198,7 @@ ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data)
legacy->func = func;
legacy->data = data;
- timer = efl_add(MY_CLASS, ecore_main_loop_get(),
+ timer = efl_add(MY_CLASS, efl_main_loop_get(),
efl_event_callback_array_add(efl_added, legacy_timer(), legacy),
efl_key_data_set(efl_added, "_legacy", legacy),
efl_loop_timer_loop_reset(efl_added),
diff --git a/src/lib/ecore/efl_general.h b/src/lib/ecore/efl_general.h
index e115c08bfc..256f1065a4 100644
--- a/src/lib/ecore/efl_general.h
+++ b/src/lib/ecore/efl_general.h
@@ -93,10 +93,10 @@
_efl_startup_time = ecore_time_unix_get(); \
_EFL_APP_VERSION_SET(); \
ecore_init(); \
- efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); \
+ efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); \
ecore_init_ex(argc, argv); \
__EFL_MAIN_CONSTRUCTOR; \
- ret__ = efl_loop_begin(ecore_main_loop_get()); \
+ ret__ = efl_loop_begin(efl_main_loop_get()); \
real__ = efl_loop_exit_code_process(ret__); \
__EFL_MAIN_DESTRUCTOR; \
ecore_shutdown_ex(); \
@@ -117,10 +117,10 @@
_efl_startup_time = ecore_time_unix_get(); \
_EFL_APP_VERSION_SET(); \
ecore_init(); \
- efl_event_callback_array_add(ecore_main_loop_get(), _efl_main_ex(), NULL); \
+ efl_event_callback_array_add(efl_main_loop_get(), _efl_main_ex(), NULL); \
ecore_init_ex(argc, argv); \
__EFL_MAIN_CONSTRUCTOR; \
- ret__ = efl_loop_begin(ecore_main_loop_get()); \
+ ret__ = efl_loop_begin(efl_main_loop_get()); \
real__ = efl_loop_exit_code_process(ret__); \
__EFL_MAIN_DESTRUCTOR; \
ecore_shutdown_ex(); \
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 5dc1e3fdec..f77703e249 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -61,7 +61,7 @@ _efl_loop_main_get(Efl_Class *klass EINA_UNUSED, void *_pd EINA_UNUSED)
}
EAPI Eo *
-ecore_main_loop_get(void)
+efl_main_loop_get(void)
{
return efl_loop_main_get(EFL_LOOP_CLASS);
}
@@ -112,7 +112,7 @@ efl_exit(int exit_code)
eina_value_setup(&v, EINA_VALUE_TYPE_INT);
eina_value_set(&v, &exit_code);
- efl_loop_quit(ecore_main_loop_get(), v);
+ efl_loop_quit(efl_main_loop_get(), v);
}
EOLIAN static Efl_Object *
@@ -368,7 +368,7 @@ _efl_loop_arguments_send(void *data, const Eina_Value v,
arge.initialization = initialization;
initialization = EINA_FALSE;
- efl_event_callback_call(ecore_main_loop_get(),
+ efl_event_callback_call(efl_main_loop_get(),
EFL_LOOP_EVENT_ARGUMENTS, &arge);
on_error:
_efl_loop_arguments_cleanup(arga);
@@ -389,9 +389,9 @@ ecore_loop_arguments_send(int argc, const char **argv)
for (i = 0; i < argc; i++)
eina_array_push(arga, eina_stringshare_add(argv[i]));
- job = eina_future_then(efl_loop_job(ecore_main_loop_get()),
+ job = eina_future_then(efl_loop_job(efl_main_loop_get()),
_efl_loop_arguments_send, arga);
- efl_future_Eina_FutureXXX_then(ecore_main_loop_get(), job);
+ efl_future_Eina_FutureXXX_then(efl_main_loop_get(), job);
}
// Only one main loop handle for now
diff --git a/src/lib/ecore/efl_loop_consumer.c b/src/lib/ecore/efl_loop_consumer.c
index f984909e1a..670e91bbc6 100644
--- a/src/lib/ecore/efl_loop_consumer.c
+++ b/src/lib/ecore/efl_loop_consumer.c
@@ -17,7 +17,7 @@ _efl_loop_consumer_loop_get(Eo *obj, Efl_Loop_Consumer_Data *pd EINA_UNUSED)
Efl_Loop *loop = efl_provider_find(obj, EFL_LOOP_CLASS);
if (!loop && eina_main_loop_is())
{
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
ERR("Failed to get the loop on object %p from the main thread! "
"Returning the main loop: %p", obj, loop);
}
diff --git a/src/lib/ecore/efl_model_composite_boolean.c b/src/lib/ecore/efl_model_composite_boolean.c
index 62107bbffc..d8c8e38376 100644
--- a/src/lib/ecore/efl_model_composite_boolean.c
+++ b/src/lib/ecore/efl_model_composite_boolean.c
@@ -160,7 +160,7 @@ _efl_model_composite_boolean_children_efl_model_property_get(Eo *obj EINA_UNUSED
Efl_Model_Hash_Value *hv = eina_hash_find(pd->parent_pd->values, property);
if (hv)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future *rfuture = efl_promise_future_get(promise);
Eina_Value *eina_value = eina_value_new(EINA_VALUE_TYPE_UCHAR);
@@ -180,7 +180,7 @@ _efl_model_composite_boolean_children_efl_model_property_get(Eo *obj EINA_UNUSED
return efl_model_property_get(pd->composite_child, property);
else
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future *rfuture = efl_promise_future_get(promise);
efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND);
@@ -192,7 +192,7 @@ static Efl_Future *
_efl_model_composite_boolean_children_efl_model_property_set(Eo *obj EINA_UNUSED,
Efl_Model_Composite_Boolean_Children_Data *pd, const char *property, const Eina_Value *value)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future *rfuture = efl_promise_future_get(promise);
Efl_Model_Hash_Value *hv = eina_hash_find(pd->parent_pd->values, property);
@@ -567,7 +567,7 @@ _efl_model_composite_boolean_efl_model_property_get(Eo *obj EINA_UNUSED,
if (pd->composite_model)
return efl_model_property_get(pd->composite_model, property);
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future *rfuture = efl_promise_future_get(promise);
efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND);
@@ -579,7 +579,7 @@ _efl_model_composite_boolean_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Mod
const char *property, const Eina_Value *value)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future *rfuture = efl_promise_future_get(promise);
if (pd->composite_model)
@@ -598,7 +598,7 @@ _efl_model_composite_boolean_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Mod
static Efl_Future *
_efl_model_composite_boolean_efl_model_children_slice_get(Eo *obj, Efl_Model_Composite_Boolean_Data *pd, unsigned int start, unsigned int count)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future *rfuture = efl_promise_future_get(promise);
if (pd->composite_model)
@@ -632,7 +632,7 @@ _efl_model_composite_boolean_efl_model_children_count_get(Eo *obj EINA_UNUSED, E
return efl_model_children_count_get(pd->composite_model);
else
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future *rfuture = efl_promise_future_get(promise);
unsigned int *count = malloc(sizeof(unsigned int));
diff --git a/src/lib/ecore/efl_model_composite_selection.c b/src/lib/ecore/efl_model_composite_selection.c
index b0695d53d5..dbbe43fc45 100644
--- a/src/lib/ecore/efl_model_composite_selection.c
+++ b/src/lib/ecore/efl_model_composite_selection.c
@@ -176,7 +176,7 @@ _efl_model_composite_selection_children_efl_model_property_set(Eo *obj EINA_UNUS
}
else
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future *rfuture = efl_promise_future_get(promise);
Eina_Value* true_value = eina_value_new(EINA_VALUE_TYPE_UCHAR);
eina_value_set(true_value, EINA_TRUE);
diff --git a/src/lib/ecore/efl_model_container.c b/src/lib/ecore/efl_model_container.c
index 69a5704353..71bb9f192b 100644
--- a/src/lib/ecore/efl_model_container.c
+++ b/src/lib/ecore/efl_model_container.c
@@ -236,7 +236,7 @@ _efl_model_container_efl_model_properties_get(Eo *obj EINA_UNUSED, Efl_Model_Con
Efl_Future *
_efl_model_container_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd EINA_UNUSED, const char *property EINA_UNUSED, const Eina_Value *value EINA_UNUSED)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future* future = efl_promise_future_get(promise);
efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND);
@@ -247,7 +247,7 @@ Efl_Future *
_efl_model_container_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd EINA_UNUSED, const char *property EINA_UNUSED)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future* future = efl_promise_future_get(promise);
efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND);
@@ -257,7 +257,7 @@ _efl_model_container_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_Conta
static Efl_Future *
_efl_model_container_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd, unsigned int start, unsigned int count)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future* future = efl_promise_future_get(promise);
Eina_Accessor* accessor = efl_model_list_slice(sd->children, start, count);
@@ -269,7 +269,7 @@ _efl_model_container_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model
static Efl_Future *
_efl_model_container_efl_model_children_count_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future* future = efl_promise_future_get(promise);
unsigned int *count = calloc(1, sizeof(unsigned int));
diff --git a/src/lib/ecore/efl_model_container_item.c b/src/lib/ecore/efl_model_container_item.c
index 945c0c9ce0..cb95c2f4db 100644
--- a/src/lib/ecore/efl_model_container_item.c
+++ b/src/lib/ecore/efl_model_container_item.c
@@ -44,7 +44,7 @@ _efl_model_container_item_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Model_
Eina_Stringshare *prop_name;
Child_Property_Data *cpd;
void *data, *new_data;
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future* future = efl_promise_future_get(promise);
if (!sd->parent_data)
@@ -105,7 +105,7 @@ _efl_model_container_item_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_
Eina_Stringshare *prop_name;
Child_Property_Data *cpd;
Eina_Value *value;
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future* future = efl_promise_future_get(promise);
if (!sd->parent_data)
@@ -152,7 +152,7 @@ _efl_model_container_item_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_
EOLIAN static Efl_Future *
_efl_model_container_item_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Item_Data *sd EINA_UNUSED, unsigned int start EINA_UNUSED, unsigned int count EINA_UNUSED)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future* future = efl_promise_future_get(promise);
efl_promise_value_set(promise, NULL, NULL);
@@ -163,7 +163,7 @@ _efl_model_container_item_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_
EOLIAN static Efl_Future *
_efl_model_container_item_efl_model_children_count_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Item_Data *sd EINA_UNUSED)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future* future = efl_promise_future_get(promise);
unsigned int *count = calloc(1, sizeof(unsigned int));
diff --git a/src/lib/ecore/efl_model_item.c b/src/lib/ecore/efl_model_item.c
index 8afc0a77a4..571f3e4131 100644
--- a/src/lib/ecore/efl_model_item.c
+++ b/src/lib/ecore/efl_model_item.c
@@ -70,7 +70,7 @@ _efl_model_item_efl_model_properties_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Dat
static Efl_Future*
_efl_model_item_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd, const char *property, const Eina_Value *value)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future* future = efl_promise_future_get(promise);
Efl_Model_Property_Event evt;
@@ -119,7 +119,7 @@ err1:
static Efl_Future *
_efl_model_item_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd, const char *property)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future *rfuture = efl_promise_future_get(promise);
Eina_Stringshare *sshare = eina_stringshare_add(property);
@@ -136,7 +136,7 @@ _efl_model_item_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Data
static Efl_Future *
_efl_model_item_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd, unsigned int start, unsigned int count)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future *rfuture = efl_promise_future_get(promise);
Eina_Accessor* accessor = efl_model_list_slice(sd->children, start, count);
@@ -148,7 +148,7 @@ _efl_model_item_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model_Item
static Efl_Future *
_efl_model_item_efl_model_children_count_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd)
{
- Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Future *rfuture = efl_promise_future_get(promise);
unsigned int *count = calloc(1, sizeof(unsigned int));
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index eb5535f266..2cf721ffea 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -818,7 +818,7 @@ _ecore_con_client_ssl_upgrade_job(void *data, const Eina_Value v,
const Eina_Future *dead EINA_UNUSED)
{
Ecore_Con_Client *cl = data;
- Eo *loop = ecore_main_loop_get();
+ Eo *loop = efl_main_loop_get();
Eo *inner_socket;
Eo *socket;
Eo *tcp_socket;
@@ -1604,7 +1604,7 @@ _ecore_con_server_server_ssl_job(void *data, const Eina_Value v,
const Eina_Future *dead EINA_UNUSED)
{
Ecore_Con_Server *svr = data;
- Eo *loop = ecore_main_loop_get();
+ Eo *loop = efl_main_loop_get();
Eo *ssl_ctx;
Eo *inner_server;
Eo *server;
@@ -1674,7 +1674,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
type = compl_type & ECORE_CON_TYPE;
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
EINA_SAFETY_ON_NULL_RETURN_VAL(loop, NULL);
svr = _ecore_con_server_new(EINA_FALSE, compl_type, name, port, data);
@@ -1937,7 +1937,7 @@ _ecore_con_server_dialer_ssl_job(void *data, const Eina_Value v,
const Eina_Future *dead EINA_UNUSED)
{
Ecore_Con_Server *svr = data;
- Eo *loop = ecore_main_loop_get();
+ Eo *loop = efl_main_loop_get();
Eo *ssl_ctx;
Eo *inner_dialer;
Eo *dialer;
@@ -2027,7 +2027,7 @@ _ecore_con_server_dialer_ssl_upgrade_job(void *data, const Eina_Value v,
const Eina_Future *dead EINA_UNUSED)
{
Ecore_Con_Server *svr = data;
- Eo *loop = ecore_main_loop_get();
+ Eo *loop = efl_main_loop_get();
Eo *ssl_ctx;
Eo *inner_dialer;
Eo *dialer;
@@ -2131,7 +2131,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
type = compl_type & ECORE_CON_TYPE;
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
EINA_SAFETY_ON_NULL_RETURN_VAL(loop, NULL);
svr = _ecore_con_server_new(EINA_TRUE, compl_type, name, port, data);
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index a05866f750..e8ca8c4cdf 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -704,7 +704,7 @@ _ecore_con_url_request_prepare(Ecore_Con_Url *url_con, const char *method)
if (proxy_url)
DBG("proxy_url='%s'", proxy_url);
- url_con->dialer = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(),
+ url_con->dialer = efl_add(EFL_NET_DIALER_HTTP_CLASS, efl_main_loop_get(),
efl_net_dialer_http_method_set(efl_added, url_con->custom_request ? url_con->custom_request : method),
efl_net_dialer_http_primary_mode_set(efl_added, (strcmp(method, "PUT") == 0) ? EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD : EFL_NET_DIALER_HTTP_PRIMARY_MODE_DOWNLOAD),
efl_net_dialer_proxy_set(efl_added, proxy_url),
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index 99635ff1ba..5d667bbcd9 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -863,7 +863,7 @@ _efl_net_dialer_http_curl_safe_end(Eo *o, Efl_Net_Dialer_Http_Data *pd, CURL *ea
/* object deleted from CURL callback, CURL* easy was
* dissociated and we must delete it ourselves.
*/
- f = efl_loop_job(ecore_main_loop_get());
+ f = efl_loop_job(efl_main_loop_get());
eina_future_then_from_desc(f, eina_future_cb_easy(.success = _efl_net_dialer_http_curl_cleanup,
.error = _efl_net_dialer_http_curl_cleanup_error,
.data = easy));
diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c
index 252b6e6a22..13e14a052d 100644
--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@@ -547,7 +547,7 @@ _efl_net_ip_address_resolve(Eo *cls EINA_UNUSED, void *pd EINA_UNUSED, const cha
ctx->thread = efl_net_ip_resolve_async_new(host, port, &hints, _efl_net_ip_address_resolve_done, ctx);
EINA_SAFETY_ON_NULL_GOTO(ctx->thread, error_thread);
- ctx->promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get(),
+ ctx->promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get(),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _efl_net_ip_address_resolve_del, ctx));
EINA_SAFETY_ON_NULL_GOTO(ctx->promise, error_promise);
diff --git a/src/lib/ecore_file/ecore_file_download.c b/src/lib/ecore_file/ecore_file_download.c
index bcb83935dd..1323dbc8e6 100644
--- a/src/lib/ecore_file/ecore_file_download.c
+++ b/src/lib/ecore_file/ecore_file_download.c
@@ -215,7 +215,7 @@ ecore_file_download_full(const char *url,
return EINA_FALSE;
}
- loop = ecore_main_loop_get();
+ loop = efl_main_loop_get();
EINA_SAFETY_ON_NULL_RETURN_VAL(loop, EINA_FALSE);
job = calloc(1, sizeof(Ecore_File_Download_Job));
diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c
index 7dbdb92d16..c0fcd8be63 100644
--- a/src/lib/ecore_ipc/ecore_ipc.c
+++ b/src/lib/ecore_ipc/ecore_ipc.c
@@ -382,7 +382,7 @@ EAPI Ecore_Ipc_Server *
ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void *data)
{
Ecore_Ipc_Server *svr;
- Eo *loop = ecore_main_loop_get();
+ Eo *loop = efl_main_loop_get();
char *address = NULL;
Eina_Error err;
#ifdef EFL_NET_SERVER_UNIX_CLASS
@@ -404,7 +404,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void
new_mask = S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH;
- svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, ecore_main_loop_get(),
+ svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, efl_main_loop_get(),
efl_net_server_unix_leading_directories_create_set(efl_added, EINA_TRUE, S_IRUSR | S_IWUSR | S_IXUSR));
EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server);
}
@@ -418,7 +418,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void
new_mask = 0;
local_system = EINA_TRUE;
- svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, ecore_main_loop_get());
+ svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, efl_main_loop_get());
EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server);
}
#endif /* EFL_NET_SERVER_UNIX_CLASS */
@@ -431,7 +431,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void
// TODO: specify SECURITY_ATTRIBUTES to use or some
// Efl_Net_Server_Windows API to limit access
- svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, ecore_main_loop_get());
+ svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, efl_main_loop_get());
EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server);
}
else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM)
@@ -442,7 +442,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void
// TODO: specify SECURITY_ATTRIBUTES to use or some
// Efl_Net_Server_Windows API to limit access
- svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, ecore_main_loop_get());
+ svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, efl_main_loop_get());
EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server);
}
#endif /* EFL_NET_SERVER_WINDOWS_CLASS */
@@ -653,7 +653,7 @@ EAPI Ecore_Ipc_Server *
ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *data)
{
Ecore_Ipc_Server *svr;
- Eo *loop = ecore_main_loop_get();
+ Eo *loop = efl_main_loop_get();
char *address = NULL;
Eina_Error err;
@@ -681,7 +681,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *
goto error_dialer;
}
- svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, ecore_main_loop_get());
+ svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, efl_main_loop_get());
EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer);
}
else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM)
@@ -689,7 +689,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *
address = ecore_con_local_path_new(EINA_TRUE, name, port);
EINA_SAFETY_ON_NULL_GOTO(address, error_dialer);
- svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, ecore_main_loop_get());
+ svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, efl_main_loop_get());
EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer);
}
#endif /* EFL_NET_DIALER_UNIX_CLASS */
@@ -699,7 +699,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *
address = ecore_con_local_path_new(EINA_FALSE, name, port);
EINA_SAFETY_ON_NULL_GOTO(address, error_dialer);
- svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, ecore_main_loop_get());
+ svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, efl_main_loop_get());
EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer);
}
else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM)
@@ -707,7 +707,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *
address = ecore_con_local_path_new(EINA_TRUE, name, port);
EINA_SAFETY_ON_NULL_GOTO(address, error_dialer);
- svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, ecore_main_loop_get());
+ svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, efl_main_loop_get());
EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer);
}
#endif /* EFL_NET_DIALER_WINDOWS_CLASS */
diff --git a/src/lib/edje/edje_main.c b/src/lib/edje/edje_main.c
index bd96acca4b..551b4f2e6e 100644
--- a/src/lib/edje/edje_main.c
+++ b/src/lib/edje/edje_main.c
@@ -85,9 +85,9 @@ edje_init(void)
_edje_scale = FROM_DOUBLE(1.0);
_edje_global_obj = efl_add(EDJE_GLOBAL_CLASS, NULL);
if (!_edje_global_obj ||
- !efl_loop_register(ecore_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj) ||
- !efl_loop_register(ecore_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj) ||
- !efl_loop_register(ecore_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj))
+ !efl_loop_register(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj) ||
+ !efl_loop_register(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj) ||
+ !efl_loop_register(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj))
goto shutdown_efreet;
_edje_edd_init();
@@ -150,9 +150,9 @@ shutdown_all:
_edje_edd_shutdown();
if (_edje_global_obj)
{
- efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj);
- efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
- efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
+ efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj);
+ efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
+ efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
efl_del(_edje_global_obj);
_edje_global_obj = NULL;
}
@@ -209,9 +209,9 @@ _edje_shutdown_core(void)
_edje_text_class_hash_free();
_edje_size_class_hash_free();
_edje_edd_shutdown();
- efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj);
- efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
- efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
+ efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj);
+ efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
+ efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
efl_del(_edje_global_obj);
_edje_global_obj = NULL;
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 217aa48c22..79737c12a7 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2402,7 +2402,7 @@ static inline Edje_Global *
_edje_global(void)
{
#ifndef NDEBUG
- return efl_provider_find(ecore_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE);
+ return efl_provider_find(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE);
#else
extern Edje_Global *_edje_global_obj;
return _edje_global_obj;
diff --git a/src/lib/eio/eio_main.c b/src/lib/eio/eio_main.c
index e2a2b03925..44c4e9dfc0 100644
--- a/src/lib/eio/eio_main.c
+++ b/src/lib/eio/eio_main.c
@@ -319,8 +319,8 @@ eio_init(void)
efreet_mime_init();
- io_manager = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get());
- efl_loop_register(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager);
+ io_manager = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
+ efl_loop_register(efl_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager);
eina_log_timing(_eio_log_dom_global,
EINA_LOG_STATE_STOP,
@@ -358,7 +358,7 @@ eio_shutdown(void)
EINA_LOG_STATE_START,
EINA_LOG_STATE_SHUTDOWN);
- efl_loop_unregister(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager);
+ efl_loop_unregister(efl_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager);
efl_del(io_manager);
io_manager = NULL;
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index 5ab4deb86f..cbed6ee19d 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -824,7 +824,7 @@ _eio_model_efl_object_provider_find(Eo *obj, Eio_Model_Data *priv EINA_UNUSED, c
// Provide main loop even if we don't have a loop user parent
if (!provider && (klass == EFL_LOOP_CLASS) && eina_main_loop_is())
- return ecore_main_loop_get();
+ return efl_main_loop_get();
return provider;
}
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index eac6e88ce9..c97dcb51c9 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -5417,7 +5417,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
efl_access_window_created_signal_emit(obj);
// attach config API
- efl_composite_attach(obj, efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS));
+ efl_composite_attach(obj, efl_provider_find(efl_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS));
efl_event_callback_array_add(sd->evas, _elm_evas_tracking(), sd);
efl_event_callback_array_add(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas);
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index 5b5481f865..8d83a5686a 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -1660,8 +1660,8 @@ static void
_config_load(void)
{
_efl_config_obj = efl_add(EFL_CONFIG_GLOBAL_CLASS, NULL);
- efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
- efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj);
+ efl_loop_register(efl_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
+ efl_loop_register(efl_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj);
efl_del_intercept_set(_efl_config_obj, _efl_config_obj_del);
_elm_config = _config_user_load();
if (_elm_config)
@@ -4678,8 +4678,8 @@ void
_elm_config_shutdown(void)
{
efl_del_intercept_set(_efl_config_obj, NULL);
- efl_loop_unregister(ecore_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
- efl_loop_unregister(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj);
+ efl_loop_unregister(efl_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
+ efl_loop_unregister(efl_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj);
ELM_SAFE_FREE(_efl_config_obj, efl_del);
ELM_SAFE_FREE(_elm_config, _config_free);
ELM_SAFE_FREE(_elm_preferred_engine, eina_stringshare_del);
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 0201b61858..44f7a8de94 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -165,7 +165,7 @@ _render_cb(void *obj, const Efl_Event *event EINA_UNUSED)
return;
on_error:
- efl_event_callback_del(ecore_main_loop_get(),
+ efl_event_callback_del(efl_main_loop_get(),
EFL_LOOP_EVENT_IDLE_ENTER,
_render_cb,
obj);
@@ -187,7 +187,7 @@ _set_render_policy_callback(Evas_Object *obj)
evas_object_image_data_update_add(wd->resize_obj, 0, 0, sd->w, sd->h);
}
// Delete idle_enterer if it for some reason is around
- efl_event_callback_del(ecore_main_loop_get(),
+ efl_event_callback_del(efl_main_loop_get(),
EFL_LOOP_EVENT_IDLE_ENTER,
_render_cb,
obj);
@@ -202,7 +202,7 @@ _set_render_policy_callback(Evas_Object *obj)
case ELM_GLVIEW_RENDER_POLICY_ALWAYS:
if (evas_object_image_pixels_dirty_get(wd->resize_obj) && !sd->render_idle_enterer)
- sd->render_idle_enterer = efl_event_callback_priority_add(ecore_main_loop_get(),
+ sd->render_idle_enterer = efl_event_callback_priority_add(efl_main_loop_get(),
EFL_LOOP_EVENT_IDLE_ENTER,
EFL_CALLBACK_PRIORITY_BEFORE,
_render_cb,
@@ -300,7 +300,7 @@ _elm_glview_efl_canvas_group_group_del(Eo *obj, Elm_Glview_Data *sd)
//TODO:will be optimised
efl_event_callback_legacy_call(obj, ELM_GLVIEW_EVENT_DESTROYED, NULL);
- efl_event_callback_del(ecore_main_loop_get(),
+ efl_event_callback_del(efl_main_loop_get(),
EFL_LOOP_EVENT_IDLE_ENTER,
_render_cb,
obj);
@@ -532,7 +532,7 @@ _elm_glview_draw_request(Eo *obj, Elm_Glview_Data *sd)
evas_object_image_data_update_add(wd->resize_obj, 0, 0, sd->w, sd->h);
if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ALWAYS &&
!sd->render_idle_enterer)
- sd->render_idle_enterer = efl_event_callback_priority_add(ecore_main_loop_get(),
+ sd->render_idle_enterer = efl_event_callback_priority_add(efl_main_loop_get(),
EFL_LOOP_EVENT_IDLE_ENTER,
EFL_CALLBACK_PRIORITY_BEFORE,
_render_cb, obj);
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index f7224c5c73..b75d8a820a 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1191,16 +1191,16 @@ elm_quicklaunch_fork(int argc,
{
if (qre_pause && qre_resume && qre_terminate)
{
- efl_event_callback_array_add(ecore_main_loop_get(), _qre_main_ex(), NULL);
+ efl_event_callback_array_add(efl_main_loop_get(), _qre_main_ex(), NULL);
}
else
{
- efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, qre_main, NULL);
+ efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, qre_main, NULL);
}
ecore_init_ex(argc, argv);
- ret = efl_loop_exit_code_process(efl_loop_begin(ecore_main_loop_get()));
+ ret = efl_loop_exit_code_process(efl_loop_begin(efl_main_loop_get()));
ecore_shutdown_ex();
@@ -1347,12 +1347,12 @@ elm_policy_set(unsigned int policy,
{
if (value == ELM_POLICY_EXIT_WINDOWS_DEL)
{
- efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_TERMINATE,
+ efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_TERMINATE,
_on_terminate, NULL);
}
else
{
- efl_event_callback_del(ecore_main_loop_get(), EFL_LOOP_EVENT_TERMINATE,
+ efl_event_callback_del(efl_main_loop_get(), EFL_LOOP_EVENT_TERMINATE,
_on_terminate, NULL);
}
}
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index f9f7dff5df..1e1cb07674 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -835,7 +835,7 @@ _evas_canvas_efl_object_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED,
if (klass == EVAS_CANVAS_CLASS)
return eo_e;
else if (klass == EFL_LOOP_CLASS)
- return ecore_main_loop_get();
+ return efl_main_loop_get();
else if (klass == EFL_GESTURE_MANAGER_CLASS)
return e->gesture_manager;
return efl_provider_find(efl_super(eo_e, MY_CLASS), klass);
@@ -844,7 +844,7 @@ _evas_canvas_efl_object_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED,
EOLIAN static Efl_Loop *
_evas_canvas_efl_loop_consumer_loop_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e EINA_UNUSED)
{
- return ecore_main_loop_get();
+ return efl_main_loop_get();
}
Ector_Surface *
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 2be420a409..8383997af0 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2435,7 +2435,7 @@ _efl_canvas_object_efl_object_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_
return obj->layer->evas->evas;
}
else if (klass == EFL_LOOP_CLASS)
- return ecore_main_loop_get();
+ return efl_main_loop_get();
fallback:
return efl_provider_find(efl_super(eo_obj, MY_CLASS), klass);
}
@@ -2443,7 +2443,7 @@ fallback:
EOLIAN static Efl_Loop *
_efl_canvas_object_efl_loop_consumer_loop_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED)
{
- return ecore_main_loop_get();
+ return efl_main_loop_get();
}
EOLIAN Evas_Object*
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 3ba8c5349f..70c5618390 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -16215,7 +16215,7 @@ _dummy_cancel(void *data EINA_UNUSED, const Eina_Promise *dead EINA_UNUSED)
static Eina_Future_Scheduler *
_future_scheduler_get(void)
{
- return efl_loop_future_scheduler_get(ecore_main_loop_get());
+ return efl_loop_future_scheduler_get(efl_main_loop_get());
}
EOLIAN static Eina_Future *
diff --git a/src/tests/ecore/ecore_test_args.c b/src/tests/ecore/ecore_test_args.c
index 88e0241967..36bb7d8858 100644
--- a/src/tests/ecore/ecore_test_args.c
+++ b/src/tests/ecore/ecore_test_args.c
@@ -27,7 +27,7 @@ _cb_args1(void *data EINA_UNUSED, const Efl_Event *event)
START_TEST(ecore_test_args1)
{
ecore_init();
- efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
+ efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
_cb_args1, NULL);
ecore_loop_arguments_send(8, args);
ecore_main_loop_begin();
@@ -52,7 +52,7 @@ START_TEST(ecore_test_args2)
};
ecore_init();
- efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
+ efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
_cb_args2, NULL);
ecore_loop_arguments_send(1, simple_args);
ecore_main_loop_begin();
@@ -72,7 +72,7 @@ _cb_args3(void *data EINA_UNUSED, const Efl_Event *event)
START_TEST(ecore_test_args3)
{
ecore_init();
- efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
+ efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
_cb_args3, NULL);
ecore_loop_arguments_send(0, NULL);
ecore_main_loop_begin();
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)
ret = pipe(comm);
fail_if(ret != 0);
- fd = efl_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(),
+ fd = efl_add(EFL_LOOP_FD_CLASS, efl_main_loop_get(),
efl_loop_fd_set(efl_added, comm[0]),
efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did));
fail_if(fd == NULL);
@@ -334,7 +334,7 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
ret = pipe(comm);
fail_if(ret != 0);
- fd = efl_add(EFL_LOOP_FD_CLASS, ecore_main_loop_get(),
+ fd = efl_add(EFL_LOOP_FD_CLASS, efl_main_loop_get(),
efl_loop_fd_set(efl_added, comm[0]),
efl_event_callback_add(efl_added, EFL_LOOP_FD_EVENT_READ, _eo_read_cb, &did),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _efl_del_cb, &dead));
@@ -832,26 +832,26 @@ START_TEST(ecore_test_efl_loop_register)
ecore_init();
- t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_CLASS);
+ t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_CLASS);
fail_if(!efl_isa(t, EFL_LOOP_CLASS));
- t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS);
+ t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS);
fail_if(t != NULL);
- n = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get());
+ n = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get());
fail_if(n != NULL);
- n = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(),
+ n = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
efl_loop_timer_interval_set(efl_added, 1.0));
- efl_loop_register(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
+ efl_loop_register(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
- t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS);
+ t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS);
fail_if(!efl_isa(t, EFL_LOOP_TIMER_CLASS));
fail_if(t != n);
- efl_loop_unregister(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
+ efl_loop_unregister(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS, n);
- t = efl_provider_find(ecore_main_loop_get(), EFL_LOOP_TIMER_CLASS);
+ t = efl_provider_find(efl_main_loop_get(), EFL_LOOP_TIMER_CLASS);
fail_if(t != NULL);
ecore_shutdown();
diff --git a/src/tests/ecore/ecore_test_promise.c b/src/tests/ecore/ecore_test_promise.c
index ac7cc08d70..3a3aab6277 100644
--- a/src/tests/ecore/ecore_test_promise.c
+++ b/src/tests/ecore/ecore_test_promise.c
@@ -66,7 +66,7 @@ START_TEST(efl_test_promise_future_success)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f = efl_promise_future_get(p);
@@ -106,7 +106,7 @@ START_TEST(efl_test_promise_future_success_before_get)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
efl_promise_value_set(p, &value, NULL);
@@ -146,7 +146,7 @@ START_TEST(efl_test_promise_future_cancel)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
efl_future_use(&f, efl_promise_future_get(p));
@@ -191,7 +191,7 @@ START_TEST(efl_test_promise_before_future_success)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f = efl_promise_future_get(p);
@@ -229,7 +229,7 @@ START_TEST(efl_test_promise_before_future_cancel)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
efl_future_use(&f, efl_promise_future_get(p));
@@ -310,7 +310,7 @@ START_TEST(efl_test_promise_future_chain_success)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f1 = efl_promise_future_get(p);
@@ -357,7 +357,7 @@ START_TEST(efl_test_promise_future_chain_cancel)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
efl_future_use(&f1, efl_promise_future_get(p));
@@ -409,7 +409,7 @@ START_TEST(efl_test_promise_future_multi_success)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f = efl_promise_future_get(p);
@@ -454,7 +454,7 @@ START_TEST(efl_test_promise_future_multi_success_noref)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f = efl_promise_future_get(p);
@@ -497,7 +497,7 @@ START_TEST(efl_test_promise_future_multi_cancel)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
efl_future_use(&f, efl_promise_future_get(p));
@@ -545,7 +545,7 @@ START_TEST(efl_test_promise_before_future_multi_success)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f = efl_promise_future_get(p);
@@ -588,7 +588,7 @@ START_TEST(efl_test_promise_before_future_multi_success_noref)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f = efl_promise_future_get(p);
@@ -630,7 +630,7 @@ START_TEST(efl_test_promise_before_future_multi_cancel)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
efl_future_use(&f, efl_promise_future_get(p));
@@ -682,7 +682,7 @@ START_TEST(efl_test_promise_before_future_multi_cancel_noref)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
efl_future_use(&f, efl_promise_future_get(p));
@@ -742,7 +742,7 @@ START_TEST(efl_test_promise_future_optional_success)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f = efl_promise_future_get(p);
@@ -782,7 +782,7 @@ START_TEST(efl_test_promise_future_optional_cancel)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
efl_future_use(&f, efl_promise_future_get(p));
@@ -843,9 +843,9 @@ START_TEST(efl_test_promise_all)
ecore_init();
- p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
- p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
- p3 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
+ p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
+ p3 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1 || !p2 || !p3);
f1 = efl_ref(efl_promise_future_get(p1));
@@ -893,9 +893,9 @@ START_TEST(efl_test_promise_all_after_value_set)
ecore_init();
- p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
- p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
- p3 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
+ p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
+ p3 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1 || !p2 || !p3);
f1 = efl_promise_future_get(p1);
@@ -951,9 +951,9 @@ START_TEST(efl_test_promise_race)
ecore_init();
- p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
- p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
- p3 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
+ p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
+ p3 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1 || !p2 || !p3);
f1 = efl_ref(efl_promise_future_get(p1));
@@ -989,9 +989,9 @@ START_TEST(efl_test_future_link)
ecore_init();
- o = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(),
+ o = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
efl_loop_timer_interval_set(efl_added, 0.0));
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
efl_future_use(&f, efl_promise_future_get(p));
efl_future_link(o, f);
@@ -999,7 +999,7 @@ START_TEST(efl_test_future_link)
efl_del(o);
fail_if(f);
- o = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(),
+ o = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
efl_loop_timer_interval_set(efl_added, 0.0));
efl_future_use(&f, efl_promise_future_get(p));
efl_future_cancel(f);
@@ -1026,7 +1026,7 @@ START_TEST(efl_test_recursive_mess)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
efl_future_use(&recursive_future, efl_promise_future_get(p));
efl_future_then(recursive_future, _then_cleanup, _cancel, NULL, &done);
diff --git a/src/tests/ecore/ecore_test_promise2.c b/src/tests/ecore/ecore_test_promise2.c
index 3b7fd0e04c..ff663f1685 100644
--- a/src/tests/ecore/ecore_test_promise2.c
+++ b/src/tests/ecore/ecore_test_promise2.c
@@ -156,7 +156,7 @@ _simple_timeout(void *data)
static Eina_Future_Scheduler *
_future_scheduler_get(void)
{
- return efl_loop_future_scheduler_get(ecore_main_loop_get());
+ return efl_loop_future_scheduler_get(efl_main_loop_get());
}
static PromiseCtx *
@@ -490,7 +490,7 @@ START_TEST(efl_test_timeout)
Eina_Bool done = EINA_FALSE;
fail_if(!ecore_init());
- f = eina_future_then(efl_loop_timeout(ecore_main_loop_get(), 0.0001),
+ f = eina_future_then(efl_loop_timeout(efl_main_loop_get(), 0.0001),
_promise_empty_done, &done);
fail_if(!f);
ecore_main_loop_begin();
@@ -506,7 +506,7 @@ START_TEST(efl_test_job)
Eina_Bool done = EINA_FALSE;
fail_if(!ecore_init());
- f = eina_future_then(efl_loop_job(ecore_main_loop_get()),
+ f = eina_future_then(efl_loop_job(efl_main_loop_get()),
_promise_empty_done, &done);
fail_if(!f);
ecore_main_loop_begin();
@@ -522,7 +522,7 @@ START_TEST(efl_test_idle)
Eina_Bool done = EINA_FALSE;
fail_if(!ecore_init());
- f = eina_future_then(efl_loop_idle(ecore_main_loop_get()),
+ f = eina_future_then(efl_loop_idle(efl_main_loop_get()),
_promise_empty_done, &done);
fail_if(!f);
ecore_main_loop_begin();
diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c
index 32bc498f82..66c072958e 100644
--- a/src/tests/ecore/ecore_test_timer.c
+++ b/src/tests/ecore/ecore_test_timer.c
@@ -267,7 +267,7 @@ START_TEST(ecore_test_timer_lifecycle)
t = ecore_timer_add(1.0, _test_time_cb, &rl);
efl_event_callback_add((Eo*) t, EFL_EVENT_DEL, _test_death_cb, &dl);
- et = efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(),
+ et = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _test_run_cb, &re),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _test_death_cb, &de),
efl_loop_timer_interval_set(efl_added, 1.0));
diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index 249aa8440a..ad7d8dae1a 100644
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -117,7 +117,7 @@ _timeout(void *data,
do \
{ \
Eina_Bool _did_timeout = EINA_FALSE; \
- Eina_Future *_timeout_future = efl_loop_timeout(ecore_main_loop_get(), t); \
+ Eina_Future *_timeout_future = efl_loop_timeout(efl_main_loop_get(), t); \
eina_future_then(_timeout_future, _timeout, &_did_timeout); \
mark_point(); \
ecore_main_loop_begin(); \
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index 9ce082183d..81ab19d2c7 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -114,7 +114,7 @@ START_TEST(eio_model_test_test_file)
fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
fail_if(!eio_init(), "ERROR: Cannot init EIO!\n");
- filemodel = efl_add(EIO_MODEL_CLASS, ecore_main_loop_get(), eio_model_path_set(efl_added, EFL_MODEL_TEST_FILENAME_PATH));
+ filemodel = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, EFL_MODEL_TEST_FILENAME_PATH));
fail_if(!filemodel, "ERROR: Cannot init model!\n");
handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_func, NULL);
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index db3436868d..e6b14d57b8 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -112,7 +112,7 @@ START_TEST(eio_model_test_test_monitor_add)
tmpdir = eina_environment_tmp_get();
- filemodel = efl_add(EIO_MODEL_CLASS, ecore_main_loop_get(), eio_model_path_set(efl_added, tmpdir));
+ filemodel = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, tmpdir));
fail_if(!filemodel, "ERROR: Cannot init model!\n");
efl_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel);
diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c
index 4fa1767ed2..2e396c1ad6 100644
--- a/src/tests/eio/eio_test_manager.c
+++ b/src/tests/eio/eio_test_manager.c
@@ -156,7 +156,7 @@ _test_ls(Efl_Future *(*func)(Eo *obj, const char *path, Eina_Bool recursive),
uint64_t expected_test_count,
const char* test_dirname)
{
- Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get());
+ Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
Efl_Future *f = NULL;
uint64_t main_files = 0;
@@ -206,7 +206,7 @@ START_TEST(efl_io_manager_test_stat)
nested_dirname = create_test_dirs(test_dirname);
nested_filename = get_full_path(test_dirname, files[3]);
- job = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get());
+ job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
fail_if(!job);
// Start testing
@@ -257,7 +257,7 @@ START_TEST(efl_io_manager_test_ls)
nested_filename = get_full_path(test_dirname, files[3]);
// Start testing
- job = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get());
+ job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
fail_if(!job);
f = efl_io_manager_ls(job, test_dirname, &main_files, _access_cb, NULL);
@@ -311,7 +311,7 @@ START_TEST(efl_io_manager_test_open)
nested_dirname = create_test_dirs(test_dirname);
nested_filename = get_full_path(test_dirname, files[3]);
- job = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get());
+ job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
f = efl_io_manager_open(job, nested_filename, EINA_FALSE);
eina_future_then(f, _open_done_cb, &opened_file);
@@ -340,11 +340,11 @@ START_TEST(efl_io_instantiated)
ecore_init();
- fail_if(efl_provider_find(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS) != NULL);
+ fail_if(efl_provider_find(efl_main_loop_get(), EFL_IO_MANAGER_CLASS) != NULL);
eio_init();
- manager = efl_provider_find(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS);
+ manager = efl_provider_find(efl_main_loop_get(), EFL_IO_MANAGER_CLASS);
fail_if(manager == NULL);
fail_if(!efl_isa(manager, EFL_IO_MANAGER_CLASS));
diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c
index 2f41b1bc6c..136ae4dc16 100644
--- a/src/tests/eio/eio_test_manager_xattr.c
+++ b/src/tests/eio/eio_test_manager_xattr.c
@@ -130,7 +130,7 @@ START_TEST(eio_test_job_xattr_set)
eina_init();
eio_init();
- job = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get());
+ job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
test_file_path = get_full_path(XATTR_TEST_DIR, filename);
fd = open(test_file_path,
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index 54581ec7b4..bf05142943 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -172,7 +172,7 @@ check_property(Eo *object, const char *property_name, const char *expected_value
Eo *
create_connection(void)
{
- Eo *connection = efl_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, ecore_main_loop_get(), eldbus_model_connection_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE));
+ Eo *connection = efl_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, efl_main_loop_get(), eldbus_model_connection_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE));
ck_assert_ptr_ne(NULL, connection);
return connection;
}
@@ -180,7 +180,7 @@ create_connection(void)
Eo *
create_object(void)
{
- Eo *object = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, ecore_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH));
+ Eo *object = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH));
ck_assert_ptr_ne(NULL, object);
return object;
}
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
index 1e4068ac7f..d240fefb4f 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
@@ -29,7 +29,7 @@ _setup(void)
fake_server = fake_server_start(&fake_server_data);
- fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, ecore_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
+ fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
ck_assert_ptr_ne(NULL, fake_server_object);
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
index 5c466090c2..87a01df3e6 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
@@ -27,7 +27,7 @@ _setup(void)
fake_server = fake_server_start(&fake_server_data);
- fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, ecore_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
+ fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
ck_assert_ptr_ne(NULL, fake_server_object);
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
index c06721b2c3..53626003d0 100644
--- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
@@ -33,7 +33,7 @@ _setup(void)
};
fake_server = fake_server_start(&fake_server_data);
- fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, ecore_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
+ fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
ck_assert_ptr_ne(NULL, fake_server_object);
fake_server_proxy = eldbus_model_proxy_from_object_get(fake_server_object, FAKE_SERVER_INTERFACE);
diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c
index d2d880e9cb..15a799837e 100644
--- a/src/tests/elementary/elm_test_config.c
+++ b/src/tests/elementary/elm_test_config.c
@@ -13,7 +13,7 @@ START_TEST (elm_config_eoapi)
{
elm_init(1, NULL);
- Eo *cfg = efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_INTERFACE);
+ Eo *cfg = efl_provider_find(efl_main_loop_get(), EFL_CONFIG_INTERFACE);
fail_if(!cfg);
#define CONFIG_CHK(opt, typ, val) do { \
@@ -150,7 +150,7 @@ START_TEST (elm_config_win)
{
elm_init(1, NULL);
- Eo *cfg = efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_INTERFACE);
+ Eo *cfg = efl_provider_find(efl_main_loop_get(), EFL_CONFIG_INTERFACE);
fail_if(!cfg);
Eo *win = efl_add(EFL_UI_WIN_CLASS, NULL);
@@ -185,7 +185,7 @@ START_TEST (elm_config_profiles)
// this only tests some of the profile APIs. we're not going to mess with
// the global config during make check :)
- Eo *cfg = efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_INTERFACE);
+ Eo *cfg = efl_provider_find(efl_main_loop_get(), EFL_CONFIG_INTERFACE);
fail_if(!cfg);
for (int hidden = 0; hidden <= 1; hidden++)
diff --git a/src/tests/eo_cxx/eo_cxx_test_promise.cc b/src/tests/eo_cxx/eo_cxx_test_promise.cc
index 3edc5e8852..642c9c00c4 100644
--- a/src/tests/eo_cxx/eo_cxx_test_promise.cc
+++ b/src/tests/eo_cxx/eo_cxx_test_promise.cc
@@ -16,7 +16,7 @@ START_TEST(eo_cxx_future_construct_and_destroy)
ecore_init();
{
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f = efl_promise_future_get(p);
@@ -35,7 +35,7 @@ START_TEST(eo_cxx_future_wait)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f = efl_promise_future_get(p);
@@ -74,7 +74,7 @@ START_TEST(eo_cxx_future_get)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f = efl_promise_future_get(p);
@@ -114,7 +114,7 @@ START_TEST(eo_cxx_future_get_error)
ecore_init();
- p = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
f = efl_promise_future_get(p);
@@ -157,7 +157,7 @@ START_TEST(eo_cxx_future_then_value)
ecore_init();
- promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!promise);
f = efl_promise_future_get(promise);
@@ -208,13 +208,13 @@ START_TEST(eo_cxx_future_composite_construct_and_destroy)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f2 = efl_promise_future_get(p2);
@@ -236,13 +236,13 @@ START_TEST(eo_cxx_future_composite_wait)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future* f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p2);
Efl_Future* f2 = efl_promise_future_get(p2);
@@ -286,13 +286,13 @@ START_TEST(eo_cxx_future_composite_get)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@@ -339,13 +339,13 @@ START_TEST(eo_cxx_future_composite_then_value)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@@ -403,13 +403,13 @@ START_TEST(eo_cxx_future_all_construct_and_destroy)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f2 = efl_promise_future_get(p2);
@@ -431,13 +431,13 @@ START_TEST(eo_cxx_future_all_wait)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future* f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p2);
Efl_Future* f2 = efl_promise_future_get(p2);
@@ -478,13 +478,13 @@ START_TEST(eo_cxx_future_all_get)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@@ -528,13 +528,13 @@ START_TEST(eo_cxx_future_all_then_value)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@@ -591,13 +591,13 @@ START_TEST(eo_cxx_future_race_construct_and_destroy)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f2 = efl_promise_future_get(p2);
@@ -617,13 +617,13 @@ START_TEST(eo_cxx_future_race_wait)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future* f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p2);
Efl_Future* f2 = efl_promise_future_get(p2);
@@ -661,13 +661,13 @@ START_TEST(eo_cxx_future_race_get)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@@ -707,13 +707,13 @@ START_TEST(eo_cxx_future_race_then_value)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@@ -765,13 +765,13 @@ START_TEST(eo_cxx_future_race_variant_get)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@@ -812,13 +812,13 @@ START_TEST(eo_cxx_future_race_variant_then_value)
ecore_init();
{
- Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
- Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get());
+ Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);