summaryrefslogtreecommitdiff
path: root/src/examples
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-01-02 15:41:46 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-01-02 16:13:54 +0900
commit9bedda14b3a3edb972bb231dd1e727c86355d6da (patch)
tree9b6c18ce786621dfcc94e7c8728a5b8dcbbc5a48 /src/examples
parent44b6aa16c1054b545583408c31c4243144852960 (diff)
efl loop - rename ecore_main_loop_get to efl_main_loop_get
ecore_main_loop_get() is really a new "eo api" but it's using our old ecore_* namespace, so move to the new efl namespace.
Diffstat (limited to 'src/examples')
-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
22 files changed, 38 insertions, 38 deletions
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)
56static Eina_Future_Scheduler * 56static Eina_Future_Scheduler *
57_future_scheduler_get(void) 57_future_scheduler_get(void)
58{ 58{
59 return efl_loop_future_scheduler_get(ecore_main_loop_get()); 59 return efl_loop_future_scheduler_get(efl_main_loop_get());
60} 60}
61 61
62static Ctx * 62static 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)
237 * Efl.Net.Dialer.Tcp depend on main loop, thus their parent must 237 * Efl.Net.Dialer.Tcp depend on main loop, thus their parent must
238 * be a loop provider. We use the loop itself. 238 * be a loop provider. We use the loop itself.
239 */ 239 */
240 loop = ecore_main_loop_get(); 240 loop = efl_main_loop_get();
241 241
242 /* The TCP client to use to send/receive network data */ 242 /* The TCP client to use to send/receive network data */
243 dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop, 243 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)
446 */ 446 */
447 const char *address = input_fname + strlen("tcp://"); 447 const char *address = input_fname + strlen("tcp://");
448 Eina_Error err; 448 Eina_Error err;
449 input = efl_add(EFL_NET_DIALER_TCP_CLASS, ecore_main_loop_get(), 449 input = efl_add(EFL_NET_DIALER_TCP_CLASS, efl_main_loop_get(),
450 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */ 450 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
451 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 451 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
452 ); 452 );
@@ -470,7 +470,7 @@ main(int argc, char **argv)
470 { 470 {
471 Eina_Error err; 471 Eina_Error err;
472 472
473 input = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(), 473 input = efl_add(EFL_NET_DIALER_HTTP_CLASS, efl_main_loop_get(),
474 efl_net_dialer_http_method_set(efl_added, "GET"), 474 efl_net_dialer_http_method_set(efl_added, "GET"),
475 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */ 475 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
476 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL), /* optional */ 476 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL), /* optional */
@@ -496,7 +496,7 @@ main(int argc, char **argv)
496 { 496 {
497 Eina_Error err; 497 Eina_Error err;
498 498
499 input = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(), 499 input = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, efl_main_loop_get(),
500 efl_net_dialer_websocket_streaming_mode_set(efl_added, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT), 500 efl_net_dialer_websocket_streaming_mode_set(efl_added, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT),
501 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */ 501 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
502 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 502 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
@@ -525,7 +525,7 @@ main(int argc, char **argv)
525 const char *bind_address = input_fname + strlen("udp://"); 525 const char *bind_address = input_fname + strlen("udp://");
526 const char *address; 526 const char *address;
527 Eina_Error err; 527 Eina_Error err;
528 input = efl_add(EFL_NET_DIALER_UDP_CLASS, ecore_main_loop_get(), 528 input = efl_add(EFL_NET_DIALER_UDP_CLASS, efl_main_loop_get(),
529 efl_net_socket_udp_bind_set(efl_added, bind_address), /* use the address as the bind, so we can get data at it */ 529 efl_net_socket_udp_bind_set(efl_added, bind_address), /* use the address as the bind, so we can get data at it */
530 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */ 530 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
531 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 531 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
@@ -557,7 +557,7 @@ main(int argc, char **argv)
557 */ 557 */
558 const char *address = input_fname + strlen("unix://"); 558 const char *address = input_fname + strlen("unix://");
559 Eina_Error err; 559 Eina_Error err;
560 input = efl_add(EFL_NET_DIALER_UNIX_CLASS, ecore_main_loop_get(), 560 input = efl_add(EFL_NET_DIALER_UNIX_CLASS, efl_main_loop_get(),
561 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */ 561 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
562 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 562 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
563 ); 563 );
@@ -586,7 +586,7 @@ main(int argc, char **argv)
586 */ 586 */
587 const char *address = input_fname + strlen("windows://"); 587 const char *address = input_fname + strlen("windows://");
588 Eina_Error err; 588 Eina_Error err;
589 input = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, ecore_main_loop_get(), 589 input = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, efl_main_loop_get(),
590 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */ 590 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
591 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 591 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
592 ); 592 );
@@ -614,7 +614,7 @@ main(int argc, char **argv)
614 */ 614 */
615 const char *address = input_fname + strlen("ssl://"); 615 const char *address = input_fname + strlen("ssl://");
616 Eina_Error err; 616 Eina_Error err;
617 input = efl_add(EFL_NET_DIALER_SSL_CLASS, ecore_main_loop_get(), 617 input = efl_add(EFL_NET_DIALER_SSL_CLASS, efl_main_loop_get(),
618 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */ 618 efl_event_callback_array_add(efl_added, input_cbs(), NULL), /* optional */
619 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 619 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
620 ); 620 );
@@ -725,7 +725,7 @@ main(int argc, char **argv)
725 */ 725 */
726 const char *address = output_fname + strlen("tcp://"); 726 const char *address = output_fname + strlen("tcp://");
727 Eina_Error err; 727 Eina_Error err;
728 output = efl_add(EFL_NET_DIALER_TCP_CLASS, ecore_main_loop_get(), 728 output = efl_add(EFL_NET_DIALER_TCP_CLASS, efl_main_loop_get(),
729 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ 729 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
730 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 730 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
731 ); 731 );
@@ -749,7 +749,7 @@ main(int argc, char **argv)
749 { 749 {
750 Eina_Error err; 750 Eina_Error err;
751 751
752 output = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(), 752 output = efl_add(EFL_NET_DIALER_HTTP_CLASS, efl_main_loop_get(),
753 efl_net_dialer_http_method_set(efl_added, "PUT"), 753 efl_net_dialer_http_method_set(efl_added, "PUT"),
754 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ 754 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
755 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL), /* optional */ 755 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL), /* optional */
@@ -775,7 +775,7 @@ main(int argc, char **argv)
775 { 775 {
776 Eina_Error err; 776 Eina_Error err;
777 777
778 output = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(), 778 output = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, efl_main_loop_get(),
779 efl_net_dialer_websocket_streaming_mode_set(efl_added, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT), 779 efl_net_dialer_websocket_streaming_mode_set(efl_added, EFL_NET_DIALER_WEBSOCKET_STREAMING_MODE_TEXT),
780 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ 780 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
781 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 781 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
@@ -803,7 +803,7 @@ main(int argc, char **argv)
803 */ 803 */
804 const char *address = output_fname + strlen("udp://"); 804 const char *address = output_fname + strlen("udp://");
805 Eina_Error err; 805 Eina_Error err;
806 output = efl_add(EFL_NET_DIALER_UDP_CLASS, ecore_main_loop_get(), 806 output = efl_add(EFL_NET_DIALER_UDP_CLASS, efl_main_loop_get(),
807 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ 807 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
808 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 808 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
809 ); 809 );
@@ -831,7 +831,7 @@ main(int argc, char **argv)
831 */ 831 */
832 const char *address = output_fname + strlen("unix://"); 832 const char *address = output_fname + strlen("unix://");
833 Eina_Error err; 833 Eina_Error err;
834 output = efl_add(EFL_NET_DIALER_UNIX_CLASS, ecore_main_loop_get(), 834 output = efl_add(EFL_NET_DIALER_UNIX_CLASS, efl_main_loop_get(),
835 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ 835 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
836 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 836 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
837 ); 837 );
@@ -860,7 +860,7 @@ main(int argc, char **argv)
860 */ 860 */
861 const char *address = output_fname + strlen("windows://"); 861 const char *address = output_fname + strlen("windows://");
862 Eina_Error err; 862 Eina_Error err;
863 output = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, ecore_main_loop_get(), 863 output = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, efl_main_loop_get(),
864 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ 864 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
865 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 865 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
866 ); 866 );
@@ -888,7 +888,7 @@ main(int argc, char **argv)
888 */ 888 */
889 const char *address = output_fname + strlen("ssl://"); 889 const char *address = output_fname + strlen("ssl://");
890 Eina_Error err; 890 Eina_Error err;
891 output = efl_add(EFL_NET_DIALER_SSL_CLASS, ecore_main_loop_get(), 891 output = efl_add(EFL_NET_DIALER_SSL_CLASS, efl_main_loop_get(),
892 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */ 892 efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
893 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */ 893 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL) /* optional */
894 ); 894 );
@@ -941,7 +941,7 @@ main(int argc, char **argv)
941 if (line_delimiter) 941 if (line_delimiter)
942 line_delm_slice = (Eina_Slice)EINA_SLICE_STR(line_delimiter); 942 line_delm_slice = (Eina_Slice)EINA_SLICE_STR(line_delimiter);
943 943
944 copier = efl_add(EFL_IO_COPIER_CLASS, ecore_main_loop_get(), 944 copier = efl_add(EFL_IO_COPIER_CLASS, efl_main_loop_get(),
945 efl_io_copier_source_set(efl_added, input), /* mandatory */ 945 efl_io_copier_source_set(efl_added, input), /* mandatory */
946 efl_io_copier_destination_set(efl_added, output), /* optional, see :none: */ 946 efl_io_copier_destination_set(efl_added, output), /* optional, see :none: */
947 efl_io_copier_line_delimiter_set(efl_added, line_delm_slice), /* optional */ 947 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)
31 31
32 ecore_init(); 32 ecore_init();
33 33
34 loop = ecore_main_loop_get(); 34 loop = efl_main_loop_get();
35 input = efl_add(EFL_IO_STDIN_CLASS, loop); 35 input = efl_add(EFL_IO_STDIN_CLASS, loop);
36 output = efl_add(EFL_IO_STDOUT_CLASS, loop); 36 output = efl_add(EFL_IO_STDOUT_CLASS, loop);
37 copier = efl_add(EFL_IO_COPIER_CLASS, loop, 37 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)
285 * depend on main loop, thus their parent must be a loop 285 * depend on main loop, thus their parent must be a loop
286 * provider. We use the loop itself. 286 * provider. We use the loop itself.
287 */ 287 */
288 loop = ecore_main_loop_get(); 288 loop = efl_main_loop_get();
289 289
290 /* The TCP client to use to send/receive network data */ 290 /* The TCP client to use to send/receive network data */
291 dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop, 291 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)
1423 ecore_init(); 1423 ecore_init();
1424 ecore_con_init(); 1424 ecore_con_init();
1425 1425
1426 ctl = efl_add(EFL_NET_CONTROL_CLASS, ecore_main_loop_get(), 1426 ctl = efl_add(EFL_NET_CONTROL_CLASS, efl_main_loop_get(),
1427 efl_event_callback_array_add(efl_added, ctl_events_cbs(), NULL)); 1427 efl_event_callback_array_add(efl_added, ctl_events_cbs(), NULL));
1428 if (!ctl) 1428 if (!ctl)
1429 { 1429 {
@@ -1432,8 +1432,8 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
1432 goto end; 1432 goto end;
1433 } 1433 }
1434 1434
1435 input = efl_add(EFL_IO_STDIN_CLASS, ecore_main_loop_get()); 1435 input = efl_add(EFL_IO_STDIN_CLASS, efl_main_loop_get());
1436 copier = efl_add(EFL_IO_COPIER_CLASS, ecore_main_loop_get(), 1436 copier = efl_add(EFL_IO_COPIER_CLASS, efl_main_loop_get(),
1437 efl_io_copier_source_set(efl_added, input), 1437 efl_io_copier_source_set(efl_added, input),
1438 efl_io_copier_line_delimiter_set(efl_added, line_delimiter), 1438 efl_io_copier_line_delimiter_set(efl_added, line_delimiter),
1439 efl_io_copier_buffer_limit_set(efl_added, 8192), 1439 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)
269 269
270 if (quit_option) goto end; 270 if (quit_option) goto end;
271 271
272 loop = ecore_main_loop_get(); 272 loop = efl_main_loop_get();
273 273
274 args = ecore_getopt_parse_positional(&options, values, argc, argv, args); 274 args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
275 if (args < 0) 275 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)
326 326
327 if (quit_option) goto end; 327 if (quit_option) goto end;
328 328
329 loop = ecore_main_loop_get(); 329 loop = efl_main_loop_get();
330 330
331 args = ecore_getopt_parse_positional(&options, values, argc, argv, args); 331 args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
332 if (args < 0) 332 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)
254 254
255 if (quit_option) goto end; 255 if (quit_option) goto end;
256 256
257 loop = ecore_main_loop_get(); 257 loop = efl_main_loop_get();
258 258
259 args = ecore_getopt_parse_positional(&options, values, argc, argv, args); 259 args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
260 if (args < 0) 260 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)
181 181
182 if (quit_option) goto end; 182 if (quit_option) goto end;
183 183
184 loop = ecore_main_loop_get(); 184 loop = efl_main_loop_get();
185 185
186 args = ecore_getopt_parse_positional(&options, values, argc, argv, args); 186 args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
187 if (args < 0) 187 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)
261{ 261{
262 Eo *dialer; 262 Eo *dialer;
263 263
264 dialer = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, ecore_main_loop_get(), 264 dialer = efl_add(EFL_NET_DIALER_WEBSOCKET_CLASS, efl_main_loop_get(),
265 efl_name_set(efl_added, name), 265 efl_name_set(efl_added, name),
266 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL)); 266 efl_event_callback_array_add(efl_added, dialer_cbs(), NULL));
267 if (!dialer) 267 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)
286 286
287 if (quit_option) goto end; 287 if (quit_option) goto end;
288 288
289 loop = ecore_main_loop_get(); 289 loop = efl_main_loop_get();
290 290
291 args = ecore_getopt_parse_positional(&options, values, argc, argv, args); 291 args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
292 if (args < 0) 292 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)
181 181
182 if (quit_option) goto end; 182 if (quit_option) goto end;
183 183
184 loop = ecore_main_loop_get(); 184 loop = efl_main_loop_get();
185 185
186 args = ecore_getopt_parse_positional(&options, values, argc, argv, args); 186 args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
187 if (args < 0) 187 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)
637 goto end; 637 goto end;
638 } 638 }
639 639
640 server = efl_add(cls, ecore_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */ 640 server = efl_add(cls, efl_main_loop_get(), /* it's mandatory to use a main loop provider as the server parent */
641 efl_net_server_clients_limit_set(efl_added, 641 efl_net_server_clients_limit_set(efl_added,
642 clients_limit, 642 clients_limit,
643 clients_reject_excess), /* optional */ 643 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)
441 goto end; 441 goto end;
442 } 442 }
443 443
444 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 */ 444 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 */
445 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() */ 445 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() */
446 efl_net_server_clients_limit_set(efl_added, 446 efl_net_server_clients_limit_set(efl_added,
447 clients_limit, 447 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)
152 } 152 }
153 } 153 }
154 154
155 session = efl_add(EFL_NET_SESSION_CLASS, ecore_main_loop_get(), 155 session = efl_add(EFL_NET_SESSION_CLASS, efl_main_loop_get(),
156 efl_event_callback_array_add(efl_added, session_events_cbs(), NULL)); 156 efl_event_callback_array_add(efl_added, session_events_cbs(), NULL));
157 if (!session) 157 if (!session)
158 { 158 {
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)
352 352
353 if (quit_option) goto end; 353 if (quit_option) goto end;
354 354
355 loop = ecore_main_loop_get(); 355 loop = efl_main_loop_get();
356 356
357 args = ecore_getopt_parse_positional(&options, values, argc, argv, args); 357 args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
358 if (args < 0) 358 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)
310 fprintf(stderr, "INFO: * %s\n", str); 310 fprintf(stderr, "INFO: * %s\n", str);
311 eina_iterator_free(it); 311 eina_iterator_free(it);
312 312
313 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 */ 313 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 */
314 efl_net_server_ip_ipv6_only_set(efl_added, EINA_FALSE), /* optional, but helps testing IPv4 on IPv6 servers */ 314 efl_net_server_ip_ipv6_only_set(efl_added, EINA_FALSE), /* optional, but helps testing IPv4 on IPv6 servers */
315 efl_net_server_fd_reuse_address_set(efl_added, EINA_TRUE), /* optional, but nice for testing */ 315 efl_net_server_fd_reuse_address_set(efl_added, EINA_TRUE), /* optional, but nice for testing */
316 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 */ 316 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)
50 50
51void list_files(void *data) 51void list_files(void *data)
52{ 52{
53 Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get()); 53 Efl_Io_Manager *job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
54 const char *path = data; 54 const char *path = data;
55 55
56 eina_future_then(efl_io_manager_ls(job, path, NULL, progress_cb, NULL), done_cb, NULL); 56 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)
65{ 65{
66 Efl_Io_Manager *job; 66 Efl_Io_Manager *job;
67 67
68 job = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get()); 68 job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
69 69
70 eina_future_chain(efl_io_manager_open(job, path, EINA_FALSE), 70 eina_future_chain(efl_io_manager_open(job, path, EINA_FALSE),
71 { .cb = _open_cb, .data = job }, 71 { .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[])
83 eio_init(); 83 eio_init();
84 ecore_init(); 84 ecore_init();
85 85
86 job = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get()); 86 job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
87 87
88 path = getenv("HOME"); 88 path = getenv("HOME");
89 path2 = "./"; 89 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)
249 ELDBUS_CONNECTION_TYPE_SYSTEM : 249 ELDBUS_CONNECTION_TYPE_SYSTEM :
250 ELDBUS_CONNECTION_TYPE_SESSION); 250 ELDBUS_CONNECTION_TYPE_SESSION);
251 251
252 root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, ecore_main_loop_get(), 252 root = efl_add_ref(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(),
253 eldbus_model_object_constructor(efl_added, conn_type, NULL, EINA_FALSE, bus_name, path), 253 eldbus_model_object_constructor(efl_added, conn_type, NULL, EINA_FALSE, bus_name, path),
254 efl_event_callback_array_add(efl_added, event_cbs(), NULL)); 254 efl_event_callback_array_add(efl_added, event_cbs(), NULL));
255 255