aboutsummaryrefslogtreecommitdiffstats
path: root/src/examples
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2019-03-11 16:28:27 +0900
committerHermet Park <hermetpark@gmail.com>2019-03-11 16:28:27 +0900
commit05075a566b97655074ae0ee1c59d3b9c512c8bbc (patch)
treefaff984454c2e83ae3724829856ddf8f9a6ceabe /src/examples
parentMerge branch 'master' into devs/hermet/lottie (diff)
parentevas svg: replace internal vg legacy calls with interfaces. (diff)
downloadefl-05075a566b97655074ae0ee1c59d3b9c512c8bbc.tar.gz
Merge branch 'master' into devs/hermet/lottie
Diffstat (limited to 'src/examples')
-rw-r--r--src/examples/ecore/efl_io_buffered_stream_example.c2
-rw-r--r--src/examples/ecore/efl_io_copier_example.c6
-rw-r--r--src/examples/ecore/efl_io_queue_example.c2
-rw-r--r--src/examples/ecore/efl_net_dialer_http_example.c6
-rw-r--r--src/examples/ecore/efl_net_dialer_simple_example.c4
-rw-r--r--src/examples/ecore/efl_net_dialer_udp_example.c6
-rw-r--r--src/examples/ecore/efl_net_dialer_unix_example.c6
-rw-r--r--src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c4
-rw-r--r--src/examples/ecore/efl_net_dialer_websocket_example.c6
-rw-r--r--src/examples/ecore/efl_net_dialer_windows_example.c6
-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_socket_ssl_dialer_example.c6
-rw-r--r--src/examples/ecore/efl_net_socket_ssl_server_example.c2
-rw-r--r--src/examples/ecore/efl_thread.c4
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c4
-rw-r--r--src/examples/eolian_cxx/ns_colourable.eo1
-rw-r--r--src/examples/eolian_cxx/ns_colourablesquare.eo1
18 files changed, 34 insertions, 36 deletions
diff --git a/src/examples/ecore/efl_io_buffered_stream_example.c b/src/examples/ecore/efl_io_buffered_stream_example.c
index c7fe102890..1f816c7072 100644
--- a/src/examples/ecore/efl_io_buffered_stream_example.c
+++ b/src/examples/ecore/efl_io_buffered_stream_example.c
@@ -236,7 +236,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/src/examples/ecore/efl_io_copier_example.c b/src/examples/ecore/efl_io_copier_example.c
index 13f26b8577..d4e36b7070 100644
--- a/src/examples/ecore/efl_io_copier_example.c
+++ b/src/examples/ecore/efl_io_copier_example.c
@@ -77,9 +77,9 @@ _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_RESOLVED, _dialer_resolved },
+ { EFL_NET_DIALER_EVENT_DIALER_ERROR, _dialer_error },
+ { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected });
static void
_http_headers_done(void *data EINA_UNUSED, const Efl_Event *event)
diff --git a/src/examples/ecore/efl_io_queue_example.c b/src/examples/ecore/efl_io_queue_example.c
index 62e6035450..7a22feb631 100644
--- a/src/examples/ecore/efl_io_queue_example.c
+++ b/src/examples/ecore/efl_io_queue_example.c
@@ -305,7 +305,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/src/examples/ecore/efl_net_dialer_http_example.c b/src/examples/ecore/efl_net_dialer_http_example.c
index 02783dc165..1289fb01ba 100644
--- a/src/examples/ecore/efl_net_dialer_http_example.c
+++ b/src/examples/ecore/efl_net_dialer_http_example.c
@@ -71,9 +71,9 @@ _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_RESOLVED, _resolved },
- { EFL_NET_DIALER_EVENT_ERROR, _error },
+ { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
+ { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
+ { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
{ EFL_IO_CLOSER_EVENT_CLOSED, _closed },
{ EFL_IO_READER_EVENT_EOS, _eos });
diff --git a/src/examples/ecore/efl_net_dialer_simple_example.c b/src/examples/ecore/efl_net_dialer_simple_example.c
index 1285dae2f1..40243cc11f 100644
--- a/src/examples/ecore/efl_net_dialer_simple_example.c
+++ b/src/examples/ecore/efl_net_dialer_simple_example.c
@@ -176,8 +176,8 @@ _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_RESOLVED, _resolved }, /* optional */
+ { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected }, /* optional */
+ { EFL_NET_DIALER_EVENT_DIALER_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 */
{ EFL_IO_BUFFERED_STREAM_EVENT_LINE, _line }, /* optional, could use 'slice,changed' or 'can_read,changed' instead */
diff --git a/src/examples/ecore/efl_net_dialer_udp_example.c b/src/examples/ecore/efl_net_dialer_udp_example.c
index bb01b58f8a..3fef035eef 100644
--- a/src/examples/ecore/efl_net_dialer_udp_example.c
+++ b/src/examples/ecore/efl_net_dialer_udp_example.c
@@ -156,9 +156,9 @@ _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_RESOLVED, _resolved },
- { EFL_NET_DIALER_EVENT_ERROR, _error },
+ { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
+ { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
+ { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
{ EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read },
{ EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _can_write }
);
diff --git a/src/examples/ecore/efl_net_dialer_unix_example.c b/src/examples/ecore/efl_net_dialer_unix_example.c
index f0298aed4a..8cfb2213e1 100644
--- a/src/examples/ecore/efl_net_dialer_unix_example.c
+++ b/src/examples/ecore/efl_net_dialer_unix_example.c
@@ -108,9 +108,9 @@ _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_RESOLVED, _resolved },
- { EFL_NET_DIALER_EVENT_ERROR, _error },
+ { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
+ { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
+ { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
{ EFL_IO_READER_EVENT_EOS, _eos },
{ EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read },
{ EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _can_write }
diff --git a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
index 037a0aca52..45a3ed2ae4 100644
--- a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
+++ b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
@@ -247,8 +247,8 @@ 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_ERROR, _error },
+ { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
+ { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
{ EFL_IO_CLOSER_EVENT_CLOSED, _closed },
{ EFL_IO_READER_EVENT_EOS, _eos },
{ EFL_EVENT_DEL, _del });
diff --git a/src/examples/ecore/efl_net_dialer_websocket_example.c b/src/examples/ecore/efl_net_dialer_websocket_example.c
index e46a8c78a9..a74323b3db 100644
--- a/src/examples/ecore/efl_net_dialer_websocket_example.c
+++ b/src/examples/ecore/efl_net_dialer_websocket_example.c
@@ -145,9 +145,9 @@ 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_RESOLVED, _resolved },
- { EFL_NET_DIALER_EVENT_ERROR, _error },
+ { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
+ { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
+ { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
{ EFL_IO_CLOSER_EVENT_CLOSED, _closed },
{ EFL_IO_READER_EVENT_EOS, _eos });
diff --git a/src/examples/ecore/efl_net_dialer_windows_example.c b/src/examples/ecore/efl_net_dialer_windows_example.c
index 44daab0bfa..e5be598eac 100644
--- a/src/examples/ecore/efl_net_dialer_windows_example.c
+++ b/src/examples/ecore/efl_net_dialer_windows_example.c
@@ -106,9 +106,9 @@ _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_RESOLVED, _resolved },
- { EFL_NET_DIALER_EVENT_ERROR, _error },
+ { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
+ { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
+ { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
{ EFL_IO_READER_EVENT_EOS, _eos },
{ EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read },
{ EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _can_write }
diff --git a/src/examples/ecore/efl_net_server_example.c b/src/examples/ecore/efl_net_server_example.c
index b599336960..4c3f200339 100644
--- a/src/examples/ecore/efl_net_server_example.c
+++ b/src/examples/ecore/efl_net_server_example.c
@@ -450,7 +450,7 @@ _server_serving(void *data EINA_UNUSED, const Efl_Event *event)
EFL_CALLBACKS_ARRAY_DEFINE(server_cbs,
{ EFL_NET_SERVER_EVENT_CLIENT_ADD, _server_client_add },
{ EFL_NET_SERVER_EVENT_CLIENT_REJECTED, _server_client_rejected },
- { EFL_NET_SERVER_EVENT_ERROR, _server_error },
+ { EFL_NET_SERVER_EVENT_SERVER_ERROR, _server_error },
{ EFL_NET_SERVER_EVENT_SERVING, _server_serving });
static const char * protocols[] = {
diff --git a/src/examples/ecore/efl_net_server_simple_example.c b/src/examples/ecore/efl_net_server_simple_example.c
index 6477ad2a3d..36a2d8c06d 100644
--- a/src/examples/ecore/efl_net_server_simple_example.c
+++ b/src/examples/ecore/efl_net_server_simple_example.c
@@ -254,7 +254,7 @@ _server_serving(void *data EINA_UNUSED, const Efl_Event *event)
EFL_CALLBACKS_ARRAY_DEFINE(server_cbs,
{ EFL_NET_SERVER_EVENT_CLIENT_ADD, _server_client_add },
{ EFL_NET_SERVER_EVENT_CLIENT_REJECTED, _server_client_rejected },
- { EFL_NET_SERVER_EVENT_ERROR, _server_error },
+ { EFL_NET_SERVER_EVENT_SERVER_ERROR, _server_error },
{ EFL_NET_SERVER_EVENT_SERVING, _server_serving });
static const char * protocols[] = {
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 0bc77c3477..1ade6bc9c2 100644
--- a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
@@ -177,9 +177,9 @@ _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_RESOLVED, _resolved },
- { EFL_NET_DIALER_EVENT_ERROR, _error });
+ { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
+ { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
+ { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error });
static char *
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 33b67d2b21..6d826b6047 100644
--- a/src/examples/ecore/efl_net_socket_ssl_server_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_server_example.c
@@ -153,7 +153,7 @@ _server_serving(void *data EINA_UNUSED, const Efl_Event *event)
EFL_CALLBACKS_ARRAY_DEFINE(server_cbs,
{ EFL_NET_SERVER_EVENT_CLIENT_ADD, _server_client_add },
- { EFL_NET_SERVER_EVENT_ERROR, _server_error },
+ { EFL_NET_SERVER_EVENT_SERVER_ERROR, _server_error },
{ EFL_NET_SERVER_EVENT_SERVING, _server_serving });
static const char *ciphers_strs[] = {
diff --git a/src/examples/ecore/efl_thread.c b/src/examples/ecore/efl_thread.c
index 48a20e9ccc..a0b1a3a4eb 100644
--- a/src/examples/ecore/efl_thread.c
+++ b/src/examples/ecore/efl_thread.c
@@ -53,11 +53,11 @@ _th_read_change(void *data EINA_UNUSED, const Efl_Event *ev)
if (!strcmp(s, "one"))
efl_add(EFL_LOOP_TIMER_CLASS, obj,
efl_loop_timer_interval_set(efl_added, 2.0),
- efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _th_timeout, obj));
+ efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _th_timeout, obj));
else
efl_add(EFL_LOOP_TIMER_CLASS, obj,
efl_loop_timer_interval_set(efl_added, 1.0),
- efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _th_timeout, obj));
+ efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _th_timeout, obj));
eina_accessor_free(args_access);
}
}
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index bf22dfb441..cad8e112ad 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -126,8 +126,8 @@ elm_main(int argc EINA_UNUSED, char **argv)
priv_d.list = list = efl_add(EFL_UI_LIST_CLASS, wbox);
efl_gfx_hint_weight_set(list, EFL_GFX_HINT_EXPAND, 0.9);
- efl_event_callback_add(list, EFL_UI_EVENT_SELECTED, _list_selected, NULL);
- efl_event_callback_add(list, EFL_UI_EVENT_UNSELECTED, _list_unselected, NULL);
+ efl_event_callback_add(list, EFL_UI_EVENT_SELECTABLE_SELECTED, _list_selected, NULL);
+ efl_event_callback_add(list, EFL_UI_EVENT_SELECTABLE_UNSELECTED, _list_unselected, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_PRESSED, _list_pressed, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_UNPRESSED, _list_unpressed, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_LONGPRESSED, _list_longpressed, NULL);
diff --git a/src/examples/eolian_cxx/ns_colourable.eo b/src/examples/eolian_cxx/ns_colourable.eo
index 8fce408cf6..977dc4f3fc 100644
--- a/src/examples/eolian_cxx/ns_colourable.eo
+++ b/src/examples/eolian_cxx/ns_colourable.eo
@@ -5,7 +5,6 @@ class Ns.Colourable extends Efl.Object
methods {
rgb_24bits_constructor {
[[RGB Constructor.]]
- legacy: null;
params {
@in rgb: int; [[24-bit RGB Component.]]
}
diff --git a/src/examples/eolian_cxx/ns_colourablesquare.eo b/src/examples/eolian_cxx/ns_colourablesquare.eo
index 733701f705..7ebc260798 100644
--- a/src/examples/eolian_cxx/ns_colourablesquare.eo
+++ b/src/examples/eolian_cxx/ns_colourablesquare.eo
@@ -14,7 +14,6 @@ class Ns.ColourableSquare extends Ns.Colourable
}
}
size_constructor {
- legacy: null;
params {
@in size: int;
}