From 679c89d98d93f6853bffccb135eb50447b8efffe Mon Sep 17 00:00:00 2001
From: Xavi Artigas <xavierartigas@yahoo.es>
Date: Sat, 9 Mar 2019 15:54:38 +0100
Subject: [PATCH] Adapt to latest event names

---
 apps/c/life/src/life_board.c                             | 2 +-
 reference/c/core/src/core_event.c                        | 4 ++--
 reference/c/core/src/core_idler.c                        | 2 +-
 reference/c/core/src/core_poll.c                         | 2 +-
 reference/c/eina/src/eina_future.c                       | 6 +++---
 reference/c/net/src/net_io.c                             | 2 +-
 reference/c/net/src/net_io_buffered.c                    | 2 +-
 reference/c/net/src/net_session.c                        | 2 +-
 tutorial/c/lifecycle/src/lifecycle_main.c                | 2 +-
 unsorted/ecore/efl_io_buffered_stream_example.c          | 2 +-
 unsorted/ecore/efl_io_copier_example.c                   | 2 +-
 unsorted/ecore/efl_io_queue_example.c                    | 2 +-
 unsorted/ecore/efl_net_dialer_http_example.c             | 2 +-
 unsorted/ecore/efl_net_dialer_simple_example.c           | 2 +-
 unsorted/ecore/efl_net_dialer_udp_example.c              | 2 +-
 unsorted/ecore/efl_net_dialer_unix_example.c             | 2 +-
 unsorted/ecore/efl_net_dialer_websocket_autobahntestee.c | 2 +-
 unsorted/ecore/efl_net_dialer_websocket_example.c        | 2 +-
 unsorted/ecore/efl_net_dialer_windows_example.c          | 2 +-
 unsorted/ecore/efl_net_socket_ssl_dialer_example.c       | 2 +-
 20 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/apps/c/life/src/life_board.c b/apps/c/life/src/life_board.c
index a1533c95..0ad8e41c 100644
--- a/apps/c/life/src/life_board.c
+++ b/apps/c/life/src/life_board.c
@@ -67,7 +67,7 @@ life_board_run(Efl_Ui_Win *win)
    _life_timer = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
                          efl_loop_timer_interval_set(efl_added, 0.1));
 
-   efl_event_callback_add(_life_timer, EFL_LOOP_TIMER_EVENT_TICK, _life_tick, win);
+   efl_event_callback_add(_life_timer, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _life_tick, win);
 }
 
 int
diff --git a/reference/c/core/src/core_event.c b/reference/c/core/src/core_event.c
index f62f25c4..b4403bc1 100644
--- a/reference/c/core/src/core_event.c
+++ b/reference/c/core/src/core_event.c
@@ -69,7 +69,7 @@ _events_freeze(Efl_Loop *mainloop)
    efl_add(EFL_LOOP_TIMER_CLASS, mainloop,
            efl_name_set(efl_added, "timer2"),
            efl_loop_timer_interval_set(efl_added, .1),
-           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _freezethaw_cb, mainloop));
+           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _freezethaw_cb, mainloop));
 }
 
 static void
@@ -90,7 +90,7 @@ _timer_cb(void *data EINA_UNUSED, const Efl_Event *event)
 }
 
 EFL_CALLBACKS_ARRAY_DEFINE(_callback_array,
-{ EFL_LOOP_TIMER_EVENT_TICK, _timer_cb },
+{ EFL_LOOP_TIMER_EVENT_TIMER_TICK, _timer_cb },
 { EFL_EVENT_DEL, _del_obj_cb })
 
 static void
diff --git a/reference/c/core/src/core_idler.c b/reference/c/core/src/core_idler.c
index 48f07a28..386851eb 100644
--- a/reference/c/core/src/core_idler.c
+++ b/reference/c/core/src/core_idler.c
@@ -60,7 +60,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
 
    efl_add(EFL_LOOP_TIMER_CLASS, loop,
            efl_loop_timer_interval_set(efl_added, 0.0005),
-           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _timer_cb, NULL));
+           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _timer_cb, NULL));
 }
 EFL_MAIN()
 
diff --git a/reference/c/core/src/core_poll.c b/reference/c/core/src/core_poll.c
index 38de6a44..7cab2d59 100644
--- a/reference/c/core/src/core_poll.c
+++ b/reference/c/core/src/core_poll.c
@@ -64,7 +64,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
 
    efl_add(EFL_LOOP_TIMER_CLASS, loop,
            efl_loop_timer_interval_set(efl_added, 30),
-           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _timer_cb, NULL));
+           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _timer_cb, NULL));
 }
 EFL_MAIN()
 
diff --git a/reference/c/eina/src/eina_future.c b/reference/c/eina/src/eina_future.c
index 774118a2..62326255 100644
--- a/reference/c/eina/src/eina_future.c
+++ b/reference/c/eina/src/eina_future.c
@@ -103,7 +103,7 @@ _test1_simple_future(Efl_Loop *loop)
    // simulate a delayed promise resolve.
    efl_add(EFL_LOOP_TIMER_CLASS, loop,
            efl_loop_timer_interval_set(efl_added, 1),
-           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK,
+           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK,
                                   _test1_resolve, promise));
 }
 
@@ -154,7 +154,7 @@ _test2_failed_future(Efl_Loop *loop)
    // simulate a delayed promise rejection.
    efl_add(EFL_LOOP_TIMER_CLASS, loop,
            efl_loop_timer_interval_set(efl_added, 1),
-           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK,
+           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK,
                                   _test2_reject, promise));
 }
 
@@ -278,7 +278,7 @@ _test4_chained_future(Efl_Loop *loop)
    // simulate a delayed promise resolve.
    efl_add(EFL_LOOP_TIMER_CLASS, loop,
            efl_loop_timer_interval_set(efl_added, 1),
-           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK,
+           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK,
                                   _test4_resolve, promise));
 }
 
diff --git a/reference/c/net/src/net_io.c b/reference/c/net/src/net_io.c
index 6ba33dd8..f4daed69 100644
--- a/reference/c/net/src/net_io.c
+++ b/reference/c/net/src/net_io.c
@@ -197,7 +197,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
    /* The TCP client to use to send/receive network data */
    _dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop,
                     efl_name_set(efl_added, "dialer"),
-                    efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL));
+                    efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected, NULL));
    if (!_dialer)
      {
         fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n");
diff --git a/reference/c/net/src/net_io_buffered.c b/reference/c/net/src/net_io_buffered.c
index a3aa2f89..651c6444 100644
--- a/reference/c/net/src/net_io_buffered.c
+++ b/reference/c/net/src/net_io_buffered.c
@@ -138,7 +138,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
    /* The TCP client to use to send/receive network data */
    _dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop,
                      efl_name_set(efl_added, "dialer"),
-                     efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL));
+                     efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected, NULL));
    if (!_dialer)
      {
         fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n");
diff --git a/reference/c/net/src/net_session.c b/reference/c/net/src/net_session.c
index d08acb13..ab5ec6bd 100644
--- a/reference/c/net/src/net_session.c
+++ b/reference/c/net/src/net_session.c
@@ -134,7 +134,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
    // Wait for 10 seconds before exiting this example
    efl_add(EFL_LOOP_TIMER_CLASS, loop,
            efl_loop_timer_interval_set(efl_added, 10.0),
-           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK,
+           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK,
                                   _quit_cb, NULL));
 }
 EFL_MAIN()
diff --git a/tutorial/c/lifecycle/src/lifecycle_main.c b/tutorial/c/lifecycle/src/lifecycle_main.c
index 0a6f3b86..70030c59 100644
--- a/tutorial/c/lifecycle/src/lifecycle_main.c
+++ b/tutorial/c/lifecycle/src/lifecycle_main.c
@@ -61,7 +61,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
    // The timer function will trigger the chain of simulated events to show
    // how an app could respond to system lifecycle events.
    efl_add(EFL_LOOP_TIMER_CLASS, ev->object,
-           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _lifecycle_simulation, ev->object),
+           efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _lifecycle_simulation, ev->object),
            efl_loop_timer_interval_set(efl_added, 1.0));
 }
 EFL_MAIN_EX()
diff --git a/unsorted/ecore/efl_io_buffered_stream_example.c b/unsorted/ecore/efl_io_buffered_stream_example.c
index 3338bae3..50f69386 100644
--- a/unsorted/ecore/efl_io_buffered_stream_example.c
+++ b/unsorted/ecore/efl_io_buffered_stream_example.c
@@ -235,7 +235,7 @@ efl_main(void *data EINA_UNUSED,
    /* The TCP client to use to send/receive network data */
    dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, ev->object,
                     efl_name_set(efl_added, "dialer"),
-                    efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL));
+                    efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected, NULL));
    if (!dialer)
      {
         fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n");
diff --git a/unsorted/ecore/efl_io_copier_example.c b/unsorted/ecore/efl_io_copier_example.c
index b7e526bd..ffeb97ed 100644
--- a/unsorted/ecore/efl_io_copier_example.c
+++ b/unsorted/ecore/efl_io_copier_example.c
@@ -78,7 +78,7 @@ _dialer_connected(void *data EINA_UNUSED, const Efl_Event *event)
 EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
                            { EFL_NET_DIALER_EVENT_RESOLVED, _dialer_resolved },
                            { EFL_NET_DIALER_EVENT_ERROR, _dialer_error },
-                           { EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected });
+                           { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected });
 
 static void
 _http_headers_done(void *data EINA_UNUSED, const Efl_Event *event)
diff --git a/unsorted/ecore/efl_io_queue_example.c b/unsorted/ecore/efl_io_queue_example.c
index 93677167..c21c71e5 100644
--- a/unsorted/ecore/efl_io_queue_example.c
+++ b/unsorted/ecore/efl_io_queue_example.c
@@ -304,7 +304,7 @@ efl_main(void *data EINA_UNUSED,
    /* The TCP client to use to send/receive network data */
    dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop,
                     efl_name_set(efl_added, "dialer"),
-                    efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL));
+                    efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected, NULL));
    if (!dialer)
      {
         fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n");
diff --git a/unsorted/ecore/efl_net_dialer_http_example.c b/unsorted/ecore/efl_net_dialer_http_example.c
index f1a97eef..6a4e4ecb 100644
--- a/unsorted/ecore/efl_net_dialer_http_example.c
+++ b/unsorted/ecore/efl_net_dialer_http_example.c
@@ -70,7 +70,7 @@ _http_headers_done(void *data EINA_UNUSED, const Efl_Event *event)
 
 EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
                            { EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, _http_headers_done },
-                           { EFL_NET_DIALER_EVENT_CONNECTED, _connected },
+                           { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
                            { EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
                            { EFL_NET_DIALER_EVENT_ERROR, _error },
                            { EFL_IO_CLOSER_EVENT_CLOSED, _closed },
diff --git a/unsorted/ecore/efl_net_dialer_simple_example.c b/unsorted/ecore/efl_net_dialer_simple_example.c
index 219da892..07fd0cb7 100644
--- a/unsorted/ecore/efl_net_dialer_simple_example.c
+++ b/unsorted/ecore/efl_net_dialer_simple_example.c
@@ -175,7 +175,7 @@ _done(void *data EINA_UNUSED, const Efl_Event *event)
 }
 
 EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
-                           { EFL_NET_DIALER_EVENT_CONNECTED, _connected }, /* optional */
+                           { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected }, /* optional */
                            { EFL_NET_DIALER_EVENT_RESOLVED, _resolved }, /* optional */
                            { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read }, /* optional, can be used to read data, here just for monitoring */
                            { EFL_IO_READER_EVENT_EOS, _eos }, /* recommended, notifies no more incoming data */
diff --git a/unsorted/ecore/efl_net_dialer_udp_example.c b/unsorted/ecore/efl_net_dialer_udp_example.c
index 3b13a60c..b9270c9b 100644
--- a/unsorted/ecore/efl_net_dialer_udp_example.c
+++ b/unsorted/ecore/efl_net_dialer_udp_example.c
@@ -155,7 +155,7 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
 }
 
 EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
-                           { EFL_NET_DIALER_EVENT_CONNECTED, _connected },
+                           { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
                            { EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
                            { EFL_NET_DIALER_EVENT_ERROR, _error },
                            { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read },
diff --git a/unsorted/ecore/efl_net_dialer_unix_example.c b/unsorted/ecore/efl_net_dialer_unix_example.c
index b610dd42..2780f070 100644
--- a/unsorted/ecore/efl_net_dialer_unix_example.c
+++ b/unsorted/ecore/efl_net_dialer_unix_example.c
@@ -107,7 +107,7 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
 }
 
 EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
-                           { EFL_NET_DIALER_EVENT_CONNECTED, _connected },
+                           { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
                            { EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
                            { EFL_NET_DIALER_EVENT_ERROR, _error },
                            { EFL_IO_READER_EVENT_EOS, _eos },
diff --git a/unsorted/ecore/efl_net_dialer_websocket_autobahntestee.c b/unsorted/ecore/efl_net_dialer_websocket_autobahntestee.c
index fd0c0981..1eeae41b 100644
--- a/unsorted/ecore/efl_net_dialer_websocket_autobahntestee.c
+++ b/unsorted/ecore/efl_net_dialer_websocket_autobahntestee.c
@@ -246,7 +246,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
                            { EFL_NET_DIALER_WEBSOCKET_EVENT_CLOSED_REASON, _ws_closed_reason },
                            { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_TEXT, _ws_message_text },
                            { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_BINARY, _ws_message_binary },
-                           { EFL_NET_DIALER_EVENT_CONNECTED, _connected },
+                           { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
                            { EFL_NET_DIALER_EVENT_ERROR, _error },
                            { EFL_IO_CLOSER_EVENT_CLOSED, _closed },
                            { EFL_IO_READER_EVENT_EOS, _eos },
diff --git a/unsorted/ecore/efl_net_dialer_websocket_example.c b/unsorted/ecore/efl_net_dialer_websocket_example.c
index e0b72e49..d2ed3b9a 100644
--- a/unsorted/ecore/efl_net_dialer_websocket_example.c
+++ b/unsorted/ecore/efl_net_dialer_websocket_example.c
@@ -144,7 +144,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
                            { EFL_NET_DIALER_WEBSOCKET_EVENT_CLOSED_REASON, _ws_closed_reason },
                            { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_TEXT, _ws_message_text },
                            { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_BINARY, _ws_message_binary },
-                           { EFL_NET_DIALER_EVENT_CONNECTED, _connected },
+                           { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
                            { EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
                            { EFL_NET_DIALER_EVENT_ERROR, _error },
                            { EFL_IO_CLOSER_EVENT_CLOSED, _closed },
diff --git a/unsorted/ecore/efl_net_dialer_windows_example.c b/unsorted/ecore/efl_net_dialer_windows_example.c
index 44daab0b..ed2efe40 100644
--- a/unsorted/ecore/efl_net_dialer_windows_example.c
+++ b/unsorted/ecore/efl_net_dialer_windows_example.c
@@ -106,7 +106,7 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
 }
 
 EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
-                           { EFL_NET_DIALER_EVENT_CONNECTED, _connected },
+                           { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
                            { EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
                            { EFL_NET_DIALER_EVENT_ERROR, _error },
                            { EFL_IO_READER_EVENT_EOS, _eos },
diff --git a/unsorted/ecore/efl_net_socket_ssl_dialer_example.c b/unsorted/ecore/efl_net_socket_ssl_dialer_example.c
index 10cec47d..e816b32f 100644
--- a/unsorted/ecore/efl_net_socket_ssl_dialer_example.c
+++ b/unsorted/ecore/efl_net_socket_ssl_dialer_example.c
@@ -176,7 +176,7 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
 }
 
 EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
-                           { EFL_NET_DIALER_EVENT_CONNECTED, _connected },
+                           { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
                            { EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
                            { EFL_NET_DIALER_EVENT_ERROR, _error });