From 278376df908bf1d49e3462df0d88063ff8867023 Mon Sep 17 00:00:00 2001 From: Yeongjong Lee Date: Mon, 6 Jan 2020 19:08:44 +0900 Subject: [PATCH] csharp: rename ExtensionMethods Summary: This patch will rename `ExtensionMethods` to `Extensions` that is commonly used in csharp project. Depends on D10972 Test Plan: meson build -Dbindings=mono,cxx -Dmono-beta=true Reviewers: lauromoura, Jaehyun_Cho, felipealmeida Reviewed By: Jaehyun_Cho, felipealmeida Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10913 --- src/bin/eolian_mono/eolian/mono/klass.hh | 2 +- src/bindings/mono/eina_mono/eina_slice.cs | 5 ++++- src/tests/efl_mono/Eina.cs | 1 + src/tests/efl_mono/EinaTestData.cs | 1 + src/tests/efl_mono/StructHelpers.cs | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/bin/eolian_mono/eolian/mono/klass.hh b/src/bin/eolian_mono/eolian/mono/klass.hh index 6c6fd906cd..3a93a2b72b 100644 --- a/src/bin/eolian_mono/eolian/mono/klass.hh +++ b/src/bin/eolian_mono/eolian/mono/klass.hh @@ -404,7 +404,7 @@ struct klass (lit("#if EFL_BETA\n") << "#pragma warning disable CS1591\n" // Disabling warnings as DocFx will hide these classes << "public static class " << name_helpers::klass_concrete_name(cls) - << "ExtensionMethods {\n" + << "Extensions {\n" << extension_method_stream.str() << "}\n" << "#pragma warning restore CS1591\n" diff --git a/src/bindings/mono/eina_mono/eina_slice.cs b/src/bindings/mono/eina_mono/eina_slice.cs index 912ddea3bd..0b9311e48c 100644 --- a/src/bindings/mono/eina_mono/eina_slice.cs +++ b/src/bindings/mono/eina_mono/eina_slice.cs @@ -232,7 +232,9 @@ public struct RwSlice : ISliceBase, IEquatable } -public static class Eina_SliceUtils +namespace Eina +{ +public static class SliceExtensions { public static byte[] GetBytes(this Eina.ISliceBase slc) { @@ -243,3 +245,4 @@ public static class Eina_SliceUtils return mArray; } } +} diff --git a/src/tests/efl_mono/Eina.cs b/src/tests/efl_mono/Eina.cs index 91e93986ff..bee62169bb 100644 --- a/src/tests/efl_mono/Eina.cs +++ b/src/tests/efl_mono/Eina.cs @@ -19,6 +19,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; +using Eina; using EinaTestData; using static EinaTestData.BaseData; diff --git a/src/tests/efl_mono/EinaTestData.cs b/src/tests/efl_mono/EinaTestData.cs index 9727548f93..411e38d576 100644 --- a/src/tests/efl_mono/EinaTestData.cs +++ b/src/tests/efl_mono/EinaTestData.cs @@ -18,6 +18,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; using System.Diagnostics.Contracts; +using Eina; namespace EinaTestData { diff --git a/src/tests/efl_mono/StructHelpers.cs b/src/tests/efl_mono/StructHelpers.cs index 781dbc16f1..9c9f75076e 100644 --- a/src/tests/efl_mono/StructHelpers.cs +++ b/src/tests/efl_mono/StructHelpers.cs @@ -17,6 +17,7 @@ using System; using System.Linq; using System.Runtime.InteropServices; +using Eina; using static EinaTestData.BaseData; namespace TestSuite