lauromoura pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=711823cb1d7c91d8ec2e97b713e8493162edc03d
commit 711823cb1d7c91d8ec2e97b713e8493162edc03d Author: Yeongjong Lee <[email protected]> Date: Thu Oct 17 13:57:22 2019 -0300 mono: remove underscores of Efl_Op_Description, Efl_Object_Ops Summary: C# does not use underscore in type name. ref T8333 Test Plan: meson setup -Dbindings=mono,cxx -Dmono-beta=true Reviewers: lauromoura, Jaehyun_Cho Reviewed By: Jaehyun_Cho Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T8333 Differential Revision: https://phab.enlightenment.org/D10422 --- src/bin/eolian_mono/eolian/mono/function_registration.hh | 2 +- src/bin/eolian_mono/eolian/mono/klass.hh | 4 ++-- src/bindings/mono/eo_mono/EoWrapper.cs | 6 +++--- src/bindings/mono/eo_mono/iwrapper.cs | 6 +++--- src/bindings/mono/eo_mono/workaround.cs | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/bin/eolian_mono/eolian/mono/function_registration.hh b/src/bin/eolian_mono/eolian/mono/function_registration.hh index e258ce7cff..cdcb9032c0 100644 --- a/src/bin/eolian_mono/eolian/mono/function_registration.hh +++ b/src/bin/eolian_mono/eolian/mono/function_registration.hh @@ -51,7 +51,7 @@ struct function_registration_generator if(!as_generator( indent << "if (methods.FirstOrDefault(m => m.Name == \"" << string << "\") != null)\n" << indent << "{\n" - << indent << scope_tab << "descs.Add(new Efl_Op_Description() {" + << indent << scope_tab << "descs.Add(new EflOpDescription() {" #ifdef _WIN32 << "api_func = Marshal.StringToHGlobalAnsi(\"" << string << "\")" #else diff --git a/src/bin/eolian_mono/eolian/mono/klass.hh b/src/bin/eolian_mono/eolian/mono/klass.hh index f33026444f..65645d33c2 100644 --- a/src/bin/eolian_mono/eolian/mono/klass.hh +++ b/src/bin/eolian_mono/eolian/mono/klass.hh @@ -424,9 +424,9 @@ struct klass if(!as_generator( indent << scope_tab << "/// <summary>Gets the list of Eo operations to override.</summary>\n" << indent << scope_tab << "/// <returns>The list of Eo operations to be overload.</returns>\n" - << indent << scope_tab << "public override System.Collections.Generic.List<Efl_Op_Description> GetEoOps(System.Type type, bool includeInherited)\n" + << indent << scope_tab << "public override System.Collections.Generic.List<EflOpDescription> GetEoOps(System.Type type, bool includeInherited)\n" << indent << scope_tab << "{\n" - << indent << scope_tab << scope_tab << "var descs = new System.Collections.Generic.List<Efl_Op_Description>();\n" + << indent << scope_tab << scope_tab << "var descs = new System.Collections.Generic.List<EflOpDescription>();\n" ) .generate(sink, attributes::unused, inative_cxt)) return false; diff --git a/src/bindings/mono/eo_mono/EoWrapper.cs b/src/bindings/mono/eo_mono/EoWrapper.cs index eae4eea3b5..2f217783e5 100644 --- a/src/bindings/mono/eo_mono/EoWrapper.cs +++ b/src/bindings/mono/eo_mono/EoWrapper.cs @@ -363,11 +363,11 @@ public abstract class EoWrapper : IWrapper, IDisposable /// <summary>Gets the list of Eo operations to override.</summary> /// <returns>The list of Eo operations to be overload.</returns> - public override System.Collections.Generic.List<Efl_Op_Description> GetEoOps(Type type, bool includeInherited) + public override System.Collections.Generic.List<EflOpDescription> GetEoOps(Type type, bool includeInherited) { - var descs = new System.Collections.Generic.List<Efl_Op_Description>(); + var descs = new System.Collections.Generic.List<EflOpDescription>(); - descs.Add(new Efl_Op_Description() + descs.Add(new EflOpDescription() { api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(EoModule.Module, "efl_constructor"), func = Marshal.GetFunctionPointerForDelegate(csharpEflConstructorStaticDelegate) diff --git a/src/bindings/mono/eo_mono/iwrapper.cs b/src/bindings/mono/eo_mono/iwrapper.cs index cc9e47ed10..d1aa7be3f5 100644 --- a/src/bindings/mono/eo_mono/iwrapper.cs +++ b/src/bindings/mono/eo_mono/iwrapper.cs @@ -409,7 +409,7 @@ public class Globals ptr = IntPtr.Add(ptr, Marshal.SizeOf(descs[0])); } - Efl_Object_Ops ops; + EflObjectOps ops; ops.descs = descs_ptr; ops.count = (UIntPtr)count; IntPtr ops_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(ops)); @@ -777,7 +777,7 @@ public static class Config public abstract class NativeClass : System.Attribute { public abstract IntPtr GetEflClass(); - public abstract System.Collections.Generic.List<Efl_Op_Description> GetEoOps(System.Type type, bool includeInherited); + public abstract System.Collections.Generic.List<EflOpDescription> GetEoOps(System.Type type, bool includeInherited); } /// <summary>Attribute for private native classes. @@ -790,7 +790,7 @@ public class PrivateNativeClass : NativeClass return IntPtr.Zero; } - public override System.Collections.Generic.List<Efl_Op_Description> GetEoOps(System.Type type, bool includeInherited) + public override System.Collections.Generic.List<EflOpDescription> GetEoOps(System.Type type, bool includeInherited) { return null; } diff --git a/src/bindings/mono/eo_mono/workaround.cs b/src/bindings/mono/eo_mono/workaround.cs index 8422062844..30759d10e0 100644 --- a/src/bindings/mono/eo_mono/workaround.cs +++ b/src/bindings/mono/eo_mono/workaround.cs @@ -26,7 +26,7 @@ public struct ClassDescription ///<summary>Description of an Eo API operation.</summary> [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)] -public struct Efl_Op_Description +public struct EflOpDescription { ///<summary>The EAPI function offering this op. (String with the name of the function on Windows)</summary> public IntPtr api_func; @@ -36,7 +36,7 @@ public struct Efl_Op_Description ///<summary>List of operations on a given Object.</summary> [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)] -public struct Efl_Object_Ops +public struct EflObjectOps { ///<summary>The op descriptions array of size count.</summary> public IntPtr descs; --
