enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

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.
This commit is contained in:
Daniel Kolesa 2018-05-23 17:34:09 +02:00
parent 9fcd03952e c4572d3f79
commit 0f57eb8610
55 changed files with 150 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/eolian_mono/eolian/mono/blacklist.hh
View File

@ -56,7 +56,7 @@ inline bool is_function_blacklisted(std::string const& c_name)
// Blacklist structs that require some kind of manual binding.
inline bool is_struct_blacklisted(std::string const& full_name)
{
return full_name == "Efl.Event.Description"
return full_name == "Efl.Event_Description"
|| full_name == "Eina.Binbuf"
|| full_name == "Eina.Strbuf"
|| full_name == "Eina.Slice"

2
src/bin/eolian_mono/eolian/mono/klass.hh
View File

@ -500,7 +500,7 @@ struct klass
<< scope_tab << scope_tab << "if (!event_cb_count.TryGetValue(key, out event_count))\n"
<< scope_tab << scope_tab << scope_tab << "event_cb_count[key] = event_count;\n"
<< scope_tab << scope_tab << "if (event_count == 1) {\n"
<< scope_tab << scope_tab << scope_tab << "efl.kw_event.Description desc = new efl.kw_event.Description(key);\n"
<< scope_tab << scope_tab << scope_tab << "efl.Event_Description desc = new efl.Event_Description(key);\n"
<< scope_tab << scope_tab << scope_tab << "bool result = efl.eo.Globals.efl_event_callback_del(handle, desc, evt_delegate, System.IntPtr.Zero);\n"
<< scope_tab << scope_tab << scope_tab << "if (!result) {\n"
<< scope_tab << scope_tab << scope_tab << scope_tab << "eina.Log.Error($\"Failed to remove event proxy for event {key}\");\n"

2
src/bin/eolian_mono/eolian/mono/struct_definition.hh
View File

@ -368,7 +368,7 @@ struct struct_binding_conversion_functions_generator
// Open conversion class
if (!as_generator
(
"internal static class " << string << "_StructConversion\n{\n"
"public static class " << string << "_StructConversion\n{\n"
)
.generate(sink, struct_.cxx_name, context))
return false;

5
src/bindings/mono/eo_mono/iwrapper.cs
View File

@ -53,16 +53,13 @@ public class Globals {
[DllImport(efl.Libs.Eo)] public static extern bool efl_event_callback_priority_add(
System.IntPtr obj,
// FIXME commented to allow passing null stuff during test
//ref efl.kw_event.Description desc,
//efl.kw_event.Description desc,
IntPtr desc,
short priority,
efl.Event_Cb cb,
System.IntPtr data);
[DllImport(efl.Libs.Eo)] public static extern bool efl_event_callback_del(
System.IntPtr obj,
efl.kw_event.Description desc,
efl.Event_Description desc,
efl.Event_Cb cb,
System.IntPtr data);
[DllImport(efl.Libs.Eo)] public static extern IntPtr

8
src/bindings/mono/eo_mono/workaround.cs
View File

@ -70,10 +70,10 @@ public struct Evas_Object_Box_Option {
};
#pragma warning restore 0169
namespace efl { namespace kw_event {
namespace efl {
[StructLayout(LayoutKind.Sequential)]
public struct Description {
public struct Event_Description {
public IntPtr Name;
[MarshalAs(UnmanagedType.U1)] public bool Unfreezable;
[MarshalAs(UnmanagedType.U1)] public bool Legacy_is;
@ -81,7 +81,7 @@ public struct Description {
private static Dictionary<string, IntPtr> descriptions = new Dictionary<string, IntPtr>();
public Description(string name)
public Event_Description(string name)
{
if (!descriptions.ContainsKey(name))
{
@ -101,8 +101,6 @@ public struct Description {
}
};
} // namespace kw_event
public delegate void Event_Cb(System.IntPtr data, ref Event evt);
#pragma warning disable 0169

8
src/lib/ecore/efl_exe.eo
View File

@ -1,4 +1,4 @@
enum Efl.Exe.Signal {
enum Efl.Exe_Signal {
[[ ]]
int,
quit,
@ -11,7 +11,7 @@ enum Efl.Exe.Signal {
usr2
}
enum Efl.Exe.Flags {
enum Efl.Exe_Flags {
[[ ]]
none = 0,
group_leader = 1,
@ -25,14 +25,14 @@ class Efl.Exe (Efl.Task)
methods {
signal {
params {
sig: Efl.Exe.Signal; [[ Send this signal to the task ]]
sig: Efl.Exe_Signal; [[ Send this signal to the task ]]
}
}
@property exe_flags {
set { }
get { }
values {
flags: Efl.Exe.Flags; [[ ]]
flags: Efl.Exe_Flags; [[ ]]
}
}
@property exit_signal {

8
src/lib/ecore/efl_task.eo
View File

@ -1,4 +1,4 @@
enum Efl.Task.Priority {
enum Efl.Task_Priority {
[[ ]]
normal,
background,
@ -7,7 +7,7 @@ enum Efl.Task.Priority {
ultra
}
enum Efl.Task.Flags {
enum Efl.Task_Flags {
[[ ]]
none = 0,
use_stdin = 1,
@ -121,7 +121,7 @@ class Efl.Task (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer)
get { }
set { }
values {
priority: Efl.Task.Priority; [[ ]]
priority: Efl.Task_Priority; [[ ]]
}
}
@property exit_code {
@ -135,7 +135,7 @@ class Efl.Task (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer)
set { }
get { }
values {
flags: Efl.Task.Flags; [[ ]]
flags: Efl.Task_Flags; [[ ]]
}
}
run {

4
src/lib/ecore_con/efl_net_ip_address.eo
View File

@ -1,6 +1,6 @@
import eina_types;
struct Efl.Net.Ip_Address.Resolve_Results {
struct Efl.Net.Ip_Address_Resolve_Results {
[[The results of @Efl.Net.Ip_Address.resolve call.
This structure is created by @Efl.Net.Ip_Address.resolve.
@ -112,7 +112,7 @@ class Efl.Net.Ip_Address (Efl.Object) {
family: int @optional; [[Preferred family. AF_UNSPEC or 0 for both, otherwise one of AF_INET or AF_INET6]]
flags: int @optional; [[Flags to use with getaddrinfo(). If 0, default flags are used (AI_V4MAPPED | AI_ADDRCONFIG, if these exist in your system).]]
}
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.]]
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.]]
}
@property string {

16
src/lib/ecore_con/efl_net_session.eo
View File

@ -1,4 +1,4 @@
enum Efl.Net.Session.State {
enum Efl.Net.Session_State {
[[Provides the session connectivity state.
@since 1.19
@ -9,7 +9,7 @@ enum Efl.Net.Session.State {
}
/* keep in sync with efl_net_control_technology.eo, comment what doesn't make sense */
enum Efl.Net.Session.Technology {
enum Efl.Net.Session_Technology {
[[Bitwise-able technologies to allow for a network session.
@since 1.9
@ -24,7 +24,7 @@ enum Efl.Net.Session.Technology {
vpn = (1 << 6), [[Type: Virtual Private Network]]
gadget = (1 << 7), [[Type: USB gadget]]
/* p2p = (1 << 8), [[Type: Peer-2-Peer]]*/
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]]
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]]
}
class Efl.Net.Session (Efl.Loop_Consumer) {
@ -37,9 +37,9 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
Some platforms may not implement the backend for this class. In
this cases the system will report always @.state "online"
(@Efl.Net.Session.State.online) and other properties will be
(@Efl.Net.Session_State.online) and other properties will be
NULL, such as @.network_name, @.interface, @.ipv4 and @.ipv6; as well as
@.technology is set to @Efl.Net.Session.Technology.unknown. As such
@.technology is set to @Efl.Net.Session_Technology.unknown. As such
if you need to detect for an actual backend, check if the
state is online but those properties are NULL or technology is
unknown.
@ -70,7 +70,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
]]
params {
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]]
technologies_allowed: Efl.Net.Session.Technology; [[Bitwise OR of technologies to allow]]
technologies_allowed: Efl.Net.Session_Technology; [[Bitwise OR of technologies to allow]]
}
}
@ -102,7 +102,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
]]
get { }
values {
state: Efl.Net.Session.State; [[Network session state]]
state: Efl.Net.Session_State; [[Network session state]]
}
}
@ -110,7 +110,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
[[The access point technology that backs this session]]
get { }
values {
technology: Efl.Net.Session.Technology; [[Network session technology]]
technology: Efl.Net.Session_Technology; [[Network session technology]]
}
}

4
src/lib/efl/interfaces/efl_animator.eo
View File

@ -1,6 +1,6 @@
import eina_types;
struct Efl.Event.Animator_Tick {
struct Efl.Event_Animator_Tick {
[[EFL event animator tick data structure]]
update_area: Eina.Rect; [[Area of the canvas that will be pushed to screen.]]
}
@ -10,6 +10,6 @@ interface Efl.Animator {
eo_prefix: efl_animator;
event_prefix: efl;
events {
animator,tick: Efl.Event.Animator_Tick; [[Animator tick synchronized with screen vsync if possible.]]
animator,tick: Efl.Event_Animator_Tick; [[Animator tick synchronized with screen vsync if possible.]]
}
}

2
src/lib/efl/interfaces/efl_gfx_color.eo
View File

@ -73,7 +73,7 @@ mixin Efl.Gfx.Color
}
keys {
color_class: string; [[The name of color class]]
layer: Efl.Gfx.Color_Class.Layer @optional; [[The layer to set the color]]
layer: Efl.Gfx.Color_Class_Layer @optional; [[The layer to set the color]]
}
values {
colorcode: string; [[the hex color code.]]

2
src/lib/efl/interfaces/efl_gfx_color_class.eo
View File

@ -37,7 +37,7 @@ interface Efl.Gfx.Color_Class
}
keys {
color_class: string; [[The name of color class]]
layer: Efl.Gfx.Color_Class.Layer @optional; [[The layer to set the color]]
layer: Efl.Gfx.Color_Class_Layer @optional; [[The layer to set the color]]
}
values {
r: int; [[The intensity of the red color]]

4
src/lib/efl/interfaces/efl_gfx_gradient.eo
View File

@ -13,7 +13,7 @@ interface Efl.Gfx.Gradient
[[Get the list of color stops.]]
}
values {
colors: ptr(const(Efl.Gfx.Gradient.Stop)); [[Color stops list]]
colors: ptr(const(Efl.Gfx.Gradient_Stop)); [[Color stops list]]
length: uint; [[Length of the list]]
}
}
@ -27,7 +27,7 @@ interface Efl.Gfx.Gradient
]]
}
values {
s: Efl.Gfx.Gradient.Spread; [[Spread type to be used]]
s: Efl.Gfx.Gradient_Spread; [[Spread type to be used]]
}
}
}

4
src/lib/efl/interfaces/efl_gfx_path.eo
View File

@ -18,7 +18,7 @@ mixin Efl.Gfx.Path
get {
}
values {
op: ptr(const(Efl.Gfx.Path.Command_Type)); [[Command list]]
op: ptr(const(Efl.Gfx.Path_Command_Type)); [[Command list]]
points: ptr(const(double)); [[Point list]]
}
}
@ -284,6 +284,6 @@ mixin Efl.Gfx.Path
}
}
events {
changed: Efl.Gfx.Path.Change_Event; [[Graphics path was changed.]]
changed: Efl.Gfx.Path_Change_Event; [[Graphics path was changed.]]
}
}

2
src/lib/efl/interfaces/efl_gfx_shape.eo
View File

@ -113,7 +113,7 @@ mixin Efl.Gfx.Shape (Efl.Gfx.Path)
get {
}
values {
fill_rule: Efl.Gfx.Fill.Rule; [[The current fill rule of the shape object.
fill_rule: Efl.Gfx.Fill_Rule; [[The current fill rule of the shape object.
One of $EFL_GFX_FILL_RULE_WINDING, $EFL_GFX_FILL_RULE_ODD_EVEN]]
}
}

18
src/lib/efl/interfaces/efl_gfx_types.eot
View File

@ -30,7 +30,7 @@ enum Efl.Gfx.Render_Op {
last [[Sentinel value to indicate last enum field during iteration]]
}
enum Efl.Gfx.Path.Command_Type {
enum Efl.Gfx.Path_Command_Type {
[[These values determine how the points are interpreted in a stream of points.
@since 1.14
]]
@ -66,7 +66,7 @@ enum Efl.Gfx.Join
last [[Sentinel value to indicate last enum field during iteration]]
}
enum Efl.Gfx.Gradient.Spread
enum Efl.Gfx.Gradient_Spread
{
[[Specifies how the area outside the gradient area should be filled.
$ref efl_gfx_gradient_spread_set()
@ -78,7 +78,7 @@ enum Efl.Gfx.Gradient.Spread
last [[Sentinel value to indicate last enum field during iteration]]
}
enum Efl.Gfx.Fill.Rule
enum Efl.Gfx.Fill_Rule
{
[[Type defining how an image content get filled.
@since 1.14
@ -96,7 +96,7 @@ struct Efl.Gfx.Dash {
gap: double; [[Distance between two dashes.]]
}
struct Efl.Gfx.Gradient.Stop
struct Efl.Gfx.Gradient_Stop
{
[[Type defining gradient stops.
Describes the location and color of a transition point in a gradient.
@ -109,7 +109,7 @@ struct Efl.Gfx.Gradient.Stop
a: int; [[The component A color of the gradient stop]]
}
struct Efl.Gfx.Stroke.Color
struct Efl.Gfx.Stroke_Color
{
[[Internal structure for @Efl.Gfx.Stroke.]]
r: int; [[The component R color of the stroke]]
@ -127,14 +127,14 @@ struct Efl.Gfx.Stroke
scale: double; [[Stroke scale]]
width: double; [[Stroke width]]
centered: double; [[Stroke centered]]
color: Efl.Gfx.Stroke.Color; [[Stroke color]]
color: Efl.Gfx.Stroke_Color; [[Stroke color]]
dash: ptr(Efl.Gfx.Dash); [[Stroke dash]]
dash_length: uint; [[Stroke dash length]]
cap: Efl.Gfx.Cap; [[Stroke cap]]
join: Efl.Gfx.Join; [[Stroke join]]
}
struct Efl.Gfx.Shape.Public
struct Efl.Gfx.Shape_Public
{
[[Public shape]]
stroke: Efl.Gfx.Stroke; [[Internal representation as stroke]]
@ -158,7 +158,7 @@ enum Efl.Gfx.Change_Flag
all = 0xffff [[all properties got changed]]
}
struct Efl.Gfx.Path.Change_Event {
struct Efl.Gfx.Path_Change_Event {
what: Efl.Gfx.Change_Flag; [[Indicates what changed.]]
}
@ -204,7 +204,7 @@ enum Efl.Gfx.Image_Load_Error
recursive_reference = 10 [[(Edje only) The group/collection set to load from had recursive references on its components]]
}
enum Efl.Gfx.Color_Class.Layer {
enum Efl.Gfx.Color_Class_Layer {
[[Efl Gfx Color Class layer enum]]
normal = 0, [[Default color]]
outline, [[Outline color]]

6
src/lib/efl/interfaces/efl_input_device.eo
View File

@ -1,4 +1,4 @@
enum Efl.Input.Device.Type
enum Efl.Input.Device_Type
{
[[General type of input device.
@ -29,7 +29,7 @@ class Efl.Input.Device (Efl.Object)
@property device_type {
[[Device type property]]
values {
klass: Efl.Input.Device.Type; [[Input device class]]
klass: Efl.Input.Device_Type; [[Input device class]]
}
}
@property source {
@ -44,7 +44,7 @@ class Efl.Input.Device (Efl.Object)
This method will find the seat the device belongs to.
For this, it walk through device's parents looking for a device
with @Efl.Input.Device.Type.seat. It may be
with @Efl.Input.Device_Type.seat. It may be
the device itself.
In case no seat is found, $null is returned.

2
src/lib/efl/interfaces/efl_observable.eo
View File

@ -56,7 +56,7 @@ class Efl.Observable (Efl.Object) {
[[Return a new iterator associated to this observable.
@since 1.19]]
return: iterator<ptr(Efl.Observable.Tuple)> @owned; [[Iterator for observer]]
return: iterator<ptr(Efl.Observable_Tuple)> @owned; [[Iterator for observer]]
}
}
implements {

4
src/lib/efl/interfaces/efl_text_types.eot
View File

@ -1,4 +1,4 @@
enum Efl.Text.Bidirectional_Type {
enum Efl.Text_Bidirectional_Type {
[[Bidirectionaltext type]]
natural = 0, [[Natural text type, same as neutral]]
neutral = 0, [[Neutral text type, same as natural]]
@ -7,7 +7,7 @@ enum Efl.Text.Bidirectional_Type {
inherit [[Inherit text type]]
}
struct Efl.Ui.Text.Change_Info {
struct Efl.Ui.Text_Change_Info {
[[This structure includes all the information about content changes.
It's meant to be used to implement undo/redo.

2
src/lib/efl/interfaces/efl_types.eot
View File

@ -39,7 +39,7 @@ struct Efl.Version
build_id: string; [[Contains $EFL_BUILD_ID.]]
}
struct Efl.Observable.Tuple
struct Efl.Observable_Tuple
{
[[This type describes an observable touple]]
key: string; [[Touple key]]

2
src/lib/efl/interfaces/efl_ui_drag.eo
View File

@ -73,7 +73,7 @@ interface Efl.Ui.Drag
]]
get {
[[Gets the draggable direction.]]
return: Efl.Ui.Drag.Dir; [[The direction(s) premitted for drag.]]
return: Efl.Ui.Drag_Dir; [[The direction(s) premitted for drag.]]
}
}
@property drag_step {

2
src/lib/efl/interfaces/efl_ui_types.eot
View File

@ -1,4 +1,4 @@
enum Efl.Ui.Drag.Dir {
enum Efl.Ui.Drag_Dir {
[[Permitted directions for dragging objects.]]
none = 0, [[Not draggable in any direction.]]
x = 1, [[Draggable horizontally.]]

4
src/lib/efl/interfaces/efl_ui_zoom.eo
View File

@ -1,4 +1,4 @@
enum Efl.Ui.Zoom.Mode
enum Efl.Ui.Zoom_Mode
{
[[Types of zoom available.]]
legacy: efl_ui_zoom_mode;
@ -88,7 +88,7 @@ interface Efl.Ui.Zoom ()
]]
}
values {
mode: Efl.Ui.Zoom.Mode; [[The zoom mode.]]
mode: Efl.Ui.Zoom_Mode; [[The zoom mode.]]
}
}
}

2
src/lib/elementary/efl_access_object.eo
View File

@ -376,7 +376,7 @@ mixin Efl.Access.Object (Efl.Interface, Efl.Object)
[[Emit event]]
params {
@in accessible: Efl.Access.Object; [[Accessibility object.]]
@cref event: Efl.Event.Description; [[Accessibility event type.]]
@cref event: Efl.Event_Description; [[Accessibility event type.]]
@in event_info: void_ptr; [[Accessibility event details.]]
}
}

16
src/lib/elementary/efl_selection.eo
View File

@ -7,8 +7,8 @@ mixin Efl.Selection {
selection_set {
[[Set the selection data to the object]]
params {
@in type: Efl.Selection.Type; [[Selection Type]]
@in format: Efl.Selection.Format; [[Selection Format]]
@in type: Efl.Selection_Type; [[Selection Type]]
@in format: Efl.Selection_Format; [[Selection Format]]
@in data: Eina.Slice;
@in seat: uint;[[Specified seat for multiple seats case.]]
}
@ -17,29 +17,29 @@ mixin Efl.Selection {
selection_get {
[[Get the data from the object that has selection]]
params {
@in type: Efl.Selection.Type; [[Selection Type]]
@in format: Efl.Selection.Format; [[Selection Format]]
@in data_func: Efl.Selection.Data_Ready; [[Data ready function pointer]]
@in type: Efl.Selection_Type; [[Selection Type]]
@in format: Efl.Selection_Format; [[Selection Format]]
@in data_func: Efl.Selection_Data_Ready; [[Data ready function pointer]]
@in seat: uint;[[Specified seat for multiple seats case.]]
}
}
selection_clear {
[[Clear the selection data from the object]]
params {
@in type: Efl.Selection.Type; [[Selection Type]]
@in type: Efl.Selection_Type; [[Selection Type]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
has_owner {
[[Determine whether the selection data has owner]]
params {
@in type: Efl.Selection.Type; [[Selection type]]
@in type: Efl.Selection_Type; [[Selection type]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
return: bool; [[EINA_TRUE if there is object owns selection, otherwise EINA_FALSE]]
}
}
events {
selection,changed: Efl.Selection.Changed; [[Called when display server's selection has changed]]
selection,changed: Efl.Selection_Changed; [[Called when display server's selection has changed]]
}
}

26
src/lib/elementary/efl_selection_manager.eo
View File

@ -6,8 +6,8 @@ class Efl.Selection_Manager (Efl.Object) {
[[Set selection]]
params {
@in owner: Efl.Object; [[Seleciton owner]]
@in type: Efl.Selection.Type; [[Selection type]]
@in format: Efl.Selection.Format; [[Selection format]]
@in type: Efl.Selection_Type; [[Selection type]]
@in format: Efl.Selection_Format; [[Selection format]]
@in data: Eina.Slice; [[Selection data]]
@in seat: uint @optional;[[Specified seat for multiple seats case.]]
}
@ -17,16 +17,16 @@ class Efl.Selection_Manager (Efl.Object) {
[[Get selection]]
params {
@in request: const(Efl.Object); [[Seleciton owner]]
@in type: Efl.Selection.Type; [[Selection type]]
@in format: Efl.Selection.Format; [[Selection Format]]
@in data_func: Efl.Selection.Data_Ready; [[Data ready function pointer]]
@in type: Efl.Selection_Type; [[Selection type]]
@in format: Efl.Selection_Format; [[Selection Format]]
@in data_func: Efl.Selection_Data_Ready; [[Data ready function pointer]]
@in seat: uint @optional;[[Specified seat for multiple seats case.]]
}
}
selection_clear @beta {
params {
@in owner: Efl.Object; [[Seleciton owner]]
@in type: Efl.Selection.Type; [[Selection type]]
@in type: Efl.Selection_Type; [[Selection type]]
@in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
}
@ -34,7 +34,7 @@ class Efl.Selection_Manager (Efl.Object) {
[[Check if the request object has selection or not]]
params {
@in request: Efl.Object; [[Request object]]
@in type: Efl.Selection.Type; [[Selection type]]
@in type: Efl.Selection_Type; [[Selection type]]
@in seat: uint @optional; [[Specified seat for multiple seats case.]]
}
return: bool; [[EINA_TRUE if the request object has selection, otherwise, EINA_FALSE]]
@ -48,9 +48,9 @@ class Efl.Selection_Manager (Efl.Object) {
]]
params {
@in drag_obj: Efl.Object; [[Drag object]]
@in format: Efl.Selection.Format; [[Data format]]
@in format: Efl.Selection_Format; [[Data format]]
@in data: Eina.Slice; [[Data to transfer]]
@in action: Efl.Selection.Action; [[Action when data is transferred]]
@in action: Efl.Selection_Action; [[Action when data is transferred]]
@in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
@ -59,7 +59,7 @@ class Efl.Selection_Manager (Efl.Object) {
[[This sets the action for the drag]]
params {
@in drag_obj: Efl.Object; [[Drag object]]
@in action: Efl.Selection.Action; [[Drag action]]
@in action: Efl.Selection_Action; [[Drag action]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
@ -102,7 +102,7 @@ class Efl.Selection_Manager (Efl.Object) {
- EFL_UI_DND_DROP_DRAG_DROP.]]
params {
@in target_obj: Efl.Object; [[Drop target]]
@in format: Efl.Selection.Format; [[Accepted data format]]
@in format: Efl.Selection_Format; [[Accepted data format]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
return: bool; [[$true on success, $false otherwise]]
@ -111,7 +111,7 @@ class Efl.Selection_Manager (Efl.Object) {
[[Remove a dropable target]]
params {
@in target_obj: Efl.Object; [[Drop target]]
@in format: Efl.Selection.Format; [[Accepted data format]]
@in format: Efl.Selection_Format; [[Accepted data format]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
@ -119,7 +119,7 @@ class Efl.Selection_Manager (Efl.Object) {
[[Add dropable target for a container in which items can drop to it]]
params {
@in cont: Efl.Object; [[Container object]]
@in format: Efl.Selection.Format; [[Accepted data formats]]
@in format: Efl.Selection_Format; [[Accepted data formats]]
@in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}

20
src/lib/elementary/efl_selection_types.eot
View File

@ -1,4 +1,4 @@
enum Efl.Selection.Type
enum Efl.Selection_Type
{
[[Selection type]]
primary, [[Primary text selection (highlighted or selected text)]]
@ -7,7 +7,7 @@ enum Efl.Selection.Type
clipboard [[Clipboard selection (ctrl+C)]]
}
enum Efl.Selection.Format
enum Efl.Selection_Format
{
[[Selection format]]
targets = -1, [[For matching every possible atom]]
@ -19,7 +19,7 @@ enum Efl.Selection.Format
html = 0x10 [[Raw HTML-like data (eg. webkit)]]
}
enum Efl.Selection.Action
enum Efl.Selection_Action
{
[[Defines the kind of action associated with the drop data]]
unknown, [[Action type is unknown]]
@ -32,27 +32,27 @@ enum Efl.Selection.Action
description [[Describe the data]]
}
struct Efl.Selection.Data
struct Efl.Selection_Data
{
[[Structure holding the info about selected data]]
pos: Eina.Position2D; [[Coordinates of the drop (DND operations only)]]
format: Efl.Selection.Format; [[Format of the selection]]
format: Efl.Selection_Format; [[Format of the selection]]
content: Eina.Slice; [[Selection data]]
action: Efl.Selection.Action; [[Action to perform with the data]]
action: Efl.Selection_Action; [[Action to perform with the data]]
item: Efl.Object; [[Item under the drag position. It is only available for container]]
}
function Efl.Selection.Data_Ready {
function Efl.Selection_Data_Ready {
[[Function pointer for getting selection]]
params {
@in obj: Efl.Object; [[Object which requested for the selection]]
@in seldata: ptr(Efl.Selection.Data); [[Selection data]]
@in seldata: ptr(Efl.Selection_Data); [[Selection data]]
}
};
struct Efl.Selection.Changed
struct Efl.Selection_Changed
{
type: Efl.Selection.Type; [[Selection type]]
type: Efl.Selection_Type; [[Selection type]]
seat: int; [[The seat on which the selection changed, or NULL for "default"]]
display: void_ptr; [[The display connection object, NULL under X11]]
exist: bool; [[EINA_TRUE if the selection has an owner]]

4
src/lib/elementary/efl_ui.eot
View File

@ -42,7 +42,7 @@ enum Efl.Ui.Focus.Move_Policy
Left, Right, Up, Down, Tab, or Shift+Tab.]]
}
enum Efl.Ui.Slider.Indicator_Visible_Mode
enum Efl.Ui.Slider_Indicator_Visible_Mode
{
[[Slider's indicator visiblity mode.
@ -88,7 +88,7 @@ enum Efl.Ui.Activate
back, [[Activate back]]
}
enum Efl.Ui.Widget.Orientation_Mode
enum Efl.Ui.Widget_Orientation_Mode
{
[[Widget orientation mode, or how the theme handles screen orientation.

2
src/lib/elementary/efl_ui_button_legacy_part.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Button_Legacy.Part (Efl.Ui.Layout.Part_Content)
class Efl.Ui.Button_Legacy_Part (Efl.Ui.Layout.Part_Content)
{
[[Elementary button internal part class]]
data: null;

2
src/lib/elementary/efl_ui_check_legacy_part.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Check_Legacy.Part (Efl.Ui.Layout.Part_Content)
class Efl.Ui.Check_Legacy_Part (Efl.Ui.Layout.Part_Content)
{
[[Elementary check internal part class]]
data: null;

12
src/lib/elementary/efl_ui_dnd.eo
View File

@ -11,9 +11,9 @@ mixin Efl.Ui.Dnd {
- EFL_UI_DND_EVENT_DRAG_DONE
]]
params {
@in format: Efl.Selection.Format; [[The data format]]
@in format: Efl.Selection_Format; [[The data format]]
@in data: Eina.Slice; [[The drag data]]
@in action: Efl.Selection.Action; [[Action when data is transferred]]
@in action: Efl.Selection_Action; [[Action when data is transferred]]
@in icon_func: Efl.Dnd.Drag_Icon_Create; [[Function pointer to create icon]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
@ -21,7 +21,7 @@ mixin Efl.Ui.Dnd {
drag_action_set {
[[Set the action for the drag]]
params {
@in action: Efl.Selection.Action; [[Drag action]]
@in action: Efl.Selection_Action; [[Drag action]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
@ -39,14 +39,14 @@ mixin Efl.Ui.Dnd {
- EFL_UI_DND_EVENT_DRAG_POS
- EFL_UI_DND_EVENT_DRAG_DROP.]]
params {
@in format: Efl.Selection.Format; [[Accepted data format]]
@in format: Efl.Selection_Format; [[Accepted data format]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
drop_target_del {
[[Delete the dropable status from object]]
params {
@in format: Efl.Selection.Format; [[Accepted data format]]
@in format: Efl.Selection_Format; [[Accepted data format]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}
}
@ -58,6 +58,6 @@ mixin Efl.Ui.Dnd {
drag,enter: void; [[called when the drag object enters this object]]
drag,leave: void; [[called when the drag object leaves this object]]
drag,pos: Efl.Dnd.Drag_Pos; [[called when the drag object changes drag position]]
drag,drop: Efl.Selection.Data; [[called when the drag object dropped on this object]]
drag,drop: Efl.Selection_Data; [[called when the drag object dropped on this object]]
}
}

2
src/lib/elementary/efl_ui_dnd_container.eo
View File

@ -34,7 +34,7 @@ mixin Efl.Ui.Dnd_Container {
}
drop_item_add {
params {
@in format: Efl.Selection.Format; [[Accepted data formats]]
@in format: Efl.Selection_Format; [[Accepted data formats]]
@in item_func: Efl.Dnd.Item_Get; [[Get item at specific position]]
@in seat: uint; [[Specified seat for multiple seats case.]]
}

10
src/lib/elementary/efl_ui_dnd_types.eot
View File

@ -14,9 +14,9 @@ function Efl.Dnd.Drag_Data_Get {
[[Function pointer for getting data and format at the drag side.]]
params {
@in obj: Efl.Canvas.Object; [[The container object]]
@out format: Efl.Selection.Format; [[Data format]]
@out format: Efl.Selection_Format; [[Data format]]
@out drag_data: Eina.Rw_Slice; [[Data]]
@out action: Efl.Selection.Action; [[The drag action]]
@out action: Efl.Selection_Action; [[The drag action]]
}
};
@ -46,13 +46,13 @@ struct Efl.Dnd.Drag_Accept {
struct Efl.Dnd.Drag_Pos {
pos: Eina.Position2D; [[Evas Coordinate]]
action: Efl.Selection.Action; [[The drag action]]
format: Efl.Selection.Format; [[The drag format]]
action: Efl.Selection_Action; [[The drag action]]
format: Efl.Selection_Format; [[The drag format]]
item: Efl.Canvas.Object; [[The item object. It is only available for container object.]]
}
struct Efl.Dnd.Drag_Item_Container_Drop {
item: Efl.Canvas.Object; [[The item object]]
data: Efl.Selection.Data; [[The selection data]]
data: Efl.Selection_Data; [[The selection data]]
pos: Eina.Position2D; [[Position relative to item (left (-1), middle (0), right (1)]]
}

2
src/lib/elementary/efl_ui_focus_composition_adapter.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Focus.Composition.Adapter (Efl.Object, Efl.Ui.Focus.Object)
class Efl.Ui.Focus.Composition_Adapter (Efl.Object, Efl.Ui.Focus.Object)
{
[[EFL UI Focus Composition Adapter class]]
methods {

4
src/lib/elementary/efl_ui_pager.eo
View File

@ -1,4 +1,4 @@
enum Efl.Ui.Pager.Loop
enum Efl.Ui.Pager_Loop
{
[[Efl ui pager loop mode]]
disabled,
@ -69,7 +69,7 @@ class Efl.Ui.Pager (Efl.Ui.Layout.Object, Efl.Pack_Linear)
This property gives the option to make a loop through pages.
]]
values {
loop: Efl.Ui.Pager.Loop;
loop: Efl.Ui.Pager_Loop;
}
}
@property page_size {

2
src/lib/elementary/efl_ui_progressbar_legacy_part.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Progressbar_Legacy.Part (Efl.Ui.Layout.Part_Content)
class Efl.Ui.Progressbar_Legacy_Part (Efl.Ui.Layout.Part_Content)
{
[[Elementary progressbar internal part class]]
data: null;

2
src/lib/elementary/efl_ui_radio_legacy_part.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Radio_Legacy.Part (Efl.Ui.Layout.Part_Content)
class Efl.Ui.Radio_Legacy_Part (Efl.Ui.Layout.Part_Content)
{
[[Elementary radio internal part class]]
data: null;

16
src/lib/elementary/efl_ui_stack.eo
View File

@ -1,19 +1,19 @@
struct Efl.Ui.Stack.Event_Loaded {
struct Efl.Ui.Stack_Event_Loaded {
[[Information of loaded event.]]
content: Efl.Canvas.Object; [[Loaded content.]]
}
struct Efl.Ui.Stack.Event_Unloaded {
struct Efl.Ui.Stack_Event_Unloaded {
[[Information of unloaded event.]]
content: Efl.Canvas.Object; [[Unloaded content.]]
}
struct Efl.Ui.Stack.Event_Activated {
struct Efl.Ui.Stack_Event_Activated {
[[Information of activated event.]]
content: Efl.Canvas.Object; [[Activated content.]]
}
struct Efl.Ui.Stack.Event_Deactivated {
struct Efl.Ui.Stack_Event_Deactivated {
[[Information of deactivated event.]]
content: Efl.Canvas.Object; [[Deactivated content.]]
}
@ -123,9 +123,9 @@ class Efl.Ui.Stack (Efl.Ui.Layout.Object)
Efl.Object.constructor;
}
events {
loaded: Efl.Ui.Stack.Event_Loaded; [[Called when content is loaded right before transition.]]
unloaded: Efl.Ui.Stack.Event_Unloaded; [[Called when content is unloaded right after being deactivated.]]
activated: Efl.Ui.Stack.Event_Activated; [[Called when content is activated right after transition.]]
deactivated: Efl.Ui.Stack.Event_Deactivated; [[Called when content is deactivated right after transition.]]
loaded: Efl.Ui.Stack_Event_Loaded; [[Called when content is loaded right before transition.]]
unloaded: Efl.Ui.Stack_Event_Unloaded; [[Called when content is unloaded right after being deactivated.]]
activated: Efl.Ui.Stack_Event_Activated; [[Called when content is activated right after transition.]]
deactivated: Efl.Ui.Stack_Event_Deactivated; [[Called when content is deactivated right after transition.]]
}
}

10
src/lib/elementary/efl_ui_tab_page.eo
View File

@ -1,11 +1,11 @@
enum Efl.Ui.Tab_Page.Tab_Changed {
enum Efl.Ui.Tab_Page_Tab_Changed {
label = 0, [[Label changed]]
icon [[Icon changed]]
}
struct Efl.Ui.Tab_Page.Tab.Changed_Event {
struct Efl.Ui.Tab_Page_Tab_Changed_Event {
[[Information of changed event]]
changed_info: Efl.Ui.Tab_Page.Tab_Changed;
changed_info: Efl.Ui.Tab_Page_Tab_Changed;
}
class 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)
methods {
}
parts {
tab: Efl.Ui.Tab_Page.Part_Tab;
tab: Efl.Ui.Tab_Page_Part_Tab;
}
implements {
Efl.Object.constructor;
@ -23,6 +23,6 @@ class Efl.Ui.Tab_Page (Efl.Ui.Layout.Object, Efl.Content)
Efl.Part.part;
}
events {
tab,changed: Efl.Ui.Tab_Page.Tab.Changed_Event; [[Called when tab changed]]
tab,changed: Efl.Ui.Tab_Page_Tab_Changed_Event; [[Called when tab changed]]
}
}

2
src/lib/elementary/efl_ui_tab_page_part_tab.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Tab_Page.Part_Tab (Efl.Ui.Layout.Part, Efl.Text)
class Efl.Ui.Tab_Page_Part_Tab (Efl.Ui.Layout.Part, Efl.Text)
{
[[Tab_Page internal part class]]
data: null;

6
src/lib/elementary/efl_ui_text.eo
View File

@ -59,7 +59,7 @@ class Efl.Ui.Text (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clicka
}
}
@property cnp_mode {
/* FIXME: Efl.Selection.Format does not allow markup without images! */
/* FIXME: Efl.Selection_Format does not allow markup without images! */
set {
[[Control pasting of text and images for the widget.
@ -78,7 +78,7 @@ class Efl.Ui.Text (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clicka
]]
}
values {
format: Efl.Selection.Format; [[Format for copy & paste.]]
format: Efl.Selection_Format; [[Format for copy & paste.]]
}
}
@property input_panel_language {
@ -368,7 +368,7 @@ class Efl.Ui.Text (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clicka
activated: void; [[Called when entry is activated]]
changed: void; [[Called when entry changes]]
/* FIXME: Sometimes it can be NULL but @nullable does not work on events */
changed,user: Efl.Ui.Text.Change_Info;
changed,user: Efl.Ui.Text_Change_Info;
[[The text object has changed due to user interaction]]
validate: Elm.Validate_Content; [[Called when validating]]
context,open: void; [[Called when context menu was opened]]

2
src/lib/elementary/efl_ui_widget.eo
View File

@ -262,7 +262,7 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
See also @.on_orientation_update.
]]
values {
mode: Efl.Ui.Widget.Orientation_Mode(Efl.Ui.Widget.Orientation_Mode.default);
mode: Efl.Ui.Widget_Orientation_Mode(Efl.Ui.Widget_Orientation_Mode.default);
[[How window orientation should affect this widget.]]
}
}

2
src/lib/elementary/elm_slider_part_indicator.eo
View File

@ -9,7 +9,7 @@ class Elm.Slider.Part_Indicator (Efl.Ui.Layout.Part, Efl.Ui.Format)
[[Set/Get the visible mode of indicator.
]]
values {
mode: Efl.Ui.Slider.Indicator_Visible_Mode; [[The indicator visible mode.]]
mode: Efl.Ui.Slider_Indicator_Visible_Mode; [[The indicator visible mode.]]
}
}
}

8
src/lib/eo/efl_object.eo
View File

@ -1,6 +1,6 @@
import eina_types;
struct Efl.Event.Description {
struct Efl.Event_Description {
[[This struct holds the description of a specific event.]]
name: string; [[name of the event.]]
unfreezable: bool; [[$true if the event cannot be frozen.]]
@ -230,14 +230,14 @@ abstract Efl.Object ()
event_callback_forwarder_add {
[[Add an event callback forwarder for an event and an object.]]
params {
@cref desc: Efl.Event.Description; [[The description of the event to listen to]]
@cref desc: Efl.Event_Description; [[The description of the event to listen to]]
@in new_obj: Efl.Object; [[The object to emit events from]]
}
}
event_callback_forwarder_del {
[[Remove an event callback forwarder for an event and an object.]]
params {
@cref desc: Efl.Event.Description; [[The description of the event to listen to]]
@cref desc: Efl.Event_Description; [[The description of the event to listen to]]
@in new_obj: Efl.Object; [[The object to emit events from]]
}
}
@ -318,6 +318,6 @@ struct Efl.Event {
This is the full event information passed to callbacks in C.
]]
object: Efl.Object; [[The object the callback was called on.]]
desc: const(ptr(Efl.Event.Description)); [[The event description.]]
desc: const(ptr(Efl.Event_Description)); [[The event description.]]
info: void_ptr; [[Extra event information passed by the event caller]]
}

2
src/lib/evas/canvas/efl_canvas_animation.eo
View File

@ -32,7 +32,7 @@ class Efl.Canvas.Animation (Efl.Object, Efl.Playable)
get {
}
values {
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.]]
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.]]
}
}
@property repeat_count {

2
src/lib/evas/canvas/efl_canvas_animation_player.eo
View File

@ -49,7 +49,7 @@ class Efl.Canvas.Animation_Player (Efl.Object, Efl.Player)
events {
/* FIXME: This event is similar to Efl.Canvas.Object.anim_started but with different type, might be confusing. */
started: void; [[Animation is started.]]
running: Efl.Canvas.Object.Animation_Event; [[Animation is running.]]
running: Efl.Canvas.Object_Animation_Event; [[Animation is running.]]
/* FIXME: This event is similar to Efl.Canvas.Object.anim_ended but with different type, might be confusing. */
ended: void; [[Animation is ended.]]
}

4
src/lib/evas/canvas/efl_canvas_animation_types.eot
View File

@ -1,9 +1,9 @@
// ----------------------------------------------------------------------------
// All the below types are for Efl Animation
struct Efl.Canvas.Animation.Player.Event_Running; [[Information of event running]]
struct Efl.Canvas.Animation_Player_Event_Running; [[Information of event running]]
enum Efl.Canvas.Animation.Repeat_Mode
enum Efl.Canvas.Animation_Repeat_Mode
{
[[Animation repeat mode]]

12
src/lib/evas/canvas/efl_canvas_object.eo
View File

@ -1,6 +1,6 @@
import efl_text_types;
struct Efl.Canvas.Object.Animation_Event; [[Information of animation events]]
struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]]
abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
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
The default paragraph direction is $inherit.
]]
values {
dir: Efl.Text.Bidirectional_Type; [[Paragraph direction for the given object.]]
dir: Efl.Text_Bidirectional_Type; [[Paragraph direction for the given object.]]
}
}
clipees_has @const {
@ -581,7 +581,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.S
get { legacy: null; }
set { legacy: null; }
keys {
@cref desc: Efl.Event.Description;
@cref desc: Efl.Event_Description;
[[The event description for which the given $animation is set.]]
}
values {
@ -624,8 +624,8 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.S
Efl.Canvas.Pointer.pointer_inside { get; }
}
events {
anim_started: Efl.Canvas.Object.Animation_Event; [[Animation is started.]]
anim_running: Efl.Canvas.Object.Animation_Event; [[Animation is running.]]
anim_ended: Efl.Canvas.Object.Animation_Event; [[Animation is ended.]]
anim_started: Efl.Canvas.Object_Animation_Event; [[Animation is started.]]
anim_running: Efl.Canvas.Object_Animation_Event; [[Animation is running.]]
anim_ended: Efl.Canvas.Object_Animation_Event; [[Animation is ended.]]
}
}

2
src/lib/evas/canvas/evas_canvas.eo
View File

@ -948,7 +948,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas.Scene, Efl.Animator, Efl.Input.Interfa
]]
get {}
keys {
type: Efl.Input.Device.Type; [[The class of the default device to fetch.]]
type: Efl.Input.Device_Type; [[The class of the default device to fetch.]]
}
values {
seat: Efl.Input.Device; [[The default device or $null on error.]]

2
src/lib/evas/canvas/evas_text.eo
View File

@ -186,7 +186,7 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text,
[[Retrieves the direction of the text currently being displayed in the
text object.]]
return: Efl.Text.Bidirectional_Type; [[Bidirectional type]]
return: Efl.Text_Bidirectional_Type; [[Bidirectional type]]
}
}
@property ascent {

4
src/lib/evas/gesture/efl_canvas_gesture.eo
View File

@ -10,7 +10,7 @@ abstract Efl.Canvas.Gesture(Efl.Object)
get {
}
values {
@cref type: Efl.Event.Description; [[gesture type]]
@cref type: Efl.Event_Description; [[gesture type]]
}
}
@property state {
@ -20,7 +20,7 @@ abstract Efl.Canvas.Gesture(Efl.Object)
set {
}
values {
state: Efl.Canvas.Gesture.State; [[gesture state]]
state: Efl.Canvas.Gesture_State; [[gesture state]]
}
}
@property hotspot {

2
src/lib/evas/gesture/efl_canvas_gesture_manager.eo
View File

@ -8,7 +8,7 @@ class Efl.Canvas.Gesture_Manager (Efl.Object)
params {
@in recognizer: Efl.Canvas.Gesture_Recognizer; [[The gesture recognizer object]]
}
return: ptr(const(Efl.Event.Description)); [[Returns the Efl.Event.Description type the recognizer supports]]
return: ptr(const(Efl.Event_Description)); [[Returns the Efl.Event_Description type the recognizer supports]]
}
recognizer_unregister {
[[This function is called to unregister a Efl.Canvas.Gesture_Recognizer]]

2
src/lib/evas/gesture/efl_canvas_gesture_recognizer.eo
View File

@ -23,7 +23,7 @@ abstract Efl.Canvas.Gesture_Recognizer (Efl.Object)
@in watched: Efl.Object; [[The watched object]]
@in event: Efl.Canvas.Gesture_Touch; [[The pointer event]]
}
return: Efl.Canvas.Gesture.Recognizer_Result; [[Returns the Efl.Canvas.Gesture event object]]
return: Efl.Canvas.Gesture_Recognizer_Result; [[Returns the Efl.Canvas.Gesture event object]]
}
/* FIXME: This function is not used? */
reset {

2
src/lib/evas/gesture/efl_canvas_gesture_touch.eo
View File

@ -48,7 +48,7 @@ class Efl.Canvas.Gesture_Touch(Efl.Object)
@property state {
[[This property holds the state of the touch event.]]
get {
return : Efl.Canvas.Gesture.Touch.State; [[touch event state]]
return : Efl.Canvas.Gesture_Touch_State; [[touch event state]]
}
}
/* FIXME: finger_list was broken by design - TODO */

6
src/lib/evas/gesture/efl_canvas_gesture_types.eot
View File

@ -1,4 +1,4 @@
enum Efl.Canvas.Gesture.Touch.State
enum Efl.Canvas.Gesture_Touch_State
{
[[ This enum type describes the state of a touch event. ]]
legacy: efl_gesture_touch;
@ -8,7 +8,7 @@ enum Efl.Canvas.Gesture.Touch.State
end, [[Last fingure touch up]]
}
enum Efl.Canvas.Gesture.State
enum Efl.Canvas.Gesture_State
{
[[ This enum type describes the state of a gesture. ]]
legacy: efl_gesture;
@ -19,7 +19,7 @@ enum Efl.Canvas.Gesture.State
canceled, [[A gesture was canceled.]]
}
enum Efl.Canvas.Gesture.Recognizer_Result
enum Efl.Canvas.Gesture_Recognizer_Result
{
[[ This enum type describes the state of a gesture recognizer. ]]
legacy: efl_gesture;