summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2018-05-23 17:34:09 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2018-05-23 17:34:09 +0200
commit0f57eb861060b63b954f881da572dde88d626a32 (patch)
tree2c4eaa2f19210e50b65428f7f3f8b7926b254bb5 /src
parent9fcd03952ee51d34871794cb95585f3e589a3bb9 (diff)
parentc4572d3f791b3ae634c63f21ed05b17a1754a894 (diff)
efl: merge namespace conflict related renaming progress
This is a batch of changes renaming classes/types/etc to prevent namespace related conflcits in our tree, with the ultimate goal being enabling more static analysis on your eo files. This is accomplished mostly by flattening the namespaces.
Diffstat (limited to 'src')
-rw-r--r--src/bin/eolian_mono/eolian/mono/blacklist.hh2
-rw-r--r--src/bin/eolian_mono/eolian/mono/klass.hh2
-rw-r--r--src/bin/eolian_mono/eolian/mono/struct_definition.hh2
-rw-r--r--src/bindings/mono/eo_mono/iwrapper.cs5
-rw-r--r--src/bindings/mono/eo_mono/workaround.cs8
-rw-r--r--src/lib/ecore/efl_exe.eo8
-rw-r--r--src/lib/ecore/efl_task.eo8
-rw-r--r--src/lib/ecore_con/efl_net_ip_address.eo4
-rw-r--r--src/lib/ecore_con/efl_net_session.eo16
-rw-r--r--src/lib/efl/interfaces/efl_animator.eo4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_color.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_color_class.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_gradient.eo4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_path.eo4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_shape.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_types.eot18
-rw-r--r--src/lib/efl/interfaces/efl_input_device.eo6
-rw-r--r--src/lib/efl/interfaces/efl_observable.eo2
-rw-r--r--src/lib/efl/interfaces/efl_text_types.eot4
-rw-r--r--src/lib/efl/interfaces/efl_types.eot2
-rw-r--r--src/lib/efl/interfaces/efl_ui_drag.eo2
-rw-r--r--src/lib/efl/interfaces/efl_ui_types.eot2
-rw-r--r--src/lib/efl/interfaces/efl_ui_zoom.eo4
-rw-r--r--src/lib/elementary/efl_access_object.eo2
-rw-r--r--src/lib/elementary/efl_selection.eo16
-rw-r--r--src/lib/elementary/efl_selection_manager.eo26
-rw-r--r--src/lib/elementary/efl_selection_types.eot20
-rw-r--r--src/lib/elementary/efl_ui.eot4
-rw-r--r--src/lib/elementary/efl_ui_button_legacy_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_check_legacy_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_dnd.eo12
-rw-r--r--src/lib/elementary/efl_ui_dnd_container.eo2
-rw-r--r--src/lib/elementary/efl_ui_dnd_types.eot10
-rw-r--r--src/lib/elementary/efl_ui_focus_composition_adapter.eo2
-rw-r--r--src/lib/elementary/efl_ui_pager.eo4
-rw-r--r--src/lib/elementary/efl_ui_progressbar_legacy_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_radio_legacy_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_stack.eo16
-rw-r--r--src/lib/elementary/efl_ui_tab_page.eo10
-rw-r--r--src/lib/elementary/efl_ui_tab_page_part_tab.eo2
-rw-r--r--src/lib/elementary/efl_ui_text.eo6
-rw-r--r--src/lib/elementary/efl_ui_widget.eo2
-rw-r--r--src/lib/elementary/elm_slider_part_indicator.eo2
-rw-r--r--src/lib/eo/efl_object.eo8
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_player.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_types.eot4
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo12
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo2
-rw-r--r--src/lib/evas/canvas/evas_text.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture.eo4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_manager.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_touch.eo2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_types.eot6
55 files changed, 150 insertions, 155 deletions
diff --git a/src/bin/eolian_mono/eolian/mono/blacklist.hh b/src/bin/eolian_mono/eolian/mono/blacklist.hh
index 1db4c6108a..a436bcc203 100644
--- a/src/bin/eolian_mono/eolian/mono/blacklist.hh
+++ b/src/bin/eolian_mono/eolian/mono/blacklist.hh
@@ -56,7 +56,7 @@ inline bool is_function_blacklisted(std::string const& c_name)
56// Blacklist structs that require some kind of manual binding. 56// Blacklist structs that require some kind of manual binding.
57inline bool is_struct_blacklisted(std::string const& full_name) 57inline bool is_struct_blacklisted(std::string const& full_name)
58{ 58{
59 return full_name == "Efl.Event.Description" 59 return full_name == "Efl.Event_Description"
60 || full_name == "Eina.Binbuf" 60 || full_name == "Eina.Binbuf"
61 || full_name == "Eina.Strbuf" 61 || full_name == "Eina.Strbuf"
62 || full_name == "Eina.Slice" 62 || full_name == "Eina.Slice"
diff --git a/src/bin/eolian_mono/eolian/mono/klass.hh b/src/bin/eolian_mono/eolian/mono/klass.hh
index e85654756d..c25b1d8e34 100644
--- a/src/bin/eolian_mono/eolian/mono/klass.hh
+++ b/src/bin/eolian_mono/eolian/mono/klass.hh
@@ -500,7 +500,7 @@ struct klass
500 << scope_tab << scope_tab << "if (!event_cb_count.TryGetValue(key, out event_count))\n" 500 << scope_tab << scope_tab << "if (!event_cb_count.TryGetValue(key, out event_count))\n"
501 << scope_tab << scope_tab << scope_tab << "event_cb_count[key] = event_count;\n" 501 << scope_tab << scope_tab << scope_tab << "event_cb_count[key] = event_count;\n"
502 << scope_tab << scope_tab << "if (event_count == 1) {\n" 502 << scope_tab << scope_tab << "if (event_count == 1) {\n"
503 << scope_tab << scope_tab << scope_tab << "efl.kw_event.Description desc = new efl.kw_event.Description(key);\n" 503 << scope_tab << scope_tab << scope_tab << "efl.Event_Description desc = new efl.Event_Description(key);\n"
504 << scope_tab << scope_tab << scope_tab << "bool result = efl.eo.Globals.efl_event_callback_del(handle, desc, evt_delegate, System.IntPtr.Zero);\n" 504 << scope_tab << scope_tab << scope_tab << "bool result = efl.eo.Globals.efl_event_callback_del(handle, desc, evt_delegate, System.IntPtr.Zero);\n"
505 << scope_tab << scope_tab << scope_tab << "if (!result) {\n" 505 << scope_tab << scope_tab << scope_tab << "if (!result) {\n"
506 << scope_tab << scope_tab << scope_tab << scope_tab << "eina.Log.Error($\"Failed to remove event proxy for event {key}\");\n" 506 << scope_tab << scope_tab << scope_tab << scope_tab << "eina.Log.Error($\"Failed to remove event proxy for event {key}\");\n"
diff --git a/src/bin/eolian_mono/eolian/mono/struct_definition.hh b/src/bin/eolian_mono/eolian/mono/struct_definition.hh
index 618b433213..42d2f0d711 100644
--- a/src/bin/eolian_mono/eolian/mono/struct_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/struct_definition.hh
@@ -368,7 +368,7 @@ struct struct_binding_conversion_functions_generator
368 // Open conversion class 368 // Open conversion class
369 if (!as_generator 369 if (!as_generator
370 ( 370 (
371 "internal static class " << string << "_StructConversion\n{\n" 371 "public static class " << string << "_StructConversion\n{\n"
372 ) 372 )
373 .generate(sink, struct_.cxx_name, context)) 373 .generate(sink, struct_.cxx_name, context))
374 return false; 374 return false;
diff --git a/src/bindings/mono/eo_mono/iwrapper.cs b/src/bindings/mono/eo_mono/iwrapper.cs
index bb7a45b291..d25ffec625 100644
--- a/src/bindings/mono/eo_mono/iwrapper.cs
+++ b/src/bindings/mono/eo_mono/iwrapper.cs
@@ -53,16 +53,13 @@ public class Globals {
53 53
54 [DllImport(efl.Libs.Eo)] public static extern bool efl_event_callback_priority_add( 54 [DllImport(efl.Libs.Eo)] public static extern bool efl_event_callback_priority_add(
55 System.IntPtr obj, 55 System.IntPtr obj,
56 // FIXME commented to allow passing null stuff during test
57 //ref efl.kw_event.Description desc,
58 //efl.kw_event.Description desc,
59 IntPtr desc, 56 IntPtr desc,
60 short priority, 57 short priority,
61 efl.Event_Cb cb, 58 efl.Event_Cb cb,
62 System.IntPtr data); 59 System.IntPtr data);
63 [DllImport(efl.Libs.Eo)] public static extern bool efl_event_callback_del( 60 [DllImport(efl.Libs.Eo)] public static extern bool efl_event_callback_del(
64 System.IntPtr obj, 61 System.IntPtr obj,
65 efl.kw_event.Description desc, 62 efl.Event_Description desc,
66 efl.Event_Cb cb, 63 efl.Event_Cb cb,
67 System.IntPtr data); 64 System.IntPtr data);
68 [DllImport(efl.Libs.Eo)] public static extern IntPtr 65 [DllImport(efl.Libs.Eo)] public static extern IntPtr
diff --git a/src/bindings/mono/eo_mono/workaround.cs b/src/bindings/mono/eo_mono/workaround.cs
index 925e437908..207f5cab52 100644
--- a/src/bindings/mono/eo_mono/workaround.cs
+++ b/src/bindings/mono/eo_mono/workaround.cs
@@ -70,10 +70,10 @@ public struct Evas_Object_Box_Option {
70}; 70};
71#pragma warning restore 0169 71#pragma warning restore 0169
72 72
73namespace efl { namespace kw_event { 73namespace efl {
74 74
75[StructLayout(LayoutKind.Sequential)] 75[StructLayout(LayoutKind.Sequential)]
76public struct Description { 76public struct Event_Description {
77 public IntPtr Name; 77 public IntPtr Name;
78 [MarshalAs(UnmanagedType.U1)] public bool Unfreezable; 78 [MarshalAs(UnmanagedType.U1)] public bool Unfreezable;
79 [MarshalAs(UnmanagedType.U1)] public bool Legacy_is; 79 [MarshalAs(UnmanagedType.U1)] public bool Legacy_is;
@@ -81,7 +81,7 @@ public struct Description {
81 81
82 private static Dictionary<string, IntPtr> descriptions = new Dictionary<string, IntPtr>(); 82 private static Dictionary<string, IntPtr> descriptions = new Dictionary<string, IntPtr>();
83 83
84 public Description(string name) 84 public Event_Description(string name)
85 { 85 {
86 if (!descriptions.ContainsKey(name)) 86 if (!descriptions.ContainsKey(name))
87 { 87 {
@@ -101,8 +101,6 @@ public struct Description {
101 } 101 }
102}; 102};
103 103
104} // namespace kw_event
105
106 104
107public delegate void Event_Cb(System.IntPtr data, ref Event evt); 105public delegate void Event_Cb(System.IntPtr data, ref Event evt);
108#pragma warning disable 0169 106#pragma warning disable 0169
diff --git a/src/lib/ecore/efl_exe.eo b/src/lib/ecore/efl_exe.eo
index 289fe204c3..c58451c3a5 100644
--- a/src/lib/ecore/efl_exe.eo
+++ b/src/lib/ecore/efl_exe.eo
@@ -1,4 +1,4 @@
1enum Efl.Exe.Signal { 1enum Efl.Exe_Signal {
2 [[ ]] 2 [[ ]]
3 int, 3 int,
4 quit, 4 quit,
@@ -11,7 +11,7 @@ enum Efl.Exe.Signal {
11 usr2 11 usr2
12} 12}
13 13
14enum Efl.Exe.Flags { 14enum Efl.Exe_Flags {
15 [[ ]] 15 [[ ]]
16 none = 0, 16 none = 0,
17 group_leader = 1, 17 group_leader = 1,
@@ -25,14 +25,14 @@ class Efl.Exe (Efl.Task)
25 methods { 25 methods {
26 signal { 26 signal {
27 params { 27 params {
28 sig: Efl.Exe.Signal; [[ Send this signal to the task ]] 28 sig: Efl.Exe_Signal; [[ Send this signal to the task ]]
29 } 29 }
30 } 30 }
31 @property exe_flags { 31 @property exe_flags {
32 set { } 32 set { }
33 get { } 33 get { }
34 values { 34 values {
35 flags: Efl.Exe.Flags; [[ ]] 35 flags: Efl.Exe_Flags; [[ ]]
36 } 36 }
37 } 37 }
38 @property exit_signal { 38 @property exit_signal {
diff --git a/src/lib/ecore/efl_task.eo b/src/lib/ecore/efl_task.eo
index 00a01f3914..7fdb895f49 100644
--- a/src/lib/ecore/efl_task.eo
+++ b/src/lib/ecore/efl_task.eo
@@ -1,4 +1,4 @@
1enum Efl.Task.Priority { 1enum Efl.Task_Priority {
2 [[ ]] 2 [[ ]]
3 normal, 3 normal,
4 background, 4 background,
@@ -7,7 +7,7 @@ enum Efl.Task.Priority {
7 ultra 7 ultra
8} 8}
9 9
10enum Efl.Task.Flags { 10enum Efl.Task_Flags {
11 [[ ]] 11 [[ ]]
12 none = 0, 12 none = 0,
13 use_stdin = 1, 13 use_stdin = 1,
@@ -121,7 +121,7 @@ class Efl.Task (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer)
121 get { } 121 get { }
122 set { } 122 set { }
123 values { 123 values {
124 priority: Efl.Task.Priority; [[ ]] 124 priority: Efl.Task_Priority; [[ ]]
125 } 125 }
126 } 126 }
127 @property exit_code { 127 @property exit_code {
@@ -135,7 +135,7 @@ class Efl.Task (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer)
135 set { } 135 set { }
136 get { } 136 get { }
137 values { 137 values {
138 flags: Efl.Task.Flags; [[ ]] 138 flags: Efl.Task_Flags; [[ ]]
139 } 139 }
140 } 140 }
141 run { 141 run {
diff --git a/src/lib/ecore_con/efl_net_ip_address.eo b/src/lib/ecore_con/efl_net_ip_address.eo
index e715a0c7bb..eebbb0ac5b 100644
--- a/src/lib/ecore_con/efl_net_ip_address.eo
+++ b/src/lib/ecore_con/efl_net_ip_address.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3struct Efl.Net.Ip_Address.Resolve_Results { 3struct Efl.Net.Ip_Address_Resolve_Results {
4 [[The results of @Efl.Net.Ip_Address.resolve call. 4 [[The results of @Efl.Net.Ip_Address.resolve call.
5 5
6 This structure is created by @Efl.Net.Ip_Address.resolve. 6 This structure is created by @Efl.Net.Ip_Address.resolve.
@@ -112,7 +112,7 @@ class Efl.Net.Ip_Address (Efl.Object) {
112 family: int @optional; [[Preferred family. AF_UNSPEC or 0 for both, otherwise one of AF_INET or AF_INET6]] 112 family: int @optional; [[Preferred family. AF_UNSPEC or 0 for both, otherwise one of AF_INET or AF_INET6]]
113 flags: int @optional; [[Flags to use with getaddrinfo(). If 0, default flags are used (AI_V4MAPPED | AI_ADDRCONFIG, if these exist in your system).]] 113 flags: int @optional; [[Flags to use with getaddrinfo(). If 0, default flags are used (AI_V4MAPPED | AI_ADDRCONFIG, if these exist in your system).]]
114 } 114 }
115 return: future<const(Efl.Net.Ip_Address.Resolve_Results)>; [[The resolve results. It contains a list of Efl.Net.Ip_Address, they will be automatically deleted unless you keep a reference to it.]] 115 return: future<const(Efl.Net.Ip_Address_Resolve_Results)>; [[The resolve results. It contains a list of Efl.Net.Ip_Address, they will be automatically deleted unless you keep a reference to it.]]
116 } 116 }
117 117
118 @property string { 118 @property string {
diff --git a/src/lib/ecore_con/efl_net_session.eo b/src/lib/ecore_con/efl_net_session.eo
index 8bfd4497cd..87ca0d05fd 100644
--- a/src/lib/ecore_con/efl_net_session.eo
+++ b/src/lib/ecore_con/efl_net_session.eo
@@ -1,4 +1,4 @@
1enum Efl.Net.Session.State { 1enum Efl.Net.Session_State {
2 [[Provides the session connectivity state. 2 [[Provides the session connectivity state.
3 3
4 @since 1.19 4 @since 1.19
@@ -9,7 +9,7 @@ enum Efl.Net.Session.State {
9} 9}
10 10
11/* keep in sync with efl_net_control_technology.eo, comment what doesn't make sense */ 11/* keep in sync with efl_net_control_technology.eo, comment what doesn't make sense */
12enum Efl.Net.Session.Technology { 12enum Efl.Net.Session_Technology {
13 [[Bitwise-able technologies to allow for a network session. 13 [[Bitwise-able technologies to allow for a network session.
14 14
15 @since 1.9 15 @since 1.9
@@ -24,7 +24,7 @@ enum Efl.Net.Session.Technology {
24 vpn = (1 << 6), [[Type: Virtual Private Network]] 24 vpn = (1 << 6), [[Type: Virtual Private Network]]
25 gadget = (1 << 7), [[Type: USB gadget]] 25 gadget = (1 << 7), [[Type: USB gadget]]
26/* p2p = (1 << 8), [[Type: Peer-2-Peer]]*/ 26/* p2p = (1 << 8), [[Type: Peer-2-Peer]]*/
27 all = (Efl.Net.Session.Technology.ethernet | Efl.Net.Session.Technology.wifi | Efl.Net.Session.Technology.bluetooth | Efl.Net.Session.Technology.cellular | Efl.Net.Session.Technology.vpn | Efl.Net.Session.Technology.gadget), [[All technology types]] 27 all = (Efl.Net.Session_Technology.ethernet | Efl.Net.Session_Technology.wifi | Efl.Net.Session_Technology.bluetooth | Efl.Net.Session_Technology.cellular | Efl.Net.Session_Technology.vpn | Efl.Net.Session_Technology.gadget), [[All technology types]]
28} 28}
29 29
30class Efl.Net.Session (Efl.Loop_Consumer) { 30class Efl.Net.Session (Efl.Loop_Consumer) {
@@ -37,9 +37,9 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
37 37
38 Some platforms may not implement the backend for this class. In 38 Some platforms may not implement the backend for this class. In
39 this cases the system will report always @.state "online" 39 this cases the system will report always @.state "online"
40 (@Efl.Net.Session.State.online) and other properties will be 40 (@Efl.Net.Session_State.online) and other properties will be
41 NULL, such as @.network_name, @.interface, @.ipv4 and @.ipv6; as well as 41 NULL, such as @.network_name, @.interface, @.ipv4 and @.ipv6; as well as
42 @.technology is set to @Efl.Net.Session.Technology.unknown. As such 42 @.technology is set to @Efl.Net.Session_Technology.unknown. As such
43 if you need to detect for an actual backend, check if the 43 if you need to detect for an actual backend, check if the
44 state is online but those properties are NULL or technology is 44 state is online but those properties are NULL or technology is
45 unknown. 45 unknown.
@@ -70,7 +70,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
70 ]] 70 ]]
71 params { 71 params {
72 online_required: bool; [[If $false, access points with local state are enough. If $true, the access point must be in online state, with a validated internet connection]] 72 online_required: bool; [[If $false, access points with local state are enough. If $true, the access point must be in online state, with a validated internet connection]]
73 technologies_allowed: Efl.Net.Session.Technology; [[Bitwise OR of technologies to allow]] 73 technologies_allowed: Efl.Net.Session_Technology; [[Bitwise OR of technologies to allow]]
74 } 74 }
75 } 75 }
76 76
@@ -102,7 +102,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
102 ]] 102 ]]
103 get { } 103 get { }
104 values { 104 values {
105 state: Efl.Net.Session.State; [[Network session state]] 105 state: Efl.Net.Session_State; [[Network session state]]
106 } 106 }
107 } 107 }
108 108
@@ -110,7 +110,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
110 [[The access point technology that backs this session]] 110 [[The access point technology that backs this session]]
111 get { } 111 get { }
112 values { 112 values {
113 technology: Efl.Net.Session.Technology; [[Network session technology]] 113 technology: Efl.Net.Session_Technology; [[Network session technology]]
114 } 114 }
115 } 115 }
116 116
diff --git a/src/lib/efl/interfaces/efl_animator.eo b/src/lib/efl/interfaces/efl_animator.eo
index ac7e86ba28..ca969d99fe 100644
--- a/src/lib/efl/interfaces/efl_animator.eo
+++ b/src/lib/efl/interfaces/efl_animator.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3struct Efl.Event.Animator_Tick { 3struct Efl.Event_Animator_Tick {
4 [[EFL event animator tick data structure]] 4 [[EFL event animator tick data structure]]
5 update_area: Eina.Rect; [[Area of the canvas that will be pushed to screen.]] 5 update_area: Eina.Rect; [[Area of the canvas that will be pushed to screen.]]
6} 6}
@@ -10,6 +10,6 @@ interface Efl.Animator {
10 eo_prefix: efl_animator; 10 eo_prefix: efl_animator;
11 event_prefix: efl; 11 event_prefix: efl;
12 events { 12 events {
13 animator,tick: Efl.Event.Animator_Tick; [[Animator tick synchronized with screen vsync if possible.]] 13 animator,tick: Efl.Event_Animator_Tick; [[Animator tick synchronized with screen vsync if possible.]]
14 } 14 }
15} 15}
diff --git a/src/lib/efl/interfaces/efl_gfx_color.eo b/src/lib/efl/interfaces/efl_gfx_color.eo
index 61f5e76f1e..21f18d144e 100644
--- a/src/lib/efl/interfaces/efl_gfx_color.eo
+++ b/src/lib/efl/interfaces/efl_gfx_color.eo
@@ -73,7 +73,7 @@ mixin Efl.Gfx.Color
73 } 73 }
74 keys { 74 keys {
75 color_class: string; [[The name of color class]] 75 color_class: string; [[The name of color class]]
76 layer: Efl.Gfx.Color_Class.Layer @optional; [[The layer to set the color]] 76 layer: Efl.Gfx.Color_Class_Layer @optional; [[The layer to set the color]]
77 } 77 }
78 values { 78 values {
79 colorcode: string; [[the hex color code.]] 79 colorcode: string; [[the hex color code.]]
diff --git a/src/lib/efl/interfaces/efl_gfx_color_class.eo b/src/lib/efl/interfaces/efl_gfx_color_class.eo
index 23df735233..116e2c9964 100644
--- a/src/lib/efl/interfaces/efl_gfx_color_class.eo
+++ b/src/lib/efl/interfaces/efl_gfx_color_class.eo
@@ -37,7 +37,7 @@ interface Efl.Gfx.Color_Class
37 } 37 }
38 keys { 38 keys {
39 color_class: string; [[The name of color class]] 39 color_class: string; [[The name of color class]]
40 layer: Efl.Gfx.Color_Class.Layer @optional; [[The layer to set the color]] 40 layer: Efl.Gfx.Color_Class_Layer @optional; [[The layer to set the color]]
41 } 41 }
42 values { 42 values {
43 r: int; [[The intensity of the red color]] 43 r: int; [[The intensity of the red color]]
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient.eo b/src/lib/efl/interfaces/efl_gfx_gradient.eo
index c8d4b3c880..311e873698 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient.eo
@@ -13,7 +13,7 @@ interface Efl.Gfx.Gradient
13 [[Get the list of color stops.]] 13 [[Get the list of color stops.]]
14 } 14 }
15 values { 15 values {
16 colors: ptr(const(Efl.Gfx.Gradient.Stop)); [[Color stops list]] 16 colors: ptr(const(Efl.Gfx.Gradient_Stop)); [[Color stops list]]
17 length: uint; [[Length of the list]] 17 length: uint; [[Length of the list]]
18 } 18 }
19 } 19 }
@@ -27,7 +27,7 @@ interface Efl.Gfx.Gradient
27 ]] 27 ]]
28 } 28 }
29 values { 29 values {
30 s: Efl.Gfx.Gradient.Spread; [[Spread type to be used]] 30 s: Efl.Gfx.Gradient_Spread; [[Spread type to be used]]
31 } 31 }
32 } 32 }
33 } 33 }
diff --git a/src/lib/efl/interfaces/efl_gfx_path.eo b/src/lib/efl/interfaces/efl_gfx_path.eo
index a6df70d756..730ec8ba91 100644
--- a/src/lib/efl/interfaces/efl_gfx_path.eo
+++ b/src/lib/efl/interfaces/efl_gfx_path.eo
@@ -18,7 +18,7 @@ mixin Efl.Gfx.Path
18 get { 18 get {
19 } 19 }
20 values { 20 values {
21 op: ptr(const(Efl.Gfx.Path.Command_Type)); [[Command list]] 21 op: ptr(const(Efl.Gfx.Path_Command_Type)); [[Command list]]
22 points: ptr(const(double)); [[Point list]] 22 points: ptr(const(double)); [[Point list]]
23 } 23 }
24 } 24 }
@@ -284,6 +284,6 @@ mixin Efl.Gfx.Path
284 } 284 }
285 } 285 }
286 events { 286 events {
287 changed: Efl.Gfx.Path.Change_Event; [[Graphics path was changed.]] 287 changed: Efl.Gfx.Path_Change_Event; [[Graphics path was changed.]]
288 } 288 }
289} 289}
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.eo b/src/lib/efl/interfaces/efl_gfx_shape.eo
index bd3c769422..6ad491763c 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.eo
+++ b/src/lib/efl/interfaces/efl_gfx_shape.eo
@@ -113,7 +113,7 @@ mixin Efl.Gfx.Shape (Efl.Gfx.Path)
113 get { 113 get {
114 } 114 }
115 values { 115 values {
116 fill_rule: Efl.Gfx.Fill.Rule; [[The current fill rule of the shape object. 116 fill_rule: Efl.Gfx.Fill_Rule; [[The current fill rule of the shape object.
117 One of $EFL_GFX_FILL_RULE_WINDING, $EFL_GFX_FILL_RULE_ODD_EVEN]] 117 One of $EFL_GFX_FILL_RULE_WINDING, $EFL_GFX_FILL_RULE_ODD_EVEN]]
118 } 118 }
119 } 119 }
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot b/src/lib/efl/interfaces/efl_gfx_types.eot
index 72d26885ba..8f8292c992 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -30,7 +30,7 @@ enum Efl.Gfx.Render_Op {
30 last [[Sentinel value to indicate last enum field during iteration]] 30 last [[Sentinel value to indicate last enum field during iteration]]
31} 31}
32 32
33enum Efl.Gfx.Path.Command_Type { 33enum Efl.Gfx.Path_Command_Type {
34 [[These values determine how the points are interpreted in a stream of points. 34 [[These values determine how the points are interpreted in a stream of points.
35 @since 1.14 35 @since 1.14
36 ]] 36 ]]
@@ -66,7 +66,7 @@ enum Efl.Gfx.Join
66 last [[Sentinel value to indicate last enum field during iteration]] 66 last [[Sentinel value to indicate last enum field during iteration]]
67} 67}
68 68
69enum Efl.Gfx.Gradient.Spread 69enum Efl.Gfx.Gradient_Spread
70{ 70{
71 [[Specifies how the area outside the gradient area should be filled. 71 [[Specifies how the area outside the gradient area should be filled.
72 $ref efl_gfx_gradient_spread_set() 72 $ref efl_gfx_gradient_spread_set()
@@ -78,7 +78,7 @@ enum Efl.Gfx.Gradient.Spread
78 last [[Sentinel value to indicate last enum field during iteration]] 78 last [[Sentinel value to indicate last enum field during iteration]]
79} 79}
80 80
81enum Efl.Gfx.Fill.Rule 81enum Efl.Gfx.Fill_Rule
82{ 82{
83 [[Type defining how an image content get filled. 83 [[Type defining how an image content get filled.
84 @since 1.14 84 @since 1.14
@@ -96,7 +96,7 @@ struct Efl.Gfx.Dash {
96 gap: double; [[Distance between two dashes.]] 96 gap: double; [[Distance between two dashes.]]
97} 97}
98 98
99struct Efl.Gfx.Gradient.Stop 99struct Efl.Gfx.Gradient_Stop
100{ 100{
101 [[Type defining gradient stops. 101 [[Type defining gradient stops.
102 Describes the location and color of a transition point in a gradient. 102 Describes the location and color of a transition point in a gradient.
@@ -109,7 +109,7 @@ struct Efl.Gfx.Gradient.Stop
109 a: int; [[The component A color of the gradient stop]] 109 a: int; [[The component A color of the gradient stop]]
110} 110}
111 111
112struct Efl.Gfx.Stroke.Color 112struct Efl.Gfx.Stroke_Color
113{ 113{
114 [[Internal structure for @Efl.Gfx.Stroke.]] 114 [[Internal structure for @Efl.Gfx.Stroke.]]
115 r: int; [[The component R color of the stroke]] 115 r: int; [[The component R color of the stroke]]
@@ -127,14 +127,14 @@ struct Efl.Gfx.Stroke
127 scale: double; [[Stroke scale]] 127 scale: double; [[Stroke scale]]
128 width: double; [[Stroke width]] 128 width: double; [[Stroke width]]
129 centered: double; [[Stroke centered]] 129 centered: double; [[Stroke centered]]
130 color: Efl.Gfx.Stroke.Color; [[Stroke color]] 130 color: Efl.Gfx.Stroke_Color; [[Stroke color]]
131 dash: ptr(Efl.Gfx.Dash); [[Stroke dash]] 131 dash: ptr(Efl.Gfx.Dash); [[Stroke dash]]
132 dash_length: uint; [[Stroke dash length]] 132 dash_length: uint; [[Stroke dash length]]
133 cap: Efl.Gfx.Cap; [[Stroke cap]] 133 cap: Efl.Gfx.Cap; [[Stroke cap]]
134 join: Efl.Gfx.Join; [[Stroke join]] 134 join: Efl.Gfx.Join; [[Stroke join]]
135} 135}
136 136
137struct Efl.Gfx.Shape.Public 137struct Efl.Gfx.Shape_Public
138{ 138{
139 [[Public shape]] 139 [[Public shape]]
140 stroke: Efl.Gfx.Stroke; [[Internal representation as stroke]] 140 stroke: Efl.Gfx.Stroke; [[Internal representation as stroke]]
@@ -158,7 +158,7 @@ enum Efl.Gfx.Change_Flag
158 all = 0xffff [[all properties got changed]] 158 all = 0xffff [[all properties got changed]]
159} 159}
160 160
161struct Efl.Gfx.Path.Change_Event { 161struct Efl.Gfx.Path_Change_Event {
162 what: Efl.Gfx.Change_Flag; [[Indicates what changed.]] 162 what: Efl.Gfx.Change_Flag; [[Indicates what changed.]]
163} 163}
164 164
@@ -204,7 +204,7 @@ enum Efl.Gfx.Image_Load_Error
204 recursive_reference = 10 [[(Edje only) The group/collection set to load from had recursive references on its components]] 204 recursive_reference = 10 [[(Edje only) The group/collection set to load from had recursive references on its components]]
205} 205}
206 206
207enum Efl.Gfx.Color_Class.Layer { 207enum Efl.Gfx.Color_Class_Layer {
208 [[Efl Gfx Color Class layer enum]] 208 [[Efl Gfx Color Class layer enum]]
209 normal = 0, [[Default color]] 209 normal = 0, [[Default color]]
210 outline, [[Outline color]] 210 outline, [[Outline color]]
diff --git a/src/lib/efl/interfaces/efl_input_device.eo b/src/lib/efl/interfaces/efl_input_device.eo
index c2dcc0ba88..e6c989871d 100644
--- a/src/lib/efl/interfaces/efl_input_device.eo
+++ b/src/lib/efl/interfaces/efl_input_device.eo
@@ -1,4 +1,4 @@
1enum Efl.Input.Device.Type 1enum Efl.Input.Device_Type
2{ 2{
3 [[General type of input device. 3 [[General type of input device.
4 4
@@ -29,7 +29,7 @@ class Efl.Input.Device (Efl.Object)
29 @property device_type { 29 @property device_type {
30 [[Device type property]] 30 [[Device type property]]
31 values { 31 values {
32 klass: Efl.Input.Device.Type; [[Input device class]] 32 klass: Efl.Input.Device_Type; [[Input device class]]
33 } 33 }
34 } 34 }
35 @property source { 35 @property source {
@@ -44,7 +44,7 @@ class Efl.Input.Device (Efl.Object)
44 This method will find the seat the device belongs to. 44 This method will find the seat the device belongs to.
45 45
46 For this, it walk through device's parents looking for a device 46 For this, it walk through device's parents looking for a device
47 with @Efl.Input.Device.Type.seat. It may be 47 with @Efl.Input.Device_Type.seat. It may be
48 the device itself. 48 the device itself.
49 49
50 In case no seat is found, $null is returned. 50 In case no seat is found, $null is returned.
diff --git a/src/lib/efl/interfaces/efl_observable.eo b/src/lib/efl/interfaces/efl_observable.eo
index 8aa7bba6c1..f39d3dc8bb 100644
--- a/src/lib/efl/interfaces/efl_observable.eo
+++ b/src/lib/efl/interfaces/efl_observable.eo
@@ -56,7 +56,7 @@ class Efl.Observable (Efl.Object) {
56 [[Return a new iterator associated to this observable. 56 [[Return a new iterator associated to this observable.
57 57
58 @since 1.19]] 58 @since 1.19]]
59 return: iterator<ptr(Efl.Observable.Tuple)> @owned; [[Iterator for observer]] 59 return: iterator<ptr(Efl.Observable_Tuple)> @owned; [[Iterator for observer]]
60 } 60 }
61 } 61 }
62 implements { 62 implements {
diff --git a/src/lib/efl/interfaces/efl_text_types.eot b/src/lib/efl/interfaces/efl_text_types.eot
index 0d9c5ee723..61003586b9 100644
--- a/src/lib/efl/interfaces/efl_text_types.eot
+++ b/src/lib/efl/interfaces/efl_text_types.eot
@@ -1,4 +1,4 @@
1enum Efl.Text.Bidirectional_Type { 1enum Efl.Text_Bidirectional_Type {
2 [[Bidirectionaltext type]] 2 [[Bidirectionaltext type]]
3 natural = 0, [[Natural text type, same as neutral]] 3 natural = 0, [[Natural text type, same as neutral]]
4 neutral = 0, [[Neutral text type, same as natural]] 4 neutral = 0, [[Neutral text type, same as natural]]
@@ -7,7 +7,7 @@ enum Efl.Text.Bidirectional_Type {
7 inherit [[Inherit text type]] 7 inherit [[Inherit text type]]
8} 8}
9 9
10struct Efl.Ui.Text.Change_Info { 10struct Efl.Ui.Text_Change_Info {
11 [[This structure includes all the information about content changes. 11 [[This structure includes all the information about content changes.
12 12
13 It's meant to be used to implement undo/redo. 13 It's meant to be used to implement undo/redo.
diff --git a/src/lib/efl/interfaces/efl_types.eot b/src/lib/efl/interfaces/efl_types.eot
index f515a92ddb..06a9426ee8 100644
--- a/src/lib/efl/interfaces/efl_types.eot
+++ b/src/lib/efl/interfaces/efl_types.eot
@@ -39,7 +39,7 @@ struct Efl.Version
39 build_id: string; [[Contains $EFL_BUILD_ID.]] 39 build_id: string; [[Contains $EFL_BUILD_ID.]]
40} 40}
41 41
42struct Efl.Observable.Tuple 42struct Efl.Observable_Tuple
43{ 43{
44 [[This type describes an observable touple]] 44 [[This type describes an observable touple]]
45 key: string; [[Touple key]] 45 key: string; [[Touple key]]
diff --git a/src/lib/efl/interfaces/efl_ui_drag.eo b/src/lib/efl/interfaces/efl_ui_drag.eo
index 227015f2b0..dedcb348f1 100644
--- a/src/lib/efl/interfaces/efl_ui_drag.eo
+++ b/src/lib/efl/interfaces/efl_ui_drag.eo
@@ -73,7 +73,7 @@ interface Efl.Ui.Drag
73 ]] 73 ]]
74 get { 74 get {
75 [[Gets the draggable direction.]] 75 [[Gets the draggable direction.]]
76 return: Efl.Ui.Drag.Dir; [[The direction(s) premitted for drag.]] 76 return: Efl.Ui.Drag_Dir; [[The direction(s) premitted for drag.]]
77 } 77 }
78 } 78 }
79 @property drag_step { 79 @property drag_step {
diff --git a/src/lib/efl/interfaces/efl_ui_types.eot b/src/lib/efl/interfaces/efl_ui_types.eot
index 275d82fbd5..59cf1abf7f 100644
--- a/src/lib/efl/interfaces/efl_ui_types.eot
+++ b/src/lib/efl/interfaces/efl_ui_types.eot
@@ -1,4 +1,4 @@
1enum Efl.Ui.Drag.Dir { 1enum Efl.Ui.Drag_Dir {
2 [[Permitted directions for dragging objects.]] 2 [[Permitted directions for dragging objects.]]
3 none = 0, [[Not draggable in any direction.]] 3 none = 0, [[Not draggable in any direction.]]
4 x = 1, [[Draggable horizontally.]] 4 x = 1, [[Draggable horizontally.]]
diff --git a/src/lib/efl/interfaces/efl_ui_zoom.eo b/src/lib/efl/interfaces/efl_ui_zoom.eo
index 4618070676..bc37073a53 100644
--- a/src/lib/efl/interfaces/efl_ui_zoom.eo
+++ b/src/lib/efl/interfaces/efl_ui_zoom.eo
@@ -1,4 +1,4 @@
1enum Efl.Ui.Zoom.Mode 1enum Efl.Ui.Zoom_Mode
2{ 2{
3 [[Types of zoom available.]] 3 [[Types of zoom available.]]
4 legacy: efl_ui_zoom_mode; 4 legacy: efl_ui_zoom_mode;
@@ -88,7 +88,7 @@ interface Efl.Ui.Zoom ()
88 ]] 88 ]]
89 } 89 }
90 values { 90 values {
91 mode: Efl.Ui.Zoom.Mode; [[The zoom mode.]] 91 mode: Efl.Ui.Zoom_Mode; [[The zoom mode.]]
92 } 92 }
93 } 93 }
94 } 94 }
diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index b2d28d1686..5eb8b2deac 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -376,7 +376,7 @@ mixin Efl.Access.Object (Efl.Interface, Efl.Object)
376 [[Emit event]] 376 [[Emit event]]
377 params { 377 params {
378 @in accessible: Efl.Access.Object; [[Accessibility object.]] 378 @in accessible: Efl.Access.Object; [[Accessibility object.]]
379 @cref event: Efl.Event.Description; [[Accessibility event type.]] 379 @cref event: Efl.Event_Description; [[Accessibility event type.]]
380 @in event_info: void_ptr; [[Accessibility event details.]] 380 @in event_info: void_ptr; [[Accessibility event details.]]
381 } 381 }
382 } 382 }
diff --git a/src/lib/elementary/efl_selection.eo b/src/lib/elementary/efl_selection.eo
index 8dda11cb08..9db0de597b 100644
--- a/src/lib/elementary/efl_selection.eo
+++ b/src/lib/elementary/efl_selection.eo
@@ -7,8 +7,8 @@ mixin Efl.Selection {
7 selection_set { 7 selection_set {
8 [[Set the selection data to the object]] 8 [[Set the selection data to the object]]
9 params { 9 params {
10 @in type: Efl.Selection.Type; [[Selection Type]] 10 @in type: Efl.Selection_Type; [[Selection Type]]
11 @in format: Efl.Selection.Format; [[Selection Format]] 11 @in format: Efl.Selection_Format; [[Selection Format]]
12 @in data: Eina.Slice; 12 @in data: Eina.Slice;
13 @in seat: uint;[[Specified seat for multiple seats case.]] 13 @in seat: uint;[[Specified seat for multiple seats case.]]
14 } 14 }
@@ -17,29 +17,29 @@ mixin Efl.Selection {
17 selection_get { 17 selection_get {
18 [[Get the data from the object that has selection]] 18 [[Get the data from the object that has selection]]
19 params { 19 params {
20 @in type: Efl.Selection.Type; [[Selection Type]] 20 @in type: Efl.Selection_Type; [[Selection Type]]
21 @in format: Efl.Selection.Format; [[Selection Format]] 21 @in format: Efl.Selection_Format; [[Selection Format]]
22 @in data_func: Efl.Selection.Data_Ready; [[Data ready function pointer]] 22 @in data_func: Efl.Selection_Data_Ready; [[Data ready function pointer]]
23 @in seat: uint;[[Specified seat for multiple seats case.]] 23 @in seat: uint;[[Specified seat for multiple seats case.]]
24 } 24 }
25 } 25 }
26 selection_clear { 26 selection_clear {
27 [[Clear the selection data from the object]] 27 [[Clear the selection data from the object]]
28 params { 28 params {
29 @in type: Efl.Selection.Type; [[Selection Type]] 29 @in type: Efl.Selection_Type; [[Selection Type]]
30 @in seat: uint; [[Specified seat for multiple seats case.]] 30 @in seat: uint; [[Specified seat for multiple seats case.]]
31 } 31 }
32 } 32 }
33 has_owner { 33 has_owner {
34 [[Determine whether the selection data has owner]] 34 [[Determine whether the selection data has owner]]
35 params { 35 params {
36 @in type: Efl.Selection.Type; [[Selection type]] 36 @in type: Efl.Selection_Type; [[Selection type]]
37 @in seat: uint; [[Specified seat for multiple seats case.]] 37 @in seat: uint; [[Specified seat for multiple seats case.]]
38 } 38 }
39 return: bool; [[EINA_TRUE if there is object owns selection, otherwise EINA_FALSE]] 39 return: bool; [[EINA_TRUE if there is object owns selection, otherwise EINA_FALSE]]
40 } 40 }
41 } 41 }
42 events { 42 events {
43 selection,changed: Efl.Selection.Changed; [[Called when display server's selection has changed]] 43 selection,changed: Efl.Selection_Changed; [[Called when display server's selection has changed]]
44 } 44 }
45} 45}
diff --git a/src/lib/elementary/efl_selection_manager.eo b/src/lib/elementary/efl_selection_manager.eo
index 8556d063b1..00914e53ba 100644
--- a/src/lib/elementary/efl_selection_manager.eo
+++ b/src/lib/elementary/efl_selection_manager.eo
@@ -6,8 +6,8 @@ class Efl.Selection_Manager (Efl.Object) {
6 [[Set selection]] 6 [[Set selection]]
7 params { 7 params {
8 @in owner: Efl.Object; [[Seleciton owner]] 8 @in owner: Efl.Object; [[Seleciton owner]]
9 @in type: Efl.Selection.Type; [[Selection type]] 9 @in type: Efl.Selection_Type; [[Selection type]]
10 @in format: Efl.Selection.Format; [[Selection format]] 10 @in format: Efl.Selection_Format; [[Selection format]]
11 @in data: Eina.Slice; [[Selection data]] 11 @in data: Eina.Slice; [[Selection data]]
12 @in seat: uint @optional;[[Specified seat for multiple seats case.]] 12 @in seat: uint @optional;[[Specified seat for multiple seats case.]]
13 } 13 }
@@ -17,16 +17,16 @@ class Efl.Selection_Manager (Efl.Object) {
17 [[Get selection]] 17 [[Get selection]]
18 params { 18 params {
19 @in request: const(Efl.Object); [[Seleciton owner]] 19 @in request: const(Efl.Object); [[Seleciton owner]]
20 @in type: Efl.Selection.Type; [[Selection type]] 20 @in type: Efl.Selection_Type; [[Selection type]]
21 @in format: Efl.Selection.Format; [[Selection Format]] 21 @in format: Efl.Selection_Format; [[Selection Format]]
22 @in data_func: Efl.Selection.Data_Ready; [[Data ready function pointer]] 22 @in data_func: Efl.Selection_Data_Ready; [[Data ready function pointer]]
23 @in seat: uint @optional;[[Specified seat for multiple seats case.]] 23 @in seat: uint @optional;[[Specified seat for multiple seats case.]]
24 } 24 }
25 } 25 }
26 selection_clear @beta { 26 selection_clear @beta {
27 params { 27 params {
28 @in owner: Efl.Object; [[Seleciton owner]] 28 @in owner: Efl.Object; [[Seleciton owner]]
29 @in type: Efl.Selection.Type; [[Selection type]] 29 @in type: Efl.Selection_Type; [[Selection type]]
30 @in seat: uint @optional; [[Specified seat for multiple seats case.]] 30 @in seat: uint @optional; [[Specified seat for multiple seats case.]]
31 } 31 }
32 } 32 }
@@ -34,7 +34,7 @@ class Efl.Selection_Manager (Efl.Object) {
34 [[Check if the request object has selection or not]] 34 [[Check if the request object has selection or not]]
35 params { 35 params {
36 @in request: Efl.Object; [[Request object]] 36 @in request: Efl.Object; [[Request object]]
37 @in type: Efl.Selection.Type; [[Selection type]] 37 @in type: Efl.Selection_Type; [[Selection type]]
38 @in seat: uint @optional; [[Specified seat for multiple seats case.]] 38 @in seat: uint @optional; [[Specified seat for multiple seats case.]]
39 } 39 }
40 return: bool; [[EINA_TRUE if the request object has selection, otherwise, EINA_FALSE]] 40 return: bool; [[EINA_TRUE if the request object has selection, otherwise, EINA_FALSE]]
@@ -48,9 +48,9 @@ class Efl.Selection_Manager (Efl.Object) {
48 ]] 48 ]]
49 params { 49 params {
50 @in drag_obj: Efl.Object; [[Drag object]] 50 @in drag_obj: Efl.Object; [[Drag object]]
51 @in format: Efl.Selection.Format; [[Data format]] 51 @in format: Efl.Selection_Format; [[Data format]]
52 @in data: Eina.Slice; [[Data to transfer]] 52 @in data: Eina.Slice; [[Data to transfer]]
53 @in action: Efl.Selection.Action; [[Action when data is transferred]] 53 @in action: Efl.Selection_Action; [[Action when data is transferred]]
54 @in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]] 54 @in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]]
55 @in seat: uint; [[Specified seat for multiple seats case.]] 55 @in seat: uint; [[Specified seat for multiple seats case.]]
56 } 56 }
@@ -59,7 +59,7 @@ class Efl.Selection_Manager (Efl.Object) {
59 [[This sets the action for the drag]] 59 [[This sets the action for the drag]]
60 params { 60 params {
61 @in drag_obj: Efl.Object; [[Drag object]] 61 @in drag_obj: Efl.Object; [[Drag object]]
62 @in action: Efl.Selection.Action; [[Drag action]] 62 @in action: Efl.Selection_Action; [[Drag action]]
63 @in seat: uint; [[Specified seat for multiple seats case.]] 63 @in seat: uint; [[Specified seat for multiple seats case.]]
64 } 64 }
65 } 65 }
@@ -102,7 +102,7 @@ class Efl.Selection_Manager (Efl.Object) {
102 - EFL_UI_DND_DROP_DRAG_DROP.]] 102 - EFL_UI_DND_DROP_DRAG_DROP.]]
103 params { 103 params {
104 @in target_obj: Efl.Object; [[Drop target]] 104 @in target_obj: Efl.Object; [[Drop target]]
105 @in format: Efl.Selection.Format; [[Accepted data format]] 105 @in format: Efl.Selection_Format; [[Accepted data format]]
106 @in seat: uint; [[Specified seat for multiple seats case.]] 106 @in seat: uint; [[Specified seat for multiple seats case.]]
107 } 107 }
108 return: bool; [[$true on success, $false otherwise]] 108 return: bool; [[$true on success, $false otherwise]]
@@ -111,7 +111,7 @@ class Efl.Selection_Manager (Efl.Object) {
111 [[Remove a dropable target]] 111 [[Remove a dropable target]]
112 params { 112 params {
113 @in target_obj: Efl.Object; [[Drop target]] 113 @in target_obj: Efl.Object; [[Drop target]]
114 @in format: Efl.Selection.Format; [[Accepted data format]] 114 @in format: Efl.Selection_Format; [[Accepted data format]]
115 @in seat: uint; [[Specified seat for multiple seats case.]] 115 @in seat: uint; [[Specified seat for multiple seats case.]]
116 } 116 }
117 } 117 }
@@ -119,7 +119,7 @@ class Efl.Selection_Manager (Efl.Object) {
119 [[Add dropable target for a container in which items can drop to it]] 119 [[Add dropable target for a container in which items can drop to it]]
120 params { 120 params {
121 @in cont: Efl.Object; [[Container object]] 121 @in cont: Efl.Object; [[Container object]]
122 @in format: Efl.Selection.Format; [[Accepted data formats]] 122 @in format: Efl.Selection_Format; [[Accepted data formats]]
123 @in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]] 123 @in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]]
124 @in seat: uint; [[Specified seat for multiple seats case.]] 124 @in seat: uint; [[Specified seat for multiple seats case.]]
125 } 125 }
diff --git a/src/lib/elementary/efl_selection_types.eot b/src/lib/elementary/efl_selection_types.eot
index 93838453c7..e5849597fd 100644
--- a/src/lib/elementary/efl_selection_types.eot
+++ b/src/lib/elementary/efl_selection_types.eot
@@ -1,4 +1,4 @@
1enum Efl.Selection.Type 1enum Efl.Selection_Type
2{ 2{
3 [[Selection type]] 3 [[Selection type]]
4 primary, [[Primary text selection (highlighted or selected text)]] 4 primary, [[Primary text selection (highlighted or selected text)]]
@@ -7,7 +7,7 @@ enum Efl.Selection.Type
7 clipboard [[Clipboard selection (ctrl+C)]] 7 clipboard [[Clipboard selection (ctrl+C)]]
8} 8}
9 9
10enum Efl.Selection.Format 10enum Efl.Selection_Format
11{ 11{
12 [[Selection format]] 12 [[Selection format]]
13 targets = -1, [[For matching every possible atom]] 13 targets = -1, [[For matching every possible atom]]
@@ -19,7 +19,7 @@ enum Efl.Selection.Format
19 html = 0x10 [[Raw HTML-like data (eg. webkit)]] 19 html = 0x10 [[Raw HTML-like data (eg. webkit)]]
20} 20}
21 21
22enum Efl.Selection.Action 22enum Efl.Selection_Action
23{ 23{
24 [[Defines the kind of action associated with the drop data]] 24 [[Defines the kind of action associated with the drop data]]
25 unknown, [[Action type is unknown]] 25 unknown, [[Action type is unknown]]
@@ -32,27 +32,27 @@ enum Efl.Selection.Action
32 description [[Describe the data]] 32 description [[Describe the data]]
33} 33}
34 34
35struct Efl.Selection.Data 35struct Efl.Selection_Data
36{ 36{
37 [[Structure holding the info about selected data]] 37 [[Structure holding the info about selected data]]
38 pos: Eina.Position2D; [[Coordinates of the drop (DND operations only)]] 38 pos: Eina.Position2D; [[Coordinates of the drop (DND operations only)]]
39 format: Efl.Selection.Format; [[Format of the selection]] 39 format: Efl.Selection_Format; [[Format of the selection]]
40 content: Eina.Slice; [[Selection data]] 40 content: Eina.Slice; [[Selection data]]
41 action: Efl.Selection.Action; [[Action to perform with the data]] 41 action: Efl.Selection_Action; [[Action to perform with the data]]
42 item: Efl.Object; [[Item under the drag position. It is only available for container]] 42 item: Efl.Object; [[Item under the drag position. It is only available for container]]
43} 43}
44 44
45function Efl.Selection.Data_Ready { 45function Efl.Selection_Data_Ready {
46 [[Function pointer for getting selection]] 46 [[Function pointer for getting selection]]
47 params { 47 params {
48 @in obj: Efl.Object; [[Object which requested for the selection]] 48 @in obj: Efl.Object; [[Object which requested for the selection]]
49 @in seldata: ptr(Efl.Selection.Data); [[Selection data]] 49 @in seldata: ptr(Efl.Selection_Data); [[Selection data]]
50 } 50 }
51}; 51};
52 52
53struct Efl.Selection.Changed 53struct Efl.Selection_Changed
54{ 54{
55 type: Efl.Selection.Type; [[Selection type]] 55 type: Efl.Selection_Type; [[Selection type]]
56 seat: int; [[The seat on which the selection changed, or NULL for "default"]] 56 seat: int; [[The seat on which the selection changed, or NULL for "default"]]
57 display: void_ptr; [[The display connection object, NULL under X11]] 57 display: void_ptr; [[The display connection object, NULL under X11]]
58 exist: bool; [[EINA_TRUE if the selection has an owner]] 58 exist: bool; [[EINA_TRUE if the selection has an owner]]
diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot
index bdf0b74a61..0fd3622d1e 100644
--- a/src/lib/elementary/efl_ui.eot
+++ b/src/lib/elementary/efl_ui.eot
@@ -42,7 +42,7 @@ enum Efl.Ui.Focus.Move_Policy
42 Left, Right, Up, Down, Tab, or Shift+Tab.]] 42 Left, Right, Up, Down, Tab, or Shift+Tab.]]
43} 43}
44 44
45enum Efl.Ui.Slider.Indicator_Visible_Mode 45enum Efl.Ui.Slider_Indicator_Visible_Mode
46{ 46{
47 [[Slider's indicator visiblity mode. 47 [[Slider's indicator visiblity mode.
48 48
@@ -88,7 +88,7 @@ enum Efl.Ui.Activate
88 back, [[Activate back]] 88 back, [[Activate back]]
89} 89}
90 90
91enum Efl.Ui.Widget.Orientation_Mode 91enum Efl.Ui.Widget_Orientation_Mode
92{ 92{
93 [[Widget orientation mode, or how the theme handles screen orientation. 93 [[Widget orientation mode, or how the theme handles screen orientation.
94 94
diff --git a/src/lib/elementary/efl_ui_button_legacy_part.eo b/src/lib/elementary/efl_ui_button_legacy_part.eo
index 88b05c13f5..15b07c863f 100644
--- a/src/lib/elementary/efl_ui_button_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_button_legacy_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Button_Legacy.Part (Efl.Ui.Layout.Part_Content) 1class Efl.Ui.Button_Legacy_Part (Efl.Ui.Layout.Part_Content)
2{ 2{
3 [[Elementary button internal part class]] 3 [[Elementary button internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_check_legacy_part.eo b/src/lib/elementary/efl_ui_check_legacy_part.eo
index 5abfae7010..40d62d3661 100644
--- a/src/lib/elementary/efl_ui_check_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_check_legacy_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Check_Legacy.Part (Efl.Ui.Layout.Part_Content) 1class Efl.Ui.Check_Legacy_Part (Efl.Ui.Layout.Part_Content)
2{ 2{
3 [[Elementary check internal part class]] 3 [[Elementary check internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_dnd.eo b/src/lib/elementary/efl_ui_dnd.eo
index a8d5563600..7c903c88cb 100644
--- a/src/lib/elementary/efl_ui_dnd.eo
+++ b/src/lib/elementary/efl_ui_dnd.eo
@@ -11,9 +11,9 @@ mixin Efl.Ui.Dnd {
11 - EFL_UI_DND_EVENT_DRAG_DONE 11 - EFL_UI_DND_EVENT_DRAG_DONE
12 ]] 12 ]]
13 params { 13 params {
14 @in format: Efl.Selection.Format; [[The data format]] 14 @in format: Efl.Selection_Format; [[The data format]]
15 @in data: Eina.Slice; [[The drag data]] 15 @in data: Eina.Slice; [[The drag data]]
16 @in action: Efl.Selection.Action; [[Action when data is transferred]] 16 @in action: Efl.Selection_Action; [[Action when data is transferred]]
17 @in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]] 17 @in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]]
18 @in seat: uint; [[Specified seat for multiple seats case.]] 18 @in seat: uint; [[Specified seat for multiple seats case.]]
19 } 19 }
@@ -21,7 +21,7 @@ mixin Efl.Ui.Dnd {
21 drag_action_set { 21 drag_action_set {
22 [[Set the action for the drag]] 22 [[Set the action for the drag]]
23 params { 23 params {
24 @in action: Efl.Selection.Action; [[Drag action]] 24 @in action: Efl.Selection_Action; [[Drag action]]
25 @in seat: uint; [[Specified seat for multiple seats case.]] 25 @in seat: uint; [[Specified seat for multiple seats case.]]
26 } 26 }
27 } 27 }
@@ -39,14 +39,14 @@ mixin Efl.Ui.Dnd {
39 - EFL_UI_DND_EVENT_DRAG_POS 39 - EFL_UI_DND_EVENT_DRAG_POS
40 - EFL_UI_DND_EVENT_DRAG_DROP.]] 40 - EFL_UI_DND_EVENT_DRAG_DROP.]]
41 params { 41 params {
42 @in format: Efl.Selection.Format; [[Accepted data format]] 42 @in format: Efl.Selection_Format; [[Accepted data format]]
43 @in seat: uint; [[Specified seat for multiple seats case.]] 43 @in seat: uint; [[Specified seat for multiple seats case.]]
44 } 44 }
45 } 45 }
46 drop_target_del { 46 drop_target_del {
47 [[Delete the dropable status from object]] 47 [[Delete the dropable status from object]]
48 params { 48 params {
49 @in format: Efl.Selection.Format; [[Accepted data format]] 49 @in format: Efl.Selection_Format; [[Accepted data format]]
50 @in seat: uint; [[Specified seat for multiple seats case.]] 50 @in seat: uint; [[Specified seat for multiple seats case.]]
51 } 51 }
52 } 52 }
@@ -58,6 +58,6 @@ mixin Efl.Ui.Dnd {
58 drag,enter: void; [[called when the drag object enters this object]] 58 drag,enter: void; [[called when the drag object enters this object]]
59 drag,leave: void; [[called when the drag object leaves this object]] 59 drag,leave: void; [[called when the drag object leaves this object]]
60 drag,pos: Efl.Dnd.Drag_Pos; [[called when the drag object changes drag position]] 60 drag,pos: Efl.Dnd.Drag_Pos; [[called when the drag object changes drag position]]
61 drag,drop: Efl.Selection.Data; [[called when the drag object dropped on this object]] 61 drag,drop: Efl.Selection_Data; [[called when the drag object dropped on this object]]
62 } 62 }
63} 63}
diff --git a/src/lib/elementary/efl_ui_dnd_container.eo b/src/lib/elementary/efl_ui_dnd_container.eo
index f437080c6e..6334ea5ff5 100644
--- a/src/lib/elementary/efl_ui_dnd_container.eo
+++ b/src/lib/elementary/efl_ui_dnd_container.eo
@@ -34,7 +34,7 @@ mixin Efl.Ui.Dnd_Container {
34 } 34 }
35 drop_item_add { 35 drop_item_add {
36 params { 36 params {
37 @in format: Efl.Selection.Format; [[Accepted data formats]] 37 @in format: Efl.Selection_Format; [[Accepted data formats]]
38 @in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]] 38 @in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]]
39 @in seat: uint; [[Specified seat for multiple seats case.]] 39 @in seat: uint; [[Specified seat for multiple seats case.]]
40 } 40 }
diff --git a/src/lib/elementary/efl_ui_dnd_types.eot b/src/lib/elementary/efl_ui_dnd_types.eot
index 01fec18e3f..4e125c417a 100644
--- a/src/lib/elementary/efl_ui_dnd_types.eot
+++ b/src/lib/elementary/efl_ui_dnd_types.eot
@@ -14,9 +14,9 @@ function Efl.Dnd.Drag_Data_Get {
14 [[Function pointer for getting data and format at the drag side.]] 14 [[Function pointer for getting data and format at the drag side.]]
15 params { 15 params {
16 @in obj: Efl.Canvas.Object; [[The container object]] 16 @in obj: Efl.Canvas.Object; [[The container object]]
17 @out format: Efl.Selection.Format; [[Data format]] 17 @out format: Efl.Selection_Format; [[Data format]]
18 @out drag_data: Eina.Rw_Slice; [[Data]] 18 @out drag_data: Eina.Rw_Slice; [[Data]]
19 @out action: Efl.Selection.Action; [[The drag action]] 19 @out action: Efl.Selection_Action; [[The drag action]]
20 } 20 }
21}; 21};
22 22
@@ -46,13 +46,13 @@ struct Efl.Dnd.Drag_Accept {
46 46
47struct Efl.Dnd.Drag_Pos { 47struct Efl.Dnd.Drag_Pos {
48 pos: Eina.Position2D; [[Evas Coordinate]] 48 pos: Eina.Position2D; [[Evas Coordinate]]
49 action: Efl.Selection.Action; [[The drag action]] 49 action: Efl.Selection_Action; [[The drag action]]
50 format: Efl.Selection.Format; [[The drag format]] 50 format: Efl.Selection_Format; [[The drag format]]
51 item: Efl.Canvas.Object; [[The item object. It is only available for container object.]] 51 item: Efl.Canvas.Object; [[The item object. It is only available for container object.]]
52} 52}
53 53
54struct Efl.Dnd.Drag_Item_Container_Drop { 54struct Efl.Dnd.Drag_Item_Container_Drop {
55 item: Efl.Canvas.Object; [[The item object]] 55 item: Efl.Canvas.Object; [[The item object]]
56 data: Efl.Selection.Data; [[The selection data]] 56 data: Efl.Selection_Data; [[The selection data]]
57 pos: Eina.Position2D; [[Position relative to item (left (-1), middle (0), right (1)]] 57 pos: Eina.Position2D; [[Position relative to item (left (-1), middle (0), right (1)]]
58} 58}
diff --git a/src/lib/elementary/efl_ui_focus_composition_adapter.eo b/src/lib/elementary/efl_ui_focus_composition_adapter.eo
index 429ffde02b..b9d26fdfe8 100644
--- a/src/lib/elementary/efl_ui_focus_composition_adapter.eo
+++ b/src/lib/elementary/efl_ui_focus_composition_adapter.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Focus.Composition.Adapter (Efl.Object, Efl.Ui.Focus.Object) 1class Efl.Ui.Focus.Composition_Adapter (Efl.Object, Efl.Ui.Focus.Object)
2{ 2{
3 [[EFL UI Focus Composition Adapter class]] 3 [[EFL UI Focus Composition Adapter class]]
4 methods { 4 methods {
diff --git a/src/lib/elementary/efl_ui_pager.eo b/src/lib/elementary/efl_ui_pager.eo
index 89cb495e58..6f22a0ffb6 100644
--- a/src/lib/elementary/efl_ui_pager.eo
+++ b/src/lib/elementary/efl_ui_pager.eo
@@ -1,4 +1,4 @@
1enum Efl.Ui.Pager.Loop 1enum Efl.Ui.Pager_Loop
2{ 2{
3 [[Efl ui pager loop mode]] 3 [[Efl ui pager loop mode]]
4 disabled, 4 disabled,
@@ -69,7 +69,7 @@ class Efl.Ui.Pager (Efl.Ui.Layout.Object, Efl.Pack_Linear)
69 This property gives the option to make a loop through pages. 69 This property gives the option to make a loop through pages.
70 ]] 70 ]]
71 values { 71 values {
72 loop: Efl.Ui.Pager.Loop; 72 loop: Efl.Ui.Pager_Loop;
73 } 73 }
74 } 74 }
75 @property page_size { 75 @property page_size {
diff --git a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
index 18a713d851..382980829b 100644
--- a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Progressbar_Legacy.Part (Efl.Ui.Layout.Part_Content) 1class Efl.Ui.Progressbar_Legacy_Part (Efl.Ui.Layout.Part_Content)
2{ 2{
3 [[Elementary progressbar internal part class]] 3 [[Elementary progressbar internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_radio_legacy_part.eo b/src/lib/elementary/efl_ui_radio_legacy_part.eo
index a9882a824d..666d3c2318 100644
--- a/src/lib/elementary/efl_ui_radio_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_radio_legacy_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Radio_Legacy.Part (Efl.Ui.Layout.Part_Content) 1class Efl.Ui.Radio_Legacy_Part (Efl.Ui.Layout.Part_Content)
2{ 2{
3 [[Elementary radio internal part class]] 3 [[Elementary radio internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_stack.eo b/src/lib/elementary/efl_ui_stack.eo
index 33772123db..65f8156789 100644
--- a/src/lib/elementary/efl_ui_stack.eo
+++ b/src/lib/elementary/efl_ui_stack.eo
@@ -1,19 +1,19 @@
1struct Efl.Ui.Stack.Event_Loaded { 1struct Efl.Ui.Stack_Event_Loaded {
2 [[Information of loaded event.]] 2 [[Information of loaded event.]]
3 content: Efl.Canvas.Object; [[Loaded content.]] 3 content: Efl.Canvas.Object; [[Loaded content.]]
4} 4}
5 5
6struct Efl.Ui.Stack.Event_Unloaded { 6struct Efl.Ui.Stack_Event_Unloaded {
7 [[Information of unloaded event.]] 7 [[Information of unloaded event.]]
8 content: Efl.Canvas.Object; [[Unloaded content.]] 8 content: Efl.Canvas.Object; [[Unloaded content.]]
9} 9}
10 10
11struct Efl.Ui.Stack.Event_Activated { 11struct Efl.Ui.Stack_Event_Activated {
12 [[Information of activated event.]] 12 [[Information of activated event.]]
13 content: Efl.Canvas.Object; [[Activated content.]] 13 content: Efl.Canvas.Object; [[Activated content.]]
14} 14}
15 15
16struct Efl.Ui.Stack.Event_Deactivated { 16struct Efl.Ui.Stack_Event_Deactivated {
17 [[Information of deactivated event.]] 17 [[Information of deactivated event.]]
18 content: Efl.Canvas.Object; [[Deactivated content.]] 18 content: Efl.Canvas.Object; [[Deactivated content.]]
19} 19}
@@ -123,9 +123,9 @@ class Efl.Ui.Stack (Efl.Ui.Layout.Object)
123 Efl.Object.constructor; 123 Efl.Object.constructor;
124 } 124 }
125 events { 125 events {
126 loaded: Efl.Ui.Stack.Event_Loaded; [[Called when content is loaded right before transition.]] 126 loaded: Efl.Ui.Stack_Event_Loaded; [[Called when content is loaded right before transition.]]
127 unloaded: Efl.Ui.Stack.Event_Unloaded; [[Called when content is unloaded right after being deactivated.]] 127 unloaded: Efl.Ui.Stack_Event_Unloaded; [[Called when content is unloaded right after being deactivated.]]
128 activated: Efl.Ui.Stack.Event_Activated; [[Called when content is activated right after transition.]] 128 activated: Efl.Ui.Stack_Event_Activated; [[Called when content is activated right after transition.]]
129 deactivated: Efl.Ui.Stack.Event_Deactivated; [[Called when content is deactivated right after transition.]] 129 deactivated: Efl.Ui.Stack_Event_Deactivated; [[Called when content is deactivated right after transition.]]
130 } 130 }
131} 131}
diff --git a/src/lib/elementary/efl_ui_tab_page.eo b/src/lib/elementary/efl_ui_tab_page.eo
index 75249b816c..e60ed78157 100644
--- a/src/lib/elementary/efl_ui_tab_page.eo
+++ b/src/lib/elementary/efl_ui_tab_page.eo
@@ -1,11 +1,11 @@
1enum Efl.Ui.Tab_Page.Tab_Changed { 1enum Efl.Ui.Tab_Page_Tab_Changed {
2 label = 0, [[Label changed]] 2 label = 0, [[Label changed]]
3 icon [[Icon changed]] 3 icon [[Icon changed]]
4} 4}
5 5
6struct Efl.Ui.Tab_Page.Tab.Changed_Event { 6struct Efl.Ui.Tab_Page_Tab_Changed_Event {
7 [[Information of changed event]] 7 [[Information of changed event]]
8 changed_info: Efl.Ui.Tab_Page.Tab_Changed; 8 changed_info: Efl.Ui.Tab_Page_Tab_Changed;
9} 9}
10 10
11class Efl.Ui.Tab_Page (Efl.Ui.Layout.Object, Efl.Content) 11class Efl.Ui.Tab_Page (Efl.Ui.Layout.Object, Efl.Content)
@@ -14,7 +14,7 @@ class Efl.Ui.Tab_Page (Efl.Ui.Layout.Object, Efl.Content)
14 methods { 14 methods {
15 } 15 }
16 parts { 16 parts {
17 tab: Efl.Ui.Tab_Page.Part_Tab; 17 tab: Efl.Ui.Tab_Page_Part_Tab;
18 } 18 }
19 implements { 19 implements {
20 Efl.Object.constructor; 20 Efl.Object.constructor;
@@ -23,6 +23,6 @@ class Efl.Ui.Tab_Page (Efl.Ui.Layout.Object, Efl.Content)
23 Efl.Part.part; 23 Efl.Part.part;
24 } 24 }
25 events { 25 events {
26 tab,changed: Efl.Ui.Tab_Page.Tab.Changed_Event; [[Called when tab changed]] 26 tab,changed: Efl.Ui.Tab_Page_Tab_Changed_Event; [[Called when tab changed]]
27 } 27 }
28} \ No newline at end of file 28} \ No newline at end of file
diff --git a/src/lib/elementary/efl_ui_tab_page_part_tab.eo b/src/lib/elementary/efl_ui_tab_page_part_tab.eo
index b28fd9ae20..8c2ce57be1 100644
--- a/src/lib/elementary/efl_ui_tab_page_part_tab.eo
+++ b/src/lib/elementary/efl_ui_tab_page_part_tab.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Tab_Page.Part_Tab (Efl.Ui.Layout.Part, Efl.Text) 1class Efl.Ui.Tab_Page_Part_Tab (Efl.Ui.Layout.Part, Efl.Text)
2{ 2{
3 [[Tab_Page internal part class]] 3 [[Tab_Page internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 398b8041b1..c0ecc3c00c 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -59,7 +59,7 @@ class Efl.Ui.Text (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clicka
59 } 59 }
60 } 60 }
61 @property cnp_mode { 61 @property cnp_mode {
62 /* FIXME: Efl.Selection.Format does not allow markup without images! */ 62 /* FIXME: Efl.Selection_Format does not allow markup without images! */
63 set { 63 set {
64 [[Control pasting of text and images for the widget. 64 [[Control pasting of text and images for the widget.
65 65
@@ -78,7 +78,7 @@ class Efl.Ui.Text (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clicka
78 ]] 78 ]]
79 } 79 }
80 values { 80 values {
81 format: Efl.Selection.Format; [[Format for copy & paste.]] 81 format: Efl.Selection_Format; [[Format for copy & paste.]]
82 } 82 }
83 } 83 }
84 @property input_panel_language { 84 @property input_panel_language {
@@ -368,7 +368,7 @@ class Efl.Ui.Text (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clicka
368 activated: void; [[Called when entry is activated]] 368 activated: void; [[Called when entry is activated]]
369 changed: void; [[Called when entry changes]] 369 changed: void; [[Called when entry changes]]
370 /* FIXME: Sometimes it can be NULL but @nullable does not work on events */ 370 /* FIXME: Sometimes it can be NULL but @nullable does not work on events */
371 changed,user: Efl.Ui.Text.Change_Info; 371 changed,user: Efl.Ui.Text_Change_Info;
372 [[The text object has changed due to user interaction]] 372 [[The text object has changed due to user interaction]]
373 validate: Elm.Validate_Content; [[Called when validating]] 373 validate: Elm.Validate_Content; [[Called when validating]]
374 context,open: void; [[Called when context menu was opened]] 374 context,open: void; [[Called when context menu was opened]]
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index cf5b834545..a3f9cd3952 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -262,7 +262,7 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
262 See also @.on_orientation_update. 262 See also @.on_orientation_update.
263 ]] 263 ]]
264 values { 264 values {
265 mode: Efl.Ui.Widget.Orientation_Mode(Efl.Ui.Widget.Orientation_Mode.default); 265 mode: Efl.Ui.Widget_Orientation_Mode(Efl.Ui.Widget_Orientation_Mode.default);
266 [[How window orientation should affect this widget.]] 266 [[How window orientation should affect this widget.]]
267 } 267 }
268 } 268 }
diff --git a/src/lib/elementary/elm_slider_part_indicator.eo b/src/lib/elementary/elm_slider_part_indicator.eo
index 86e81474b8..934d80875c 100644
--- a/src/lib/elementary/elm_slider_part_indicator.eo
+++ b/src/lib/elementary/elm_slider_part_indicator.eo
@@ -9,7 +9,7 @@ class Elm.Slider.Part_Indicator (Efl.Ui.Layout.Part, Efl.Ui.Format)
9 [[Set/Get the visible mode of indicator. 9 [[Set/Get the visible mode of indicator.
10 ]] 10 ]]
11 values { 11 values {
12 mode: Efl.Ui.Slider.Indicator_Visible_Mode; [[The indicator visible mode.]] 12 mode: Efl.Ui.Slider_Indicator_Visible_Mode; [[The indicator visible mode.]]
13 } 13 }
14 } 14 }
15 } 15 }
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index ba68b77734..a9fd471c47 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3struct Efl.Event.Description { 3struct Efl.Event_Description {
4 [[This struct holds the description of a specific event.]] 4 [[This struct holds the description of a specific event.]]
5 name: string; [[name of the event.]] 5 name: string; [[name of the event.]]
6 unfreezable: bool; [[$true if the event cannot be frozen.]] 6 unfreezable: bool; [[$true if the event cannot be frozen.]]
@@ -230,14 +230,14 @@ abstract Efl.Object ()
230 event_callback_forwarder_add { 230 event_callback_forwarder_add {
231 [[Add an event callback forwarder for an event and an object.]] 231 [[Add an event callback forwarder for an event and an object.]]
232 params { 232 params {
233 @cref desc: Efl.Event.Description; [[The description of the event to listen to]] 233 @cref desc: Efl.Event_Description; [[The description of the event to listen to]]
234 @in new_obj: Efl.Object; [[The object to emit events from]] 234 @in new_obj: Efl.Object; [[The object to emit events from]]
235 } 235 }
236 } 236 }
237 event_callback_forwarder_del { 237 event_callback_forwarder_del {
238 [[Remove an event callback forwarder for an event and an object.]] 238 [[Remove an event callback forwarder for an event and an object.]]
239 params { 239 params {
240 @cref desc: Efl.Event.Description; [[The description of the event to listen to]] 240 @cref desc: Efl.Event_Description; [[The description of the event to listen to]]
241 @in new_obj: Efl.Object; [[The object to emit events from]] 241 @in new_obj: Efl.Object; [[The object to emit events from]]
242 } 242 }
243 } 243 }
@@ -318,6 +318,6 @@ struct Efl.Event {
318 This is the full event information passed to callbacks in C. 318 This is the full event information passed to callbacks in C.
319 ]] 319 ]]
320 object: Efl.Object; [[The object the callback was called on.]] 320 object: Efl.Object; [[The object the callback was called on.]]
321 desc: const(ptr(Efl.Event.Description)); [[The event description.]] 321 desc: const(ptr(Efl.Event_Description)); [[The event description.]]
322 info: void_ptr; [[Extra event information passed by the event caller]] 322 info: void_ptr; [[Extra event information passed by the event caller]]
323} 323}
diff --git a/src/lib/evas/canvas/efl_canvas_animation.eo b/src/lib/evas/canvas/efl_canvas_animation.eo
index b3a2b22646..7773ca3d7c 100644
--- a/src/lib/evas/canvas/efl_canvas_animation.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation.eo
@@ -32,7 +32,7 @@ class Efl.Canvas.Animation (Efl.Object, Efl.Playable)
32 get { 32 get {
33 } 33 }
34 values { 34 values {
35 mode: Efl.Canvas.Animation.Repeat_Mode; [[Repeat mode. EFL_ANIMATION_REPEAT_MODE_RESTART restarts animation when the animation ends and EFL_ANIMATION_REPEAT_MODE_REVERSE reverses animation when the animation ends.]] 35 mode: Efl.Canvas.Animation_Repeat_Mode; [[Repeat mode. EFL_ANIMATION_REPEAT_MODE_RESTART restarts animation when the animation ends and EFL_ANIMATION_REPEAT_MODE_REVERSE reverses animation when the animation ends.]]
36 } 36 }
37 } 37 }
38 @property repeat_count { 38 @property repeat_count {
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.eo b/src/lib/evas/canvas/efl_canvas_animation_player.eo
index 0418294136..a8e6dee9e8 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.eo
@@ -49,7 +49,7 @@ class Efl.Canvas.Animation_Player (Efl.Object, Efl.Player)
49 events { 49 events {
50 /* FIXME: This event is similar to Efl.Canvas.Object.anim_started but with different type, might be confusing. */ 50 /* FIXME: This event is similar to Efl.Canvas.Object.anim_started but with different type, might be confusing. */
51 started: void; [[Animation is started.]] 51 started: void; [[Animation is started.]]
52 running: Efl.Canvas.Object.Animation_Event; [[Animation is running.]] 52 running: Efl.Canvas.Object_Animation_Event; [[Animation is running.]]
53 /* FIXME: This event is similar to Efl.Canvas.Object.anim_ended but with different type, might be confusing. */ 53 /* FIXME: This event is similar to Efl.Canvas.Object.anim_ended but with different type, might be confusing. */
54 ended: void; [[Animation is ended.]] 54 ended: void; [[Animation is ended.]]
55 } 55 }
diff --git a/src/lib/evas/canvas/efl_canvas_animation_types.eot b/src/lib/evas/canvas/efl_canvas_animation_types.eot
index 6961b27e4a..ad3aecc637 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_types.eot
+++ b/src/lib/evas/canvas/efl_canvas_animation_types.eot
@@ -1,9 +1,9 @@
1// ---------------------------------------------------------------------------- 1// ----------------------------------------------------------------------------
2// All the below types are for Efl Animation 2// All the below types are for Efl Animation
3 3
4struct Efl.Canvas.Animation.Player.Event_Running; [[Information of event running]] 4struct Efl.Canvas.Animation_Player_Event_Running; [[Information of event running]]
5 5
6enum Efl.Canvas.Animation.Repeat_Mode 6enum Efl.Canvas.Animation_Repeat_Mode
7{ 7{
8 [[Animation repeat mode]] 8 [[Animation repeat mode]]
9 9
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 3d9e590881..cfb41ed07e 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -1,6 +1,6 @@
1import efl_text_types; 1import efl_text_types;
2 2
3struct Efl.Canvas.Object.Animation_Event; [[Information of animation events]] 3struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]]
4 4
5abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator, 5abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
6 Efl.Input.Interface, Efl.Gfx.Size_Hint, 6 Efl.Input.Interface, Efl.Gfx.Size_Hint,
@@ -444,7 +444,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.S
444 The default paragraph direction is $inherit. 444 The default paragraph direction is $inherit.
445 ]] 445 ]]
446 values { 446 values {
447 dir: Efl.Text.Bidirectional_Type; [[Paragraph direction for the given object.]] 447 dir: Efl.Text_Bidirectional_Type; [[Paragraph direction for the given object.]]
448 } 448 }
449 } 449 }
450 clipees_has @const { 450 clipees_has @const {
@@ -581,7 +581,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.S
581 get { legacy: null; } 581 get { legacy: null; }
582 set { legacy: null; } 582 set { legacy: null; }
583 keys { 583 keys {
584 @cref desc: Efl.Event.Description; 584 @cref desc: Efl.Event_Description;
585 [[The event description for which the given $animation is set.]] 585 [[The event description for which the given $animation is set.]]
586 } 586 }
587 values { 587 values {
@@ -624,8 +624,8 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.S
624 Efl.Canvas.Pointer.pointer_inside { get; } 624 Efl.Canvas.Pointer.pointer_inside { get; }
625 } 625 }
626 events { 626 events {
627 anim_started: Efl.Canvas.Object.Animation_Event; [[Animation is started.]] 627 anim_started: Efl.Canvas.Object_Animation_Event; [[Animation is started.]]
628 anim_running: Efl.Canvas.Object.Animation_Event; [[Animation is running.]] 628 anim_running: Efl.Canvas.Object_Animation_Event; [[Animation is running.]]
629 anim_ended: Efl.Canvas.Object.Animation_Event; [[Animation is ended.]] 629 anim_ended: Efl.Canvas.Object_Animation_Event; [[Animation is ended.]]
630 } 630 }
631} 631}
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 09c2c2ed63..29a20414ba 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -948,7 +948,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas.Scene, Efl.Animator, Efl.Input.Interfa
948 ]] 948 ]]
949 get {} 949 get {}
950 keys { 950 keys {
951 type: Efl.Input.Device.Type; [[The class of the default device to fetch.]] 951 type: Efl.Input.Device_Type; [[The class of the default device to fetch.]]
952 } 952 }
953 values { 953 values {
954 seat: Efl.Input.Device; [[The default device or $null on error.]] 954 seat: Efl.Input.Device; [[The default device or $null on error.]]
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 332a0412c8..617c9dedae 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -186,7 +186,7 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text,
186 [[Retrieves the direction of the text currently being displayed in the 186 [[Retrieves the direction of the text currently being displayed in the
187 text object.]] 187 text object.]]
188 188
189 return: Efl.Text.Bidirectional_Type; [[Bidirectional type]] 189 return: Efl.Text_Bidirectional_Type; [[Bidirectional type]]
190 } 190 }
191 } 191 }
192 @property ascent { 192 @property ascent {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture.eo b/src/lib/evas/gesture/efl_canvas_gesture.eo
index 3a682dc11c..d4abd7c671 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture.eo
@@ -10,7 +10,7 @@ abstract Efl.Canvas.Gesture(Efl.Object)
10 get { 10 get {
11 } 11 }
12 values { 12 values {
13 @cref type: Efl.Event.Description; [[gesture type]] 13 @cref type: Efl.Event_Description; [[gesture type]]
14 } 14 }
15 } 15 }
16 @property state { 16 @property state {
@@ -20,7 +20,7 @@ abstract Efl.Canvas.Gesture(Efl.Object)
20 set { 20 set {
21 } 21 }
22 values { 22 values {
23 state: Efl.Canvas.Gesture.State; [[gesture state]] 23 state: Efl.Canvas.Gesture_State; [[gesture state]]
24 } 24 }
25 } 25 }
26 @property hotspot { 26 @property hotspot {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
index 79fc3cc595..5084083a38 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
@@ -8,7 +8,7 @@ class Efl.Canvas.Gesture_Manager (Efl.Object)
8 params { 8 params {
9 @in recognizer: Efl.Canvas.Gesture_Recognizer; [[The gesture recognizer object]] 9 @in recognizer: Efl.Canvas.Gesture_Recognizer; [[The gesture recognizer object]]
10 } 10 }
11 return: ptr(const(Efl.Event.Description)); [[Returns the Efl.Event.Description type the recognizer supports]] 11 return: ptr(const(Efl.Event_Description)); [[Returns the Efl.Event_Description type the recognizer supports]]
12 } 12 }
13 recognizer_unregister { 13 recognizer_unregister {
14 [[This function is called to unregister a Efl.Canvas.Gesture_Recognizer]] 14 [[This function is called to unregister a Efl.Canvas.Gesture_Recognizer]]
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
index bcc611b4bc..d2a918e118 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
@@ -23,7 +23,7 @@ abstract Efl.Canvas.Gesture_Recognizer (Efl.Object)
23 @in watched: Efl.Object; [[The watched object]] 23 @in watched: Efl.Object; [[The watched object]]
24 @in event: Efl.Canvas.Gesture_Touch; [[The pointer event]] 24 @in event: Efl.Canvas.Gesture_Touch; [[The pointer event]]
25 } 25 }
26 return: Efl.Canvas.Gesture.Recognizer_Result; [[Returns the Efl.Canvas.Gesture event object]] 26 return: Efl.Canvas.Gesture_Recognizer_Result; [[Returns the Efl.Canvas.Gesture event object]]
27 } 27 }
28 /* FIXME: This function is not used? */ 28 /* FIXME: This function is not used? */
29 reset { 29 reset {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
index b259043d58..d18001759b 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
@@ -48,7 +48,7 @@ class Efl.Canvas.Gesture_Touch(Efl.Object)
48 @property state { 48 @property state {
49 [[This property holds the state of the touch event.]] 49 [[This property holds the state of the touch event.]]
50 get { 50 get {
51 return : Efl.Canvas.Gesture.Touch.State; [[touch event state]] 51 return : Efl.Canvas.Gesture_Touch_State; [[touch event state]]
52 } 52 }
53 } 53 }
54 /* FIXME: finger_list was broken by design - TODO */ 54 /* FIXME: finger_list was broken by design - TODO */
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_types.eot b/src/lib/evas/gesture/efl_canvas_gesture_types.eot
index 4710b7d306..4dbf88c727 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_types.eot
+++ b/src/lib/evas/gesture/efl_canvas_gesture_types.eot
@@ -1,4 +1,4 @@
1enum Efl.Canvas.Gesture.Touch.State 1enum Efl.Canvas.Gesture_Touch_State
2{ 2{
3 [[ This enum type describes the state of a touch event. ]] 3 [[ This enum type describes the state of a touch event. ]]
4 legacy: efl_gesture_touch; 4 legacy: efl_gesture_touch;
@@ -8,7 +8,7 @@ enum Efl.Canvas.Gesture.Touch.State
8 end, [[Last fingure touch up]] 8 end, [[Last fingure touch up]]
9} 9}
10 10
11enum Efl.Canvas.Gesture.State 11enum Efl.Canvas.Gesture_State
12{ 12{
13 [[ This enum type describes the state of a gesture. ]] 13 [[ This enum type describes the state of a gesture. ]]
14 legacy: efl_gesture; 14 legacy: efl_gesture;
@@ -19,7 +19,7 @@ enum Efl.Canvas.Gesture.State
19 canceled, [[A gesture was canceled.]] 19 canceled, [[A gesture was canceled.]]
20} 20}
21 21
22enum Efl.Canvas.Gesture.Recognizer_Result 22enum Efl.Canvas.Gesture_Recognizer_Result
23{ 23{
24 [[ This enum type describes the state of a gesture recognizer. ]] 24 [[ This enum type describes the state of a gesture recognizer. ]]
25 legacy: efl_gesture; 25 legacy: efl_gesture;