summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYeongjong Lee <yj34.lee@samsung.com>2019-10-17 13:57:22 -0300
committerLauro Moura <lauromoura@expertisesolutions.com.br>2019-10-17 14:24:01 -0300
commit711823cb1d7c91d8ec2e97b713e8493162edc03d (patch)
tree2cb8c6f452cfaf154df44bbbcdf668ea43cf2d13
parent484a48294279d99fc1305fd898b0359c9b2fed52 (diff)
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
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_registration.hh2
-rw-r--r--src/bin/eolian_mono/eolian/mono/klass.hh4
-rw-r--r--src/bindings/mono/eo_mono/EoWrapper.cs6
-rw-r--r--src/bindings/mono/eo_mono/iwrapper.cs6
-rw-r--r--src/bindings/mono/eo_mono/workaround.cs4
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 e258ce7..cdcb903 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
51 if(!as_generator( 51 if(!as_generator(
52 indent << "if (methods.FirstOrDefault(m => m.Name == \"" << string << "\") != null)\n" 52 indent << "if (methods.FirstOrDefault(m => m.Name == \"" << string << "\") != null)\n"
53 << indent << "{\n" 53 << indent << "{\n"
54 << indent << scope_tab << "descs.Add(new Efl_Op_Description() {" 54 << indent << scope_tab << "descs.Add(new EflOpDescription() {"
55#ifdef _WIN32 55#ifdef _WIN32
56 << "api_func = Marshal.StringToHGlobalAnsi(\"" << string << "\")" 56 << "api_func = Marshal.StringToHGlobalAnsi(\"" << string << "\")"
57#else 57#else
diff --git a/src/bin/eolian_mono/eolian/mono/klass.hh b/src/bin/eolian_mono/eolian/mono/klass.hh
index f330264..65645d3 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
424 if(!as_generator( 424 if(!as_generator(
425 indent << scope_tab << "/// <summary>Gets the list of Eo operations to override.</summary>\n" 425 indent << scope_tab << "/// <summary>Gets the list of Eo operations to override.</summary>\n"
426 << indent << scope_tab << "/// <returns>The list of Eo operations to be overload.</returns>\n" 426 << indent << scope_tab << "/// <returns>The list of Eo operations to be overload.</returns>\n"
427 << indent << scope_tab << "public override System.Collections.Generic.List<Efl_Op_Description> GetEoOps(System.Type type, bool includeInherited)\n" 427 << indent << scope_tab << "public override System.Collections.Generic.List<EflOpDescription> GetEoOps(System.Type type, bool includeInherited)\n"
428 << indent << scope_tab << "{\n" 428 << indent << scope_tab << "{\n"
429 << indent << scope_tab << scope_tab << "var descs = new System.Collections.Generic.List<Efl_Op_Description>();\n" 429 << indent << scope_tab << scope_tab << "var descs = new System.Collections.Generic.List<EflOpDescription>();\n"
430 ) 430 )
431 .generate(sink, attributes::unused, inative_cxt)) 431 .generate(sink, attributes::unused, inative_cxt))
432 return false; 432 return false;
diff --git a/src/bindings/mono/eo_mono/EoWrapper.cs b/src/bindings/mono/eo_mono/EoWrapper.cs
index eae4eea..2f21778 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
363 363
364 /// <summary>Gets the list of Eo operations to override.</summary> 364 /// <summary>Gets the list of Eo operations to override.</summary>
365 /// <returns>The list of Eo operations to be overload.</returns> 365 /// <returns>The list of Eo operations to be overload.</returns>
366 public override System.Collections.Generic.List<Efl_Op_Description> GetEoOps(Type type, bool includeInherited) 366 public override System.Collections.Generic.List<EflOpDescription> GetEoOps(Type type, bool includeInherited)
367 { 367 {
368 var descs = new System.Collections.Generic.List<Efl_Op_Description>(); 368 var descs = new System.Collections.Generic.List<EflOpDescription>();
369 369
370 descs.Add(new Efl_Op_Description() 370 descs.Add(new EflOpDescription()
371 { 371 {
372 api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(EoModule.Module, "efl_constructor"), 372 api_func = Efl.Eo.FunctionInterop.LoadFunctionPointer(EoModule.Module, "efl_constructor"),
373 func = Marshal.GetFunctionPointerForDelegate(csharpEflConstructorStaticDelegate) 373 func = Marshal.GetFunctionPointerForDelegate(csharpEflConstructorStaticDelegate)
diff --git a/src/bindings/mono/eo_mono/iwrapper.cs b/src/bindings/mono/eo_mono/iwrapper.cs
index cc9e47e..d1aa7be 100644
--- a/src/bindings/mono/eo_mono/iwrapper.cs
+++ b/src/bindings/mono/eo_mono/iwrapper.cs
@@ -409,7 +409,7 @@ public class Globals
409 ptr = IntPtr.Add(ptr, Marshal.SizeOf(descs[0])); 409 ptr = IntPtr.Add(ptr, Marshal.SizeOf(descs[0]));
410 } 410 }
411 411
412 Efl_Object_Ops ops; 412 EflObjectOps ops;
413 ops.descs = descs_ptr; 413 ops.descs = descs_ptr;
414 ops.count = (UIntPtr)count; 414 ops.count = (UIntPtr)count;
415 IntPtr ops_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(ops)); 415 IntPtr ops_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(ops));
@@ -777,7 +777,7 @@ public static class Config
777public abstract class NativeClass : System.Attribute 777public abstract class NativeClass : System.Attribute
778{ 778{
779 public abstract IntPtr GetEflClass(); 779 public abstract IntPtr GetEflClass();
780 public abstract System.Collections.Generic.List<Efl_Op_Description> GetEoOps(System.Type type, bool includeInherited); 780 public abstract System.Collections.Generic.List<EflOpDescription> GetEoOps(System.Type type, bool includeInherited);
781} 781}
782 782
783/// <summary>Attribute for private native classes. 783/// <summary>Attribute for private native classes.
@@ -790,7 +790,7 @@ public class PrivateNativeClass : NativeClass
790 return IntPtr.Zero; 790 return IntPtr.Zero;
791 } 791 }
792 792
793 public override System.Collections.Generic.List<Efl_Op_Description> GetEoOps(System.Type type, bool includeInherited) 793 public override System.Collections.Generic.List<EflOpDescription> GetEoOps(System.Type type, bool includeInherited)
794 { 794 {
795 return null; 795 return null;
796 } 796 }
diff --git a/src/bindings/mono/eo_mono/workaround.cs b/src/bindings/mono/eo_mono/workaround.cs
index 8422062..30759d1 100644
--- a/src/bindings/mono/eo_mono/workaround.cs
+++ b/src/bindings/mono/eo_mono/workaround.cs
@@ -26,7 +26,7 @@ public struct ClassDescription
26 26
27///<summary>Description of an Eo API operation.</summary> 27///<summary>Description of an Eo API operation.</summary>
28[StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)] 28[StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)]
29public struct Efl_Op_Description 29public struct EflOpDescription
30{ 30{
31 ///<summary>The EAPI function offering this op. (String with the name of the function on Windows)</summary> 31 ///<summary>The EAPI function offering this op. (String with the name of the function on Windows)</summary>
32 public IntPtr api_func; 32 public IntPtr api_func;
@@ -36,7 +36,7 @@ public struct Efl_Op_Description
36 36
37///<summary>List of operations on a given Object.</summary> 37///<summary>List of operations on a given Object.</summary>
38[StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)] 38[StructLayout(LayoutKind.Sequential, CharSet=CharSet.Ansi)]
39public struct Efl_Object_Ops 39public struct EflObjectOps
40{ 40{
41 ///<summary>The op descriptions array of size count.</summary> 41 ///<summary>The op descriptions array of size count.</summary>
42 public IntPtr descs; 42 public IntPtr descs;