From 11a00e406c3e988fe34aec3eca61d450709d0734 Mon Sep 17 00:00:00 2001 From: Yeongjong Lee Date: Thu, 24 Oct 2019 17:18:44 +0200 Subject: [PATCH] mono: merge namespaces in manual bindings Summary: It will enhance readability. Before ``` namespace Efl { namespace Eo { ``` After ``` namespace Efl.Eo { ``` Test Plan: meson setup -Dbindings=mono,cxx -Dmono-beta=true Reviewers: lauromoura, Jaehyun_Cho, segfaultxavi Reviewed By: segfaultxavi Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10466 --- src/bindings/mono/efl_mono/ItemFactory.cs | 5 +++-- src/bindings/mono/efl_mono/efl_csharp_application.cs | 7 +------ src/bindings/mono/eo_mono/FunctionWrapper.cs | 7 +------ src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs | 7 +------ src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs | 7 +------ src/bindings/mono/eo_mono/NativeModule.cs | 7 +------ src/bindings/mono/eo_mono/NativeModule_Unix.cs | 7 +------ src/bindings/mono/eo_mono/NativeModule_Windows.cs | 7 +------ src/bindings/mono/eo_mono/WrapperSupervisor.cs | 7 +------ 9 files changed, 11 insertions(+), 50 deletions(-) diff --git a/src/bindings/mono/efl_mono/ItemFactory.cs b/src/bindings/mono/efl_mono/ItemFactory.cs index be429fd12a..34791e1213 100644 --- a/src/bindings/mono/efl_mono/ItemFactory.cs +++ b/src/bindings/mono/efl_mono/ItemFactory.cs @@ -6,7 +6,8 @@ using System.Collections.Generic; using System.Linq; using System.ComponentModel; -namespace Efl { namespace Ui { +namespace Efl.Ui +{ /// Helper factory class. Makes use of C# extension methods for easier property binding. /// @@ -26,6 +27,6 @@ public class ItemFactory : Efl.Ui.LayoutFactory, IDisposable } } -} } +} #endif diff --git a/src/bindings/mono/efl_mono/efl_csharp_application.cs b/src/bindings/mono/efl_mono/efl_csharp_application.cs index 1b1efc2568..bab17c5d7d 100644 --- a/src/bindings/mono/efl_mono/efl_csharp_application.cs +++ b/src/bindings/mono/efl_mono/efl_csharp_application.cs @@ -18,10 +18,7 @@ using System.Runtime.InteropServices; using System.Threading; using static Efl.UnsafeNativeMethods; -namespace Efl -{ - -namespace Csharp +namespace Efl.Csharp { /// The components to be initialized. @@ -204,5 +201,3 @@ public abstract class Application } } - -} diff --git a/src/bindings/mono/eo_mono/FunctionWrapper.cs b/src/bindings/mono/eo_mono/FunctionWrapper.cs index 2f84a9a695..a0c8bd8a08 100644 --- a/src/bindings/mono/eo_mono/FunctionWrapper.cs +++ b/src/bindings/mono/eo_mono/FunctionWrapper.cs @@ -16,10 +16,7 @@ using System; using System.Runtime.InteropServices; -namespace Efl -{ - -namespace Eo +namespace Efl.Eo { ///Class to load functions pointers from a native module. @@ -170,5 +167,3 @@ public class FunctionLoadResult } } - -} diff --git a/src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs b/src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs index dbafd6d8e3..09d8d3e0b9 100644 --- a/src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs +++ b/src/bindings/mono/eo_mono/FunctionWrapper_Unix.cs @@ -16,10 +16,7 @@ using System; using System.Runtime.InteropServices; -namespace Efl -{ - -namespace Eo +namespace Efl.Eo { public static partial class FunctionInterop @@ -41,5 +38,3 @@ public static partial class FunctionInterop } } - -} diff --git a/src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs b/src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs index d999afd9c0..34d69bd268 100644 --- a/src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs +++ b/src/bindings/mono/eo_mono/FunctionWrapper_Windows.cs @@ -16,10 +16,7 @@ using System; using System.Runtime.InteropServices; -namespace Efl -{ - -namespace Eo +namespace Efl.Eo { public static partial class FunctionInterop @@ -32,5 +29,3 @@ public static partial class FunctionInterop } } - -} diff --git a/src/bindings/mono/eo_mono/NativeModule.cs b/src/bindings/mono/eo_mono/NativeModule.cs index 7b61233f66..fd3b315561 100644 --- a/src/bindings/mono/eo_mono/NativeModule.cs +++ b/src/bindings/mono/eo_mono/NativeModule.cs @@ -15,10 +15,7 @@ */ using System; -namespace Efl -{ - -namespace Eo +namespace Efl.Eo { ///Wraps a native module that was opened with dlopen/LoadLibrary. @@ -55,5 +52,3 @@ public partial class NativeModule : IDisposable } } - -} diff --git a/src/bindings/mono/eo_mono/NativeModule_Unix.cs b/src/bindings/mono/eo_mono/NativeModule_Unix.cs index cf21fec69a..1e5a517368 100644 --- a/src/bindings/mono/eo_mono/NativeModule_Unix.cs +++ b/src/bindings/mono/eo_mono/NativeModule_Unix.cs @@ -16,10 +16,7 @@ using System; using System.Runtime.InteropServices; -namespace Efl -{ - -namespace Eo +namespace Efl.Eo { public partial class NativeModule @@ -85,5 +82,3 @@ public partial class NativeModule } } - -} diff --git a/src/bindings/mono/eo_mono/NativeModule_Windows.cs b/src/bindings/mono/eo_mono/NativeModule_Windows.cs index ec0b8e68ad..bbd3c7f49e 100644 --- a/src/bindings/mono/eo_mono/NativeModule_Windows.cs +++ b/src/bindings/mono/eo_mono/NativeModule_Windows.cs @@ -16,10 +16,7 @@ using System; using System.Runtime.InteropServices; -namespace Efl -{ - -namespace Eo +namespace Efl.Eo { public class partial NativeModule @@ -29,5 +26,3 @@ public class partial NativeModule } } - -} diff --git a/src/bindings/mono/eo_mono/WrapperSupervisor.cs b/src/bindings/mono/eo_mono/WrapperSupervisor.cs index c51fff9793..d50cd76a66 100644 --- a/src/bindings/mono/eo_mono/WrapperSupervisor.cs +++ b/src/bindings/mono/eo_mono/WrapperSupervisor.cs @@ -16,10 +16,7 @@ using System; using EventDictionary = System.Collections.Generic.Dictionary<(System.IntPtr desc, object evtDelegate), (System.IntPtr evtCallerPtr, Efl.EventCb evtCaller)>; -namespace Efl -{ - -namespace Eo +namespace Efl.Eo { /// Observe the ownership state of an Eo wrapper and control its life-cycle. @@ -75,5 +72,3 @@ public class WrapperSupervisor } -} -