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
This commit is contained in:
Yeongjong Lee 2019-10-17 13:57:22 -03:00 committed by Lauro Moura
parent 484a482942
commit 711823cb1d
5 changed files with 11 additions and 11 deletions

View File

@ -51,7 +51,7 @@ struct function_registration_generator
if(!as_generator( if(!as_generator(
indent << "if (methods.FirstOrDefault(m => m.Name == \"" << string << "\") != null)\n" indent << "if (methods.FirstOrDefault(m => m.Name == \"" << string << "\") != null)\n"
<< indent << "{\n" << indent << "{\n"
<< indent << scope_tab << "descs.Add(new Efl_Op_Description() {" << indent << scope_tab << "descs.Add(new EflOpDescription() {"
#ifdef _WIN32 #ifdef _WIN32
<< "api_func = Marshal.StringToHGlobalAnsi(\"" << string << "\")" << "api_func = Marshal.StringToHGlobalAnsi(\"" << string << "\")"
#else #else

View File

@ -424,9 +424,9 @@ struct klass
if(!as_generator( if(!as_generator(
indent << scope_tab << "/// <summary>Gets the list of Eo operations to override.</summary>\n" 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 << "/// <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 << "{\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)) .generate(sink, attributes::unused, inative_cxt))
return false; return false;

View File

@ -363,11 +363,11 @@ public abstract class EoWrapper : IWrapper, IDisposable
/// <summary>Gets the list of Eo operations to override.</summary> /// <summary>Gets the list of Eo operations to override.</summary>
/// <returns>The list of Eo operations to be overload.</returns> /// <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"), api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(EoModule.Module, "efl_constructor"),
func = Marshal.GetFunctionPointerForDelegate(csharpEflConstructorStaticDelegate) func = Marshal.GetFunctionPointerForDelegate(csharpEflConstructorStaticDelegate)

View File

@ -409,7 +409,7 @@ public class Globals
ptr = IntPtr.Add(ptr, Marshal.SizeOf(descs[0])); ptr = IntPtr.Add(ptr, Marshal.SizeOf(descs[0]));
} }
Efl_Object_Ops ops; EflObjectOps ops;
ops.descs = descs_ptr; ops.descs = descs_ptr;
ops.count = (UIntPtr)count; ops.count = (UIntPtr)count;
IntPtr ops_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(ops)); IntPtr ops_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(ops));
@ -777,7 +777,7 @@ public static class Config
public abstract class NativeClass : System.Attribute public abstract class NativeClass : System.Attribute
{ {
public abstract IntPtr GetEflClass(); 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. /// <summary>Attribute for private native classes.
@ -790,7 +790,7 @@ public class PrivateNativeClass : NativeClass
return IntPtr.Zero; 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; return null;
} }

View File

@ -26,7 +26,7 @@ public struct ClassDescription
///<summary>Description of an Eo API operation.</summary> ///<summary>Description of an Eo API operation.</summary>
[StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)] [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> ///<summary>The EAPI function offering this op. (String with the name of the function on Windows)</summary>
public IntPtr api_func; public IntPtr api_func;
@ -36,7 +36,7 @@ public struct Efl_Op_Description
///<summary>List of operations on a given Object.</summary> ///<summary>List of operations on a given Object.</summary>
[StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)] [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)]
public struct Efl_Object_Ops public struct EflObjectOps
{ {
///<summary>The op descriptions array of size count.</summary> ///<summary>The op descriptions array of size count.</summary>
public IntPtr descs; public IntPtr descs;