diff options
author | Xavi Artigas <xavierartigas@yahoo.es> | 2018-04-23 13:35:36 -0700 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2018-04-23 13:35:36 -0700 |
commit | 0448e6cfa48e4a69978356147c08b57091db36d6 (patch) | |
tree | fe035261947df52b89449225ab94ff415e0503d4 | |
parent | bc7793f138e6c84f5692be98ca70c9d9a3306ada (diff) |
Update examples to latest EFL API
Summary:
Some of the EFL tutorials are not currently building due to changes in the API :
* const Eo* in getters.
* Efl.Loop -> Efl.App
* efl_net_session_name -> efl_net_session_network_name
Reviewers: cedric
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D5977
-rw-r--r-- | reference/c/core/src/core_loop.c | 2 | ||||
-rw-r--r-- | reference/c/net/src/net_session.c | 2 | ||||
-rw-r--r-- | tutorial/c/eo-classes/src/example_rectangle.c | 4 | ||||
-rw-r--r-- | tutorial/c/eo-inherit/src/example_rectangle.c | 4 | ||||
-rw-r--r-- | tutorial/c/eo-multiinherit/src/example_circle.c | 2 | ||||
-rw-r--r-- | tutorial/c/eo-multiinherit/src/example_colored.c | 2 | ||||
-rw-r--r-- | tutorial/c/eo-multiinherit/src/example_rectangle.c | 4 | ||||
-rw-r--r-- | tutorial/c/lifecycle/src/lifecycle_main.c | 4 |
8 files changed, 12 insertions, 12 deletions
diff --git a/reference/c/core/src/core_loop.c b/reference/c/core/src/core_loop.c index 35116e84..0e7f545f 100644 --- a/reference/c/core/src/core_loop.c +++ b/reference/c/core/src/core_loop.c | |||
@@ -119,7 +119,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev) | |||
119 | Efl_Loop *loop; | 119 | Efl_Loop *loop; |
120 | 120 | ||
121 | loop = ev->object; | 121 | loop = ev->object; |
122 | version = efl_loop_efl_version_get(loop); | 122 | version = efl_app_efl_version_get(loop); |
123 | printf("Running on EFL version %d.%d.%d [%s]\n\n", version->major, version->minor, | 123 | printf("Running on EFL version %d.%d.%d [%s]\n\n", version->major, version->minor, |
124 | version->micro, version->build_id); | 124 | version->micro, version->build_id); |
125 | _print_loop(loop, "Application"); | 125 | _print_loop(loop, "Application"); |
diff --git a/reference/c/net/src/net_session.c b/reference/c/net/src/net_session.c index 609d84b5..d08acb13 100644 --- a/reference/c/net/src/net_session.c +++ b/reference/c/net/src/net_session.c | |||
@@ -68,7 +68,7 @@ _session_changed(void *data EINA_UNUSED, const Efl_Event *event) | |||
68 | " state: %s\n" | 68 | " state: %s\n" |
69 | " technology: %s\n" | 69 | " technology: %s\n" |
70 | " interface: '%s'\n", | 70 | " interface: '%s'\n", |
71 | efl_net_session_name_get(session), | 71 | efl_net_session_network_name_get(session), |
72 | _state_name(efl_net_session_state_get(session)), | 72 | _state_name(efl_net_session_state_get(session)), |
73 | _technology_name(efl_net_session_technology_get(session)), | 73 | _technology_name(efl_net_session_technology_get(session)), |
74 | efl_net_session_interface_get(session)); | 74 | efl_net_session_interface_get(session)); |
diff --git a/tutorial/c/eo-classes/src/example_rectangle.c b/tutorial/c/eo-classes/src/example_rectangle.c index 30b73774..85509395 100644 --- a/tutorial/c/eo-classes/src/example_rectangle.c +++ b/tutorial/c/eo-classes/src/example_rectangle.c | |||
@@ -14,7 +14,7 @@ _example_rectangle_width_set(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd, in | |||
14 | } | 14 | } |
15 | 15 | ||
16 | EOLIAN static int | 16 | EOLIAN static int |
17 | _example_rectangle_width_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) | 17 | _example_rectangle_width_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) |
18 | { | 18 | { |
19 | return pd->width; | 19 | return pd->width; |
20 | } | 20 | } |
@@ -26,7 +26,7 @@ _example_rectangle_height_set(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd, i | |||
26 | } | 26 | } |
27 | 27 | ||
28 | EOLIAN static int | 28 | EOLIAN static int |
29 | _example_rectangle_height_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) | 29 | _example_rectangle_height_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) |
30 | { | 30 | { |
31 | return pd->height; | 31 | return pd->height; |
32 | } | 32 | } |
diff --git a/tutorial/c/eo-inherit/src/example_rectangle.c b/tutorial/c/eo-inherit/src/example_rectangle.c index 30b73774..85509395 100644 --- a/tutorial/c/eo-inherit/src/example_rectangle.c +++ b/tutorial/c/eo-inherit/src/example_rectangle.c | |||
@@ -14,7 +14,7 @@ _example_rectangle_width_set(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd, in | |||
14 | } | 14 | } |
15 | 15 | ||
16 | EOLIAN static int | 16 | EOLIAN static int |
17 | _example_rectangle_width_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) | 17 | _example_rectangle_width_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) |
18 | { | 18 | { |
19 | return pd->width; | 19 | return pd->width; |
20 | } | 20 | } |
@@ -26,7 +26,7 @@ _example_rectangle_height_set(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd, i | |||
26 | } | 26 | } |
27 | 27 | ||
28 | EOLIAN static int | 28 | EOLIAN static int |
29 | _example_rectangle_height_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) | 29 | _example_rectangle_height_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) |
30 | { | 30 | { |
31 | return pd->height; | 31 | return pd->height; |
32 | } | 32 | } |
diff --git a/tutorial/c/eo-multiinherit/src/example_circle.c b/tutorial/c/eo-multiinherit/src/example_circle.c index 7fe69b2a..5bdc94b3 100644 --- a/tutorial/c/eo-multiinherit/src/example_circle.c +++ b/tutorial/c/eo-multiinherit/src/example_circle.c | |||
@@ -14,7 +14,7 @@ _example_circle_radius_set(Eo *obj EINA_UNUSED, Example_Circle_Data *pd, int rad | |||
14 | } | 14 | } |
15 | 15 | ||
16 | EOLIAN static int | 16 | EOLIAN static int |
17 | _example_circle_radius_get(Eo *obj EINA_UNUSED , Example_Circle_Data *pd) | 17 | _example_circle_radius_get(const Eo *obj EINA_UNUSED , Example_Circle_Data *pd) |
18 | { | 18 | { |
19 | return pd->radius; | 19 | return pd->radius; |
20 | } | 20 | } |
diff --git a/tutorial/c/eo-multiinherit/src/example_colored.c b/tutorial/c/eo-multiinherit/src/example_colored.c index e054a530..2c9135fc 100644 --- a/tutorial/c/eo-multiinherit/src/example_colored.c +++ b/tutorial/c/eo-multiinherit/src/example_colored.c | |||
@@ -17,7 +17,7 @@ _example_colored_color_set(Eo *obj EINA_UNUSED, Example_Colored_Data *pd, | |||
17 | } | 17 | } |
18 | 18 | ||
19 | EOLIAN static void | 19 | EOLIAN static void |
20 | _example_colored_color_get(Eo *obj EINA_UNUSED, Example_Colored_Data *pd, | 20 | _example_colored_color_get(const Eo *obj EINA_UNUSED, Example_Colored_Data *pd, |
21 | int *red, int *green, int *blue) | 21 | int *red, int *green, int *blue) |
22 | { | 22 | { |
23 | if (red) | 23 | if (red) |
diff --git a/tutorial/c/eo-multiinherit/src/example_rectangle.c b/tutorial/c/eo-multiinherit/src/example_rectangle.c index ef5a08b7..8b82700f 100644 --- a/tutorial/c/eo-multiinherit/src/example_rectangle.c +++ b/tutorial/c/eo-multiinherit/src/example_rectangle.c | |||
@@ -14,7 +14,7 @@ _example_rectangle_width_set(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd, in | |||
14 | } | 14 | } |
15 | 15 | ||
16 | EOLIAN static int | 16 | EOLIAN static int |
17 | _example_rectangle_width_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) | 17 | _example_rectangle_width_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) |
18 | { | 18 | { |
19 | return pd->width; | 19 | return pd->width; |
20 | } | 20 | } |
@@ -26,7 +26,7 @@ _example_rectangle_height_set(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd, i | |||
26 | } | 26 | } |
27 | 27 | ||
28 | EOLIAN static int | 28 | EOLIAN static int |
29 | _example_rectangle_height_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) | 29 | _example_rectangle_height_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd) |
30 | { | 30 | { |
31 | return pd->height; | 31 | return pd->height; |
32 | } | 32 | } |
diff --git a/tutorial/c/lifecycle/src/lifecycle_main.c b/tutorial/c/lifecycle/src/lifecycle_main.c index 5165661c..0a6f3b86 100644 --- a/tutorial/c/lifecycle/src/lifecycle_main.c +++ b/tutorial/c/lifecycle/src/lifecycle_main.c | |||
@@ -21,11 +21,11 @@ _lifecycle_simulation(void *data, const Efl_Event *ev EINA_UNUSED) | |||
21 | { | 21 | { |
22 | case 0: | 22 | case 0: |
23 | // First call, pause the application | 23 | // First call, pause the application |
24 | efl_event_callback_call(loop, EFL_LOOP_EVENT_PAUSE, NULL); | 24 | efl_event_callback_call(loop, EFL_APP_EVENT_PAUSE, NULL); |
25 | break; | 25 | break; |
26 | case 1: | 26 | case 1: |
27 | // Second call, resume the application | 27 | // Second call, resume the application |
28 | efl_event_callback_call(loop, EFL_LOOP_EVENT_RESUME, NULL); | 28 | efl_event_callback_call(loop, EFL_APP_EVENT_RESUME, NULL); |
29 | break; | 29 | break; |
30 | default: | 30 | default: |
31 | // Last call, exit the application | 31 | // Last call, exit the application |