[EGIT] [core/efl] master 01/01: csharp: Components enum are flags now.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=53af539f2781deb08f4d8e5bc983e743e92abb36
commit 53af539f2781deb08f4d8e5bc983e743e92abb36
Author: Bruno da Silva Belo
Date: Wed Nov 20 19:07:21 2019 -0300
csharp: Components enum are flags now.
Reviewers: lauromoura, felipealmeida, YOhoho
Reviewed By: lauromoura
Subscribers: segfaultxavi, cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8411
Differential Revision: https://phab.enlightenment.org/D10541
---
src/bindings/mono/efl_mono/efl_all.cs | 63 ++-
.../mono/efl_mono/efl_csharp_application.cs| 93 +++---
2 files changed, 107 insertions(+), 49 deletions(-)
diff --git a/src/bindings/mono/efl_mono/efl_all.cs
b/src/bindings/mono/efl_mono/efl_all.cs
index 66c7de2fb5..c49ec4dfd4 100644
--- a/src/bindings/mono/efl_mono/efl_all.cs
+++ b/src/bindings/mono/efl_mono/efl_all.cs
@@ -59,7 +59,7 @@ static class UnsafeNativeMethods
///
public static class All
{
-private static bool InitializedUi = false;
+private static Efl.Csharp.Components initComponents =
Efl.Csharp.Components.Basic;
///
/// If the main loop was initialized.
@@ -79,17 +79,28 @@ public static class All
/// The that
initialize the Efl.
public static void Init(Efl.Csharp.Components components =
Efl.Csharp.Components.Basic)
{
-Eina.Config.Init();
-Efl.Eo.Config.Init();
-ecore_init();
-ecore_init_ex(0, IntPtr.Zero);
-evas_init();
-eldbus.Config.Init();
-
-if (components == Efl.Csharp.Components.Ui)
+if (components == Efl.Csharp.Components.None)
+{
+return;
+}
+
+initComponents = components;
+
+if ((initComponents & Efl.Csharp.Components.Basic)
+== Efl.Csharp.Components.Basic)
+{
+Eina.Config.Init();
+Efl.Eo.Config.Init();
+ecore_init();
+ecore_init_ex(0, IntPtr.Zero);
+evas_init();
+eldbus.Config.Init();
+}
+
+if ((initComponents & Efl.Csharp.Components.Ui)
+== Efl.Csharp.Components.Ui)
{
Efl.Ui.Config.Init();
-InitializedUi = true;
}
Monitor.Enter(InitLock);
MainLoopInitialized = true;
@@ -114,22 +125,32 @@ public static class All
MainLoopInitialized = false;
Monitor.Exit(InitLock);
-if (InitializedUi)
+if (initComponents == Efl.Csharp.Components.None)
+{
+return;
+}
+
+if ((initComponents & Efl.Csharp.Components.Ui)
+== Efl.Csharp.Components.Ui)
{
Eina.Log.Debug("Shutting down Elementary");
Efl.Ui.Config.Shutdown();
}
-Eina.Log.Debug("Shutting down Eldbus");
-eldbus.Config.Shutdown();
-Eina.Log.Debug("Shutting down Evas");
-evas_shutdown();
-Eina.Log.Debug("Shutting down Ecore");
-ecore_shutdown();
-Eina.Log.Debug("Shutting down Eo");
-Efl.Eo.Config.Shutdown();
-Eina.Log.Debug("Shutting down Eina");
-Eina.Config.Shutdown();
+if ((initComponents & Efl.Csharp.Components.Basic)
+== Efl.Csharp.Components.Basic)
+{
+Eina.Log.Debug("Shutting down Eldbus");
+eldbus.Config.Shutdown();
+Eina.Log.Debug("Shutting down Evas");
+evas_shutdown();
+Eina.Log.Debug("Shutting down Ecore");
+ecore_shutdown();
+Eina.Log.Debug("Shutting down Eo");
+Efl.Eo.Config.Shutdown();
+Eina.Log.Debug("Shutting down Eina");
+Eina.Config.Shutdown();
+}
}
}
diff --git a/src/bindings/mono/efl_mono/efl_csharp_application.cs
b/src/bindings/mono/efl_mono/efl_csharp_application.cs
index 4a936338cd..63d9aacae8 100644
--- a/src/bindings/mono/efl_mono/efl_csharp_application.cs
+++ b/src/bindings/mono/efl_mono/efl_csharp_application.cs
@@ -16,6 +16,9 @@
using System;
using System.Runtime.InteropServices;
using System.Threading;
+using System.Diagnostics.CodeAnalysis;
+using System.Collections.Generic;
+
using static Efl.UnsafeNativeMethods;
namespace Efl.Csharp
@@ -24,17 +27,32 @@ namespace Efl.Csharp
/// The components to be initialized.
/// Since EFL 1.23.
///
-public enum Components
+[Flags]
+public enum Components : Int32
{
+// Base flags.
+///
+/// Initialize nothing.
+/// Since EFL 1.24.
+///
+None = 0x0,
///Basic components: Eina, Eo, Ecore, Evas and DBus.
-/// Since EFL 1.23.
+/// Since EFL 1.24.
///
-Basic,
-///The same components of
-/// and the Elementary widget
[EGIT] [core/efl] master 01/01: csharp: Hiding p-invokes.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4b13be6d15e24c64c5350bd10ec41c0ad0f1119b
commit 4b13be6d15e24c64c5350bd10ec41c0ad0f1119b
Author: Bruno da Silva Belo
Date: Wed Nov 20 18:37:48 2019 -0300
csharp: Hiding p-invokes.
Summary: ref T8406
Reviewers: lauromoura, felipealmeida, YOhoho
Reviewed By: YOhoho
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8406
Differential Revision: https://phab.enlightenment.org/D10651
---
src/bindings/mono/eldbus_mono/eldbus_connection.cs | 2 +-
src/bindings/mono/eldbus_mono/eldbus_message.cs| 2 +-
src/bindings/mono/eldbus_mono/eldbus_object.cs | 2 +-
src/bindings/mono/eldbus_mono/eldbus_pending.cs| 2 +-
src/bindings/mono/eldbus_mono/eldbus_proxy.cs | 2 +-
src/bindings/mono/eldbus_mono/eldbus_service.cs| 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/bindings/mono/eldbus_mono/eldbus_connection.cs
b/src/bindings/mono/eldbus_mono/eldbus_connection.cs
index 955bd0a80e..c2120600d3 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_connection.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_connection.cs
@@ -25,7 +25,7 @@ namespace eldbus
{
[EditorBrowsable(EditorBrowsableState.Never)]
-public static class EldbusConnectionNativeFunctions
+internal static class EldbusConnectionNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern IntPtr
eldbus_connection_get(eldbus.Connection.Type type);
diff --git a/src/bindings/mono/eldbus_mono/eldbus_message.cs
b/src/bindings/mono/eldbus_mono/eldbus_message.cs
index 9a83666f38..71baf6d83f 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_message.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_message.cs
@@ -25,7 +25,7 @@ namespace eldbus
{
[EditorBrowsable(EditorBrowsableState.Never)]
-public static class EldbusMessageNativeFunctions
+internal static class EldbusMessageNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern IntPtr
eldbus_message_ref(IntPtr msg);
diff --git a/src/bindings/mono/eldbus_mono/eldbus_object.cs
b/src/bindings/mono/eldbus_mono/eldbus_object.cs
index 9c3a509551..329bd34a54 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_object.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_object.cs
@@ -27,7 +27,7 @@ namespace eldbus
{
[EditorBrowsable(EditorBrowsableState.Never)]
-public static class EldbusObjectNativeFunctions
+internal static class EldbusObjectNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern IntPtr
eldbus_object_get(IntPtr conn, string bus, string path);
diff --git a/src/bindings/mono/eldbus_mono/eldbus_pending.cs
b/src/bindings/mono/eldbus_mono/eldbus_pending.cs
index f26d5f1ed5..246b888646 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_pending.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_pending.cs
@@ -25,7 +25,7 @@ namespace eldbus
{
[EditorBrowsable(EditorBrowsableState.Never)]
-public static class EldbusPendingNativeFunctions
+internal static class EldbusPendingNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern void
eldbus_pending_data_set(IntPtr pending, string key, IntPtr data);
diff --git a/src/bindings/mono/eldbus_mono/eldbus_proxy.cs
b/src/bindings/mono/eldbus_mono/eldbus_proxy.cs
index 8fd5921b8b..7fc48d3095 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_proxy.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_proxy.cs
@@ -25,7 +25,7 @@ namespace eldbus
{
[EditorBrowsable(EditorBrowsableState.Never)]
-public static class EldbusProxyNativeFunctions
+internal static class EldbusProxyNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern IntPtr
eldbus_proxy_get(IntPtr obj, string _interface);
diff --git a/src/bindings/mono/eldbus_mono/eldbus_service.cs
b/src/bindings/mono/eldbus_mono/eldbus_service.cs
index e022886476..048f96d8d0 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_service.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_service.cs
@@ -25,7 +25,7 @@ namespace eldbus
{
[EditorBrowsable(EditorBrowsableState.Never)]
-public static class EldbusServiceNativeFunctions
+internal static class EldbusServiceNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern IntPtr
eldbus_service_interface_register(IntPtr conn, string path, IntPtr
desc);
--
[EGIT] [core/efl] master 01/01: csharp: Specifying StringComparison.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6772a78d0238ee5fbc04126e9de26c4201e3ef57
commit 6772a78d0238ee5fbc04126e9de26c4201e3ef57
Author: Bruno da Silva Belo
Date: Wed Nov 20 16:57:14 2019 -0300
csharp: Specifying StringComparison.
Summary: ref T8405
Reviewers: lauromoura, felipealmeida, YOhoho, segfaultxavi
Reviewed By: lauromoura
Subscribers: segfaultxavi, cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8405
Differential Revision: https://phab.enlightenment.org/D10650
---
src/bin/eolian_mono/eolian/mono/struct_definition.hh | 2 ++
src/bindings/mono/eina_mono/eina_error.cs| 2 +-
src/bindings/mono/eina_mono/eina_stringshare.cs | 2 +-
src/bindings/mono/eldbus_mono/eldbus_common.cs | 4 ++--
src/bindings/mono/eo_mono/iwrapper.cs| 11 ++-
src/bindings/mono/eo_mono/workaround.cs | 2 +-
src/tests/efl_mono/Main.cs | 6 +++---
7 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/struct_definition.hh
b/src/bin/eolian_mono/eolian/mono/struct_definition.hh
index 7c0bc9e4e1..973eb27149 100644
--- a/src/bin/eolian_mono/eolian/mono/struct_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/struct_definition.hh
@@ -485,6 +485,7 @@ struct struct_definition_generator
indent << scope_tab << "/// Get a hash code for this
item.\n"
<< since_line
<< indent << scope_tab << "/// \n"
+ << "#pragma warning disable CA1307\n"
<< indent << scope_tab << "public override int GetHashCode()\n"
<< indent << scope_tab << "{\n"
).generate(sink, attributes::unused, context))
@@ -515,6 +516,7 @@ struct struct_definition_generator
if (!as_generator(
indent << scope_tab << "}\n"
+ << "#pragma warning restore CA1307\n\n"
).generate(sink, attributes::unused, context))
return false;
diff --git a/src/bindings/mono/eina_mono/eina_error.cs
b/src/bindings/mono/eina_mono/eina_error.cs
index 6774545603..44528cc691 100644
--- a/src/bindings/mono/eina_mono/eina_error.cs
+++ b/src/bindings/mono/eina_mono/eina_error.cs
@@ -201,7 +201,7 @@ public struct Error : IComparable, IEquatable
///
/// A hash code.
public override int GetHashCode()
-=> code.GetHashCode() + Message.GetHashCode();
+=> code.GetHashCode() + Message.GetHashCode(StringComparison.Ordinal);
///
/// Compare to a given error.
diff --git a/src/bindings/mono/eina_mono/eina_stringshare.cs
b/src/bindings/mono/eina_mono/eina_stringshare.cs
index a6ca53a02c..cfef948dc4 100644
--- a/src/bindings/mono/eina_mono/eina_stringshare.cs
+++ b/src/bindings/mono/eina_mono/eina_stringshare.cs
@@ -198,7 +198,7 @@ public class Stringshare : IEquatable,
IEquatable
///
public override int GetHashCode()
{
-return Str.GetHashCode();
+return Str.GetHashCode(StringComparison.Ordinal);
}
///
diff --git a/src/bindings/mono/eldbus_mono/eldbus_common.cs
b/src/bindings/mono/eldbus_mono/eldbus_common.cs
index b6306953a1..8d4a8ab991 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_common.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_common.cs
@@ -92,7 +92,7 @@ public struct ObjectPath : IEquatable
/// Since EFL 1.24.
///
/// A hash code.
-public override int GetHashCode() => value.GetHashCode();
+public override int GetHashCode() =>
value.GetHashCode(StringComparison.Ordinal);
/// Returns whether this
/// is equal to the given .
@@ -185,7 +185,7 @@ public struct SignatureString : IEquatable
/// Since EFL 1.24.
///
/// A hash code.
-public override int GetHashCode() => value.GetHashCode();
+public override int GetHashCode() =>
value.GetHashCode(StringComparison.Ordinal);
/// Returns whether this
/// is equal to the given .
diff --git a/src/bindings/mono/eo_mono/iwrapper.cs
b/src/bindings/mono/eo_mono/iwrapper.cs
index 4e3e2e4486..c84433c23e 100644
--- a/src/bindings/mono/eo_mono/iwrapper.cs
+++ b/src/bindings/mono/eo_mono/iwrapper.cs
@@ -867,16 +867,17 @@ internal static class ClassRegister
{
throw new System.InvalidOperationException($"Could not get Native
class name. Handle: {klass}");
}
-
+#pragma warning disable CA1307
string name = Eina.StringConversion.NativeUtf8ToManagedString(namePtr)
- .Replace("_", ""); // Convert Efl C name to C# name
+.Replace("_", ""); // Convert Efl C name to C# name
+#pragma warning resto
[EGIT] [core/efl] master 01/01: csharp: Disposing IDisposable objects.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cd113d7aae746f4bc9c1678e0942aeca64382781
commit cd113d7aae746f4bc9c1678e0942aeca64382781
Author: Bruno da Silva Belo
Date: Thu Nov 14 14:26:16 2019 -0300
csharp: Disposing IDisposable objects.
Summary: ref T8423
Reviewers: lauromoura, felipealmeida, YOhoho
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8423
Differential Revision: https://phab.enlightenment.org/D10644
---
src/bindings/mono/efl_mono/UserModel.cs | 5 +-
src/tests/efl_mono/BasicDirection.cs | 1 +
src/tests/efl_mono/Eina.cs | 279 +++
src/tests/efl_mono/Eo.cs | 40 +++-
src/tests/efl_mono/EoPromises.cs | 6 +
src/tests/efl_mono/Errors.cs | 9 +-
src/tests/efl_mono/Events.cs | 22 +-
src/tests/efl_mono/FunctionPointerMarshalling.cs | 3 +
src/tests/efl_mono/FunctionPointers.cs | 7 +-
src/tests/efl_mono/Hash.cs | 3 +
src/tests/efl_mono/Inheritance.cs| 8 +-
src/tests/efl_mono/Model.cs | 7 +-
src/tests/efl_mono/Parts.cs | 8 +
src/tests/efl_mono/Promises.cs | 19 +-
src/tests/efl_mono/Strbuf.cs | 6 +
src/tests/efl_mono/Strings.cs| 24 ++
src/tests/efl_mono/Structs.cs| 9 +
src/tests/efl_mono/Value.cs | 25 +-
src/tests/efl_mono/ValueEolian.cs| 19 ++
19 files changed, 482 insertions(+), 18 deletions(-)
diff --git a/src/bindings/mono/efl_mono/UserModel.cs
b/src/bindings/mono/efl_mono/UserModel.cs
index 5094c5fd2a..99350b135a 100644
--- a/src/bindings/mono/efl_mono/UserModel.cs
+++ b/src/bindings/mono/efl_mono/UserModel.cs
@@ -29,7 +29,10 @@ internal class ModelHelper
var properties = typeof(T).GetProperties();
foreach (var prop in properties)
{
-child.SetProperty(prop.Name, ValueFromProperty(o, prop));
+using (var tmp = ValueFromProperty(o, prop))
+{
+child.SetProperty(prop.Name, tmp);
+}
}
}
diff --git a/src/tests/efl_mono/BasicDirection.cs
b/src/tests/efl_mono/BasicDirection.cs
index ceeb22d138..5c20ccb26f 100644
--- a/src/tests/efl_mono/BasicDirection.cs
+++ b/src/tests/efl_mono/BasicDirection.cs
@@ -31,6 +31,7 @@ class TestIntDirections
t.IntOut(original, out received);
Test.AssertEquals(-original, received);
+t.Dispose();
}
/*
diff --git a/src/tests/efl_mono/Eina.cs b/src/tests/efl_mono/Eina.cs
index 1dd57dcf16..b329bc3d9d 100644
--- a/src/tests/efl_mono/Eina.cs
+++ b/src/tests/efl_mono/Eina.cs
@@ -38,6 +38,7 @@ class TestEinaBinbuf
var binbuf = new Eina.Binbuf();
Test.Assert(binbuf.Handle != IntPtr.Zero);
Test.Assert(binbuf.GetBytes().SequenceEqual(Array.Empty()));
+binbuf.Dispose();
}
public static void eina_binbuf_bytes()
@@ -47,6 +48,7 @@ class TestEinaBinbuf
byte[] cmp = binbuf.GetBytes();
Test.Assert(cmp != test_string);
Test.Assert(cmp.SequenceEqual(test_string));
+binbuf.Dispose();
}
public static void eina_binbuf_bytes_length()
@@ -58,6 +60,7 @@ class TestEinaBinbuf
Test.Assert(cmp != test_string);
Test.Assert(cmp != expected);
Test.Assert(cmp.SequenceEqual(expected));
+binbuf.Dispose();
}
public static void eina_binbuf_copy_ctor()
@@ -70,6 +73,8 @@ class TestEinaBinbuf
byte[] cmp2 = binbuf2.GetBytes();
Test.Assert(cmp != cmp2);
Test.Assert(cmp.SequenceEqual(cmp2));
+binbuf2.Dispose();
+binbuf.Dispose();
}
public static void free_get_null_handle()
@@ -78,6 +83,7 @@ class TestEinaBinbuf
Test.Assert(binbuf.Handle != IntPtr.Zero);
binbuf.Free();
Test.Assert(binbuf.Handle == IntPtr.Zero);
+binbuf.Dispose();
}
public static void reset_get_empty_string()
@@ -90,6 +96,7 @@ class TestEinaBinbuf
binbuf.Reset();
Test.Assert(binbuf.Handle != IntPtr.Zero);
Test.Assert(binbuf.GetBytes().SequenceEqual(Array.Empty()));
+binbuf.Dispose();
}
public static void append_bytes()
@@ -99,6 +106,7 @@ class TestEinaBinbuf
byte[] cmp = binbuf.GetBytes();
Test.Assert(cmp != test_string);
Test.Assert(cmp.SequenceEqual(test_string));
+binbuf.Dispose();
}
public static void append_bytes_length()
@@ -109,6 +117,7 @@ class TestEinaBinbuf
byte[] expected = System.Text.Encoding.UTF8.GetBytes("0123456");
Test.Assert(cmp != expected);
Test.Assert(cmp.Seq
[EGIT] [core/efl] master 01/01: csharp: Add To and From methods for implicit conversion.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fee55857e47234067a4c773e8c7eb291ae61cca2
commit fee55857e47234067a4c773e8c7eb291ae61cca2
Author: Bruno da Silva Belo
Date: Tue Nov 12 17:07:48 2019 -0300
csharp: Add To and From methods for implicit conversion.
Summary: ref T8430
Reviewers: lauromoura, felipealmeida, segfaultxavi, YOhoho
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8430
Differential Revision: https://phab.enlightenment.org/D10616
---
src/bindings/mono/eina_mono/eina_error.cs | 26 ++-
src/bindings/mono/eina_mono/eina_value.cs | 242 +
src/bindings/mono/eldbus_mono/eldbus_common.cs | 212 --
3 files changed, 377 insertions(+), 103 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_error.cs
b/src/bindings/mono/eina_mono/eina_error.cs
index c936b88179..6774545603 100644
--- a/src/bindings/mono/eina_mono/eina_error.cs
+++ b/src/bindings/mono/eina_mono/eina_error.cs
@@ -79,20 +79,28 @@ public struct Error : IComparable, IEquatable
/// Since EFL 1.23.
///
/// Value to be converted to Error
-static public implicit operator Error(int val)
-{
-return new Error(val);
-}
+public static implicit operator Error(int val) => FromInt32(val);
+
+///
+/// Converts a to a .
+/// Since EFL 1.23.
+///
+/// The to be converted.
+public static Error FromInt32(int val) => new Error(val);
///
/// Int conversion from Error.
/// Since EFL 1.23.
///
/// Error identifier to be converted to int
-static public implicit operator int(Error error)
-{
-return error.code;
-}
+public static implicit operator int(Error error) => ToInt32(error);
+
+///
+/// Converts a to a .
+/// Since EFL 1.23.
+///
+/// The to be converted.
+public static int ToInt32(Error error) => error.code;
///
/// Transform the object to a string representing the object.
@@ -213,7 +221,7 @@ public struct Error : IComparable, IEquatable
{
if (object.ReferenceEquals(obj, null))
return false;
-
+
return this.Equals((Error)obj);
}
diff --git a/src/bindings/mono/eina_mono/eina_value.cs
b/src/bindings/mono/eina_mono/eina_value.cs
index 365d60bed3..f8bfc08d3f 100644
--- a/src/bindings/mono/eina_mono/eina_value.cs
+++ b/src/bindings/mono/eina_mono/eina_value.cs
@@ -897,11 +897,15 @@ public class ValueTypeBox
}
public static implicit operator ValueTypeBox(ValueType v)
-{
-return new ValueTypeBox(v);
-}
+=> FromValueType(v);
+
+public static ValueTypeBox FromValueType(ValueType v)
+=> new ValueTypeBox(v);
public static implicit operator ValueType(ValueTypeBox box)
+=> ToValueType(box);
+
+public static ValueType ToValueType(ValueTypeBox box)
{
if (box == null)
{
@@ -1565,24 +1569,30 @@ public class Value : IDisposable, IComparable,
IEquatable
/// Since EFL 1.23.
///
[EditorBrowsable(EditorBrowsableState.Never)]
-public static implicit operator ValueNative(Value v)
-{
-return v.GetNative();
-}
+public static implicit operator ValueNative(Value v) => ToValueNative(v);
+
+[EditorBrowsable(EditorBrowsableState.Never)]
+public static ValueNative ToValueNative(Value v) => v.GetNative();
/// Implicit conversion from native struct representation to
managed wrapper.
/// Since EFL 1.23.
///
[EditorBrowsable(EditorBrowsableState.Never)]
-public static implicit operator Value(ValueNative v)
-{
-return new Value(v);
-}
+public static implicit operator Value(ValueNative v) => FromValueNative(v);
+
+[EditorBrowsable(EditorBrowsableState.Never)]
+public static Value FromValueNative(ValueNative v) => new Value(v);
/// Implicit conversion.
/// Since EFL 1.23.
///
-public static implicit operator Value(byte x)
+public static implicit operator Value(byte x) => FromByte(x);
+
+///
+/// Conversion to a from a
+///
+/// The to be converted.
+public static Value FromByte(byte x)
{
var v = new Eina.Value(ValueType.Byte);
v.Set(x);
@@ -1593,7 +1603,14 @@ public class Value : IDisposable, IComparable,
IEquatable
/// Implicit conversion.
/// Since EFL 1.23.
///
-public static implicit operator byte(Value v)
+public static implicit operator byte(Value v) => ToByte(v);
+
+///
+/// Conversion to a from a
+/// Since EFL 1.23.
+///
+/// The to be converted.
+public static byte ToByte(Value v)
{
byte b;
v.Get(out b);
@@ -1604,7 +1621,14 @@ public class Value
[EGIT] [core/efl] master 01/01: csharp: Localization strings with CultureInfo.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0a2c9f57ef9864f30a94abfd847870d3765f874c
commit 0a2c9f57ef9864f30a94abfd847870d3765f874c
Author: Bruno da Silva Belo
Date: Thu Nov 7 23:33:09 2019 -0300
csharp: Localization strings with CultureInfo.
Summary: ref T8404
Reviewers: lauromoura, felipealmeida, YOhoho
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8404
Differential Revision: https://phab.enlightenment.org/D10608
---
.../mono/eina_mono/eina_container_common.cs| 5 +-
src/bindings/mono/eina_mono/eina_value.cs | 55 +-
src/tests/efl_mono/Strings.cs | 7 ++-
3 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_container_common.cs
b/src/bindings/mono/eina_mono/eina_container_common.cs
index 5b3b2f4bd3..7b94ab7924 100644
--- a/src/bindings/mono/eina_mono/eina_container_common.cs
+++ b/src/bindings/mono/eina_mono/eina_container_common.cs
@@ -21,6 +21,7 @@ using System.Runtime.InteropServices;
using System.Collections.Generic;
using System.Reflection;
using System.ComponentModel;
+using System.Globalization;
using Eina.Callbacks;
using static Eina.HashNativeFunctions;
@@ -642,7 +643,7 @@ abstract public class Primitive32ElementTraits :
PrimitiveElementTraits, I
public IntPtr ManagedToNativeAllocRef(T man, bool refs)
{
-return int32Traits.ManagedToNativeAlloc(Convert.ToInt32((object)man));
+return int32Traits.ManagedToNativeAlloc(Convert.ToInt32((object)man,
CultureInfo.CurrentCulture));
}
public void NativeFreeRef(IntPtr nat, bool unrefs)
@@ -681,7 +682,7 @@ abstract public class Primitive64ElementTraits :
PrimitiveElementTraits, I
public IntPtr ManagedToNativeAllocRef(T man, bool refs)
{
-return int64Traits.ManagedToNativeAlloc(Convert.ToInt64((object)man));
+return int64Traits.ManagedToNativeAlloc(Convert.ToInt64((object)man,
CultureInfo.CurrentCulture));
}
public void NativeFreeRef(IntPtr nat, bool unrefs)
diff --git a/src/bindings/mono/eina_mono/eina_value.cs
b/src/bindings/mono/eina_mono/eina_value.cs
index 8e0d836b1a..365d60bed3 100644
--- a/src/bindings/mono/eina_mono/eina_value.cs
+++ b/src/bindings/mono/eina_mono/eina_value.cs
@@ -26,6 +26,7 @@ using System.Security.Permissions;
using System.Security;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.Serialization;
+using System.Globalization;
using static Eina.EinaNative.UnsafeNativeMethods;
using static Eina.TraitFunctions;
@@ -3111,69 +3112,69 @@ public class Value : IDisposable, IComparable,
IEquatable
{
case ValueType.SByte:
{
-sbyte b = Convert.ToSByte(o);
+sbyte b = Convert.ToSByte(o, CultureInfo.CurrentCulture);
return
eina_value_container_append_wrapper_char(this.Handle, b);
}
case ValueType.Byte:
{
-byte b = Convert.ToByte(o);
+byte b = Convert.ToByte(o, CultureInfo.CurrentCulture);
return
eina_value_container_append_wrapper_uchar(this.Handle, b);
}
case ValueType.Short:
{
-short b = Convert.ToInt16(o);
+short b = Convert.ToInt16(o, CultureInfo.CurrentCulture);
return
eina_value_container_append_wrapper_short(this.Handle, b);
}
case ValueType.UShort:
{
-ushort b = Convert.ToUInt16(o);
+ushort b = Convert.ToUInt16(o, CultureInfo.CurrentCulture);
return
eina_value_container_append_wrapper_ushort(this.Handle, b);
}
case ValueType.Int32:
{
-int x = Convert.ToInt32(o);
+int x = Convert.ToInt32(o, CultureInfo.CurrentCulture);
return
eina_value_container_append_wrapper_int(this.Handle, x);
}
case ValueType.UInt32:
{
-uint x = Convert.ToUInt32(o);
+uint x = Convert.ToUInt32(o, CultureInfo.CurrentCulture);
return
eina_value_container_append_wrapper_uint(this.Handle, x);
}
case ValueType.Long:
case ValueType.Int64:
{
-long x = Convert.ToInt64(o);
+long x = Convert.ToInt64(o, CultureInfo.CurrentCulture);
return
eina_value_container_append_wrapper_long(this.Handle, x);
}
case ValueType.ULong:
case ValueType.UInt64
[EGIT] [core/efl] master 01/01: csharp: Removing a never used class.
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d907aa5285c1805efc76aac269bc05450b51e8f1
commit d907aa5285c1805efc76aac269bc05450b51e8f1
Author: Bruno da Silva Belo
Date: Thu Nov 7 19:52:31 2019 +0100
csharp: Removing a never used class.
Summary: ref T8417
Reviewers: lauromoura, felipealmeida, YOhoho, segfaultxavi
Reviewed By: segfaultxavi
Subscribers: segfaultxavi, cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8417
Differential Revision: https://phab.enlightenment.org/D10611
---
src/tests/efl_mono/Eo.cs | 4
1 file changed, 4 deletions(-)
diff --git a/src/tests/efl_mono/Eo.cs b/src/tests/efl_mono/Eo.cs
index 8a5f4646a9..e9ddb66fac 100644
--- a/src/tests/efl_mono/Eo.cs
+++ b/src/tests/efl_mono/Eo.cs
@@ -23,10 +23,6 @@ namespace TestSuite
class TestEo
{
-private class Derived : Dummy.TestObject
-{
-}
-
public static void return_null_object()
{
var testing = new Dummy.TestObject();
--
[EGIT] [core/efl] master 01/01: csharp:comma have whitespace after and none before
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bd446fdcf92d961766ac67b98f45022637dc4dde
commit bd446fdcf92d961766ac67b98f45022637dc4dde
Author: Bruno da Silva Belo
Date: Wed Nov 6 23:34:18 2019 -0300
csharp:comma have whitespace after and none before
Reviewers: felipealmeida, lauromoura, YOhoho
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10575
---
.../eolian/mono/async_function_definition.hh | 6 +-
.../eolian_mono/eolian/mono/function_definition.hh | 6 +-
.../eolian_mono/eolian/mono/function_pointer.hh| 2 +-
src/bin/eolian_mono/eolian/mono/klass.hh | 14 ++--
src/bin/eolian_mono/eolian/mono/parameter.hh | 2 +-
src/bin/eolian_mono/eolian/mono/part_definition.hh | 2 +-
src/tests/efl_mono/Eina.cs | 88 --
src/tests/efl_mono/EinaTestData.cs | 49 ++--
src/tests/efl_mono/Promises.cs | 5 +-
9 files changed, 91 insertions(+), 83 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/async_function_definition.hh
b/src/bin/eolian_mono/eolian/mono/async_function_definition.hh
index 089b115dc6..bf00ddadba 100644
--- a/src/bin/eolian_mono/eolian/mono/async_function_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/async_function_definition.hh
@@ -95,7 +95,7 @@ struct async_function_declaration_generator
if (!as_generator(
scope_tab << "/// Token to notify the async
operation of external request to cancel.\n"
<< scope_tab << "/// An async task wrapping the result of
the operation.\n"
-<< scope_tab << "System.Threading.Tasks.Task " <<
name_helpers::managed_async_method_name(f) << "(" << *(parameter << ",") <<
+<< scope_tab << "System.Threading.Tasks.Task " <<
name_helpers::managed_async_method_name(f) << "(" << *(parameter << ", ") <<
" System.Threading.CancellationToken token
= default(System.Threading.CancellationToken));\n\n"
).generate(sink, f.parameters, context))
return false;
@@ -153,9 +153,9 @@ struct async_function_definition_generator
if(!as_generator(
scope_tab << "/// Token to notify the async
operation of external request to cancel.\n"
<< scope_tab << "/// An async task wrapping the result of
the operation.\n"
-<< scope_tab << "public System.Threading.Tasks.Task "
<< name_helpers::managed_async_method_name(f) << "(" << *(parameter << ",") <<
" System.Threading.CancellationToken token =
default(System.Threading.CancellationToken))\n"
+<< scope_tab << "public System.Threading.Tasks.Task "
<< name_helpers::managed_async_method_name(f) << "(" << *(parameter << ", ") <<
" System.Threading.CancellationToken token =
default(System.Threading.CancellationToken))\n"
<< scope_tab << "{\n"
-<< scope_tab << scope_tab << "Eina.Future future = " <<
name_helpers::managed_method_name(f) << "(" << (string % ",") << ");\n"
+<< scope_tab << scope_tab << "Eina.Future future = " <<
name_helpers::managed_method_name(f) << "(" << (string % ", ") << ");\n"
<< scope_tab << scope_tab << "return
Efl.Eo.Globals.WrapAsync(future, token);\n"
<< scope_tab << "}\n\n"
).generate(sink, std::make_tuple(f.parameters, param_forwarding),
context))
diff --git a/src/bin/eolian_mono/eolian/mono/function_definition.hh
b/src/bin/eolian_mono/eolian/mono/function_definition.hh
index 44dd9167ac..51bb17c3a1 100644
--- a/src/bin/eolian_mono/eolian/mono/function_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/function_definition.hh
@@ -223,7 +223,7 @@ struct function_definition_generator
<< scope_tab(2) << eolian_mono::function_definition_preamble()
<< klass_full_native_inherit_name(f.klass) << "." << string <<
"_ptr.Value.Delegate("
<< self
-<< ((!f.is_static && (f.parameters.size() > 0)) ? "," : "")
+<< ((!f.is_static && (f.parameters.size() > 0)) ? ", " : "")
<&
[EGIT] [core/efl] master 01/01: csharp: Changing visibility of nested class/struct
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0e6e9838089ec09321f948f6c46826bd444664e9
commit 0e6e9838089ec09321f948f6c46826bd444664e9
Author: Bruno da Silva Belo
Date: Mon Nov 4 14:40:18 2019 -0300
csharp: Changing visibility of nested class/struct
Reviewers: felipealmeida, lauromoura, YOhoho
Reviewed By: YOhoho
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8393
Differential Revision: https://phab.enlightenment.org/D10588
---
src/bin/eolian_mono/eolian/mono/klass.hh | 6 ++--
.../eolian_mono/eolian/mono/struct_definition.hh | 2 +-
src/bindings/mono/eina_mono/eina_log.cs| 4 +--
src/bindings/mono/eldbus_mono/eldbus_common.cs | 34 +++---
src/bindings/mono/eo_mono/EoWrapper.cs | 4 +--
src/bindings/mono/eo_mono/iwrapper.cs | 28 +-
src/tests/efl_mono/Model.cs| 4 +--
7 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/klass.hh
b/src/bin/eolian_mono/eolian/mono/klass.hh
index 1697ace234..f2c2c5ab7d 100644
--- a/src/bin/eolian_mono/eolian/mono/klass.hh
+++ b/src/bin/eolian_mono/eolian/mono/klass.hh
@@ -232,7 +232,7 @@ struct klass
<< scope_tab << "/// Initializes a new instance of the
class.\n"
<< scope_tab << "/// Internal usage: This is used when
interacting with C code and should not be used directly.\n"
<< scope_tab << "/// The native pointer to be
wrapped.\n"
- << scope_tab << "private " << concrete_name <<
"(Efl.Eo.Globals.WrappingHandle wh) : base(wh)\n"
+ << scope_tab << "private " << concrete_name <<
"(Efl.Eo.WrappingHandle wh) : base(wh)\n"
<< scope_tab << "{\n"
<< scope_tab << "}\n\n"
)
@@ -580,7 +580,7 @@ struct klass
<< scope_tab << "/// Initializes a new instance
of the class.\n"
<< scope_tab << "/// Internal usage: Constructs an
instance from a native pointer. This is used when interacting with C code and
should not be used directly.\n"
<< scope_tab << "/// The native
pointer to be wrapped.\n"
- << scope_tab << "protected " << inherit_name <<
"(Efl.Eo.Globals.WrappingHandle wh) : base(wh)\n"
+ << scope_tab << "internal " << inherit_name <<
"(Efl.Eo.WrappingHandle wh) : base(wh)\n"
<< scope_tab << "{\n"
<< scope_tab << "}\n\n"
).generate(sink, std::make_tuple(constructors, constructors,
constructors), context))
@@ -595,7 +595,7 @@ struct klass
scope_tab << "[Efl.Eo.PrivateNativeClass]\n"
<< scope_tab << "private class " << inherit_name << "Realized
: " << inherit_name << "\n"
<< scope_tab << "{\n"
-<< scope_tab << scope_tab << "private " << inherit_name <<
"Realized(Efl.Eo.Globals.WrappingHandle wh) : base(wh)\n"
+<< scope_tab << scope_tab << "private " << inherit_name <<
"Realized(Efl.Eo.WrappingHandle wh) : base(wh)\n"
<< scope_tab << scope_tab << "{\n"
<< scope_tab << scope_tab << "}\n"
<< scope_tab << "}\n"
diff --git a/src/bin/eolian_mono/eolian/mono/struct_definition.hh
b/src/bin/eolian_mono/eolian/mono/struct_definition.hh
index 45c1747650..c733432465 100644
--- a/src/bin/eolian_mono/eolian/mono/struct_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/struct_definition.hh
@@ -291,7 +291,7 @@ struct struct_internal_definition_generator
indent << "#pragma warning disable CS1591\n\n"
<< indent << "/// Internal wrapper for struct " << string
<< ".\n"
<< indent << "[StructLayout(LayoutKind.Sequential)]\n"
- << indent << "public struct " << string << "\n"
+ << indent << "internal struct " << string << "\n"
<< indent << "{\n"
)
[EGIT] [core/efl] master 01/01: csharp: space after keywords.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=72a5367f8dd0ceeefea3729dafedb970e47d0613
commit 72a5367f8dd0ceeefea3729dafedb970e47d0613
Author: Bruno da Silva Belo
Date: Thu Oct 31 07:45:01 2019 -0300
csharp: space after keywords.
Reviewers: felipealmeida, lauromoura, YOhoho
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10576
---
src/bindings/mono/efl_mono/UserModel.cs| 6 +--
src/bindings/mono/eina_mono/eina_common.cs | 2 +-
src/tests/efl_mono/Eina.cs | 8 ++--
src/tests/efl_mono/Eldbus.cs | 2 +-
src/tests/efl_mono/Eo.cs | 2 +-
src/tests/efl_mono/Main.cs | 4 +-
src/tests/efl_mono/Value.cs| 64 +++---
7 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/src/bindings/mono/efl_mono/UserModel.cs
b/src/bindings/mono/efl_mono/UserModel.cs
index a235a3a87f..5094c5fd2a 100644
--- a/src/bindings/mono/efl_mono/UserModel.cs
+++ b/src/bindings/mono/efl_mono/UserModel.cs
@@ -27,7 +27,7 @@ internal class ModelHelper
static internal void SetProperties(T o, Efl.IModel child)
{
var properties = typeof(T).GetProperties();
-foreach(var prop in properties)
+foreach (var prop in properties)
{
child.SetProperty(prop.Name, ValueFromProperty(o, prop));
}
@@ -37,7 +37,7 @@ internal class ModelHelper
static internal void GetProperties(T o, Efl.IModel child)
{
var properties = typeof(T).GetProperties();
-foreach(var prop in properties)
+foreach (var prop in properties)
{
using (var v = child.GetProperty(prop.Name))
{
@@ -79,7 +79,7 @@ public class UserModel : Efl.MonoModelInternal
public UserModel (Efl.Object parent = null) :
base(Efl.MonoModelInternal.efl_mono_model_internal_class_get(), parent)
{
var properties = typeof(T).GetProperties();
- foreach(var prop in properties)
+ foreach (var prop in properties)
{
AddProperty(prop.Name,
Eina.ValueTypeBridge.GetManaged(prop.PropertyType));
}
diff --git a/src/bindings/mono/eina_mono/eina_common.cs
b/src/bindings/mono/eina_mono/eina_common.cs
index 44d6c6cf4a..9465891998 100644
--- a/src/bindings/mono/eina_mono/eina_common.cs
+++ b/src/bindings/mono/eina_mono/eina_common.cs
@@ -205,7 +205,7 @@ public static class StringConversion
Marshal.WriteByte(native + strbuf.Length, 0); // write the
terminating null
return native;
}
-catch(Exception)
+catch (Exception)
{
MemoryNative.Free(native);
throw;
diff --git a/src/tests/efl_mono/Eina.cs b/src/tests/efl_mono/Eina.cs
index c9194c7662..4dad199d9a 100644
--- a/src/tests/efl_mono/Eina.cs
+++ b/src/tests/efl_mono/Eina.cs
@@ -4343,7 +4343,7 @@ class TestEinaAccessor
var zipped = accessor.Zip(lst, (first, second) => new Tuple(first, second));
-foreach(Tuple pair in zipped)
+foreach (Tuple pair in zipped)
{
Test.AssertEquals(pair.Item1, pair.Item2);
}
@@ -4358,7 +4358,7 @@ class TestEinaAccessor
var zipped = accessor.Zip(arr, (first, second) => new Tuple(first, second));
-foreach(Tuple pair in zipped)
+foreach (Tuple pair in zipped)
{
Test.AssertEquals(pair.Item1, pair.Item2);
}
@@ -4376,7 +4376,7 @@ class TestEinaAccessor
var zipped = accessor.Zip(lst, (first, second) => new Tuple(first, second));
-foreach(Tuple pair in zipped)
+foreach (Tuple pair in zipped)
{
Test.AssertEquals(pair.Item1, pair.Item2);
}
@@ -4391,7 +4391,7 @@ class TestEinaAccessor
var zipped = accessor.Zip(arr, (first, second) => new Tuple(first, second));
-foreach(Tuple pair in zipped)
+foreach (Tuple pair in zipped)
{
Test.AssertEquals(pair.Item1, pair.Item2);
}
diff --git a/src/tests/efl_mono/Eldbus.cs b/src/tests/efl_mono/Eldbus.cs
index b24929098b..f8a7c2734d 100644
--- a/src/tests/efl_mono/Eldbus.cs
+++ b/src/tests/efl_mono/Eldbus.cs
@@ -261,7 +261,7 @@ class TestEldbusMessage
string bus_name;
bool isHasData = false;
-while(iterator.GetAndNext(out bus_name))
+while (iterator.GetAndNext(out bus_name))
{
if (String.IsNullOrEmpty(bus_name))
{
diff --git a/src/tests/efl_mono/Eo.cs b/src/tests/efl_mono/Eo.cs
index a60fc8a2b5..8a5f4646a9 100644
--- a/src/tests/efl_mono/Eo.cs
+++ b/src/tests/efl_mono/Eo.cs
@@ -262,7 +262,7 @@ class TestEoAccessors
var zipped = acc.Zip(lst, (first, second) => new Tupl
[EGIT] [core/efl] master 03/04: csharp: Add comparables operator to eina_error.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ba34325f430903c8b3c1695f611bc858ab7e71a7
commit ba34325f430903c8b3c1695f611bc858ab7e71a7
Author: Bruno da Silva Belo
Date: Mon Oct 28 20:34:55 2019 -0300
csharp: Add comparables operator to eina_error.
Summary: ref T8394
Reviewers: lauromoura, felipealmeida, segfaultxavi, YOhoho
Reviewed By: YOhoho
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8394
Differential Revision: https://phab.enlightenment.org/D10456
---
src/bindings/mono/eina_mono/eina_error.cs | 107 ++
1 file changed, 94 insertions(+), 13 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_error.cs
b/src/bindings/mono/eina_mono/eina_error.cs
index 5c4ac9345b..c936b88179 100644
--- a/src/bindings/mono/eina_mono/eina_error.cs
+++ b/src/bindings/mono/eina_mono/eina_error.cs
@@ -24,7 +24,7 @@ namespace Eina
/// Error codes from native Eina methods.
/// Since EFL 1.23.
///
-public struct Error : IComparable
+public struct Error : IComparable, IEquatable
{
int code;
@@ -94,17 +94,6 @@ public struct Error : IComparable
return error.code;
}
-///
-/// Compare two Errors.
-/// Since EFL 1.23.
-///
-/// Error to be compared with
-/// True with the Errors is equal, False otherwise.
-public int CompareTo(Error err)
-{
-return code.CompareTo(err.code);
-}
-
///
/// Transform the object to a string representing the object.
/// Since EFL 1.23.
@@ -197,6 +186,98 @@ public struct Error : IComparable
{
return eina_error_msg_register(msg);
}
-}
+///
+/// Gets a hash for .
+/// Since EFL 1.23.
+///
+/// A hash code.
+public override int GetHashCode()
+=> code.GetHashCode() + Message.GetHashCode();
+
+///
+/// Compare to a given error.
+/// Since EFL 1.23.
+///
+/// Error to be compared with.
+/// -1, 0 or 1 if -1 if Error is less, equal or greater than
err.
+public int CompareTo(Error err) => code.CompareTo(err.code);
+
+///
+/// Check if is equal to obj.
+/// Since EFL 1.23.
+///
+/// The object to be checked.
+/// false if obj is null or not equals, true otherwise.
+public override bool Equals(object obj)
+{
+if (object.ReferenceEquals(obj, null))
+return false;
+
+return this.Equals((Error)obj);
+}
+
+///
+/// Check if is equal to err.
+/// Since EFL 1.23.
+///
+/// The object to be checked.
+/// false if obj is null or not equals, true otherwise.
+public bool Equals(Error err) => this.CompareTo(err) == 0;
+
+///
+/// Check if lhs is equals to rhs.
+/// Since EFL 1.23.
+///
+/// The left hand side of the operator.
+/// The right hand side of the operator.
+/// true if lhs is equals to rhs, false otherwise.
+public static bool operator==(Error lhs, Error rhs) => lhs.Equals(rhs);
+
+///
+/// Check if lhs is not equals to rhs.
+/// Since EFL 1.23.
+///
+/// The left hand side of the operator.
+/// The right hand side of the operator.
+/// true if lhs is not equals to rhs, false otherwise.
+public static bool operator!=(Error lhs, Error rhs) => !(lhs == rhs);
+
+///
+/// Check if lhs is less than rhs.
+/// Since EFL 1.23.
+///
+/// The left hand side of the operator.
+/// The right hand side of the operator.
+/// true if lhs is less than rhs, false otherwise.
+public static bool operator<(Error lhs, Error rhs) => (lhs.CompareTo(rhs)
< 0);
+
+///
+/// Check if lhs is greater to rhs.
+/// Since EFL 1.23.
+///
+/// The left hand side of the operator.
+/// The right hand side of the operator.
+/// true if lhs is greater than rhs, false otherwise.
+public static bool operator>(Error lhs, Error rhs) => rhs < lhs;
+
+///
+/// Check if lhs is equals and less than rhs.
+/// Since EFL 1.23.
+///
+/// The left hand side of the operator.
+/// The right hand side of the operator.
+/// true if lhs is equals and less than rhs, false
otherwise.
+public static bool operator<=(Error lhs, Error rhs) => !(lhs > rhs);
+
+///
+/// Check if lhs is equals and greater than rhs.
+/// Since EFL 1.23.
+///
+/// The left hand side of the operator.
+/// The right hand side of the operator.
+/// true if lhs is equals and greater than rhs, false
otherwise.
+public static bool operator>=(Error lhs, Error rhs) => !(lhs < rhs);
+
+}
}
--
[EGIT] [core/efl] master 02/04: csharp: Add comparables operators to eina_value.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=19588be0b9960d4a3440f0fabd2bb6914476dcae
commit 19588be0b9960d4a3440f0fabd2bb6914476dcae
Author: Bruno da Silva Belo
Date: Mon Oct 28 20:34:25 2019 -0300
csharp: Add comparables operators to eina_value.
Summary: ref T8394
Reviewers: lauromoura, felipealmeida, segfaultxavi, YOhoho, bu5hm4n
Reviewed By: YOhoho
Subscribers: bu5hm4n, cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8394
Differential Revision: https://phab.enlightenment.org/D10458
---
src/bindings/mono/eina_mono/eina_value.cs | 126 ++
src/tests/efl_mono/Value.cs | 11 ++-
2 files changed, 69 insertions(+), 68 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_value.cs
b/src/bindings/mono/eina_mono/eina_value.cs
index a5f4a0e867..8e0d836b1a 100644
--- a/src/bindings/mono/eina_mono/eina_value.cs
+++ b/src/bindings/mono/eina_mono/eina_value.cs
@@ -2918,7 +2918,7 @@ public class Value : IDisposable, IComparable,
IEquatable
return eina_value_convert(this.Handle, destination.Handle);
}
-/// Compare two eina values.
+/// Compare two .
/// Since EFL 1.23.
///
/// The object to be compared to.
@@ -2926,7 +2926,7 @@ public class Value : IDisposable, IComparable,
IEquatable
/// the other.
public int CompareTo(Value other)
{
-if (other == null)
+if (object.ReferenceEquals(other, null))
{
return 1;
}
@@ -2936,15 +2936,21 @@ public class Value : IDisposable, IComparable,
IEquatable
return eina_value_compare_wrapper(this.Handle, other.Handle);
}
-/// Compare to other values.
+/// Compare two values.
/// Since EFL 1.23.
///
-/// The object to be compared to.
-/// -1, 0 or 1 if this value is respectively
smaller than, equal to or greater than
-/// the other.
-public int Compare(Value other)
+/// The left value.
+/// The right value.
+/// -1, 0 or 1 if lhs is respectively
+/// smaller than, equal to or greater than the rhs.
+public static int Compare(Value lhs, Value rhs)
{
-return this.CompareTo(other);
+if (object.ReferenceEquals(lhs, rhs))
+return 0;
+if (object.ReferenceEquals(lhs, null))
+return -1;
+
+return lhs.CompareTo(rhs);
}
/// Returns whether this value is equal to the given object.
@@ -2959,13 +2965,7 @@ public class Value : IDisposable, IComparable,
IEquatable
return false;
}
-Value v = obj as Value;
-if (v == null)
-{
-return false;
-}
-
-return this.Equals(v);
+return this.Equals(obj as Value);
}
/// Returns whether this value is equal to the given value.
@@ -2973,17 +2973,7 @@ public class Value : IDisposable, IComparable,
IEquatable
///
/// The value to be compared to.
/// true if this value is equal to other.
-public bool Equals(Value other)
-{
-try
-{
-return this.CompareTo(other) == 0;
-}
-catch (ObjectDisposedException)
-{
-return false;
-}
-}
+public bool Equals(Value other) => this.CompareTo(other) == 0;
/// Gets the hash code for this value.
///
@@ -2995,70 +2985,72 @@ public class Value : IDisposable, IComparable,
IEquatable
return this.Handle.ToInt32();
}
-/// Returns whether both values are null or x is equal to
y.
+/// Returns whether both values are null or lhs is equal
to rhs.
///
/// Since EFL 1.23.
///
-/// true if both parameters are null or if x
is equal
-/// to y.
-public static bool operator==(Value x, Value y)
+/// The left hand side of the operator.
+/// The right hand side of the operator.
+/// true if both parameters are null or if
lhs is equal
+/// to lhs.
+public static bool operator==(Value lhs, Value rhs)
{
-if (object.ReferenceEquals(x, null))
-{
-return object.ReferenceEquals(y, null);
-}
+if (object.ReferenceEquals(lhs, null))
+return object.ReferenceEquals(rhs, null);
-return x.Equals(y);
+return lhs.Equals(rhs);
}
-/// Returns whether x is different from y.
+/// Returns whether lhs is different from rhs.
///
/// Since EFL 1.23.
///
-/// true if x is different from y.
-public static bool operator!=(Value x, Value y)
-{
-if (object.ReferenceEquals(x, null))
-{
-return !object.ReferenceEquals(y, null);
-}
+/// The left hand side of the operator.
+/// The right hand side of the operator.
+/// true if lhs is different from
rhs.
+public static bool operator!=(Value lhs, Value
[EGIT] [core/efl] master 02/02: csharp: Add missing exception ctor from Errors.cs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=547f8767a9d73e49084679954c53ac6704b699eb
commit 547f8767a9d73e49084679954c53ac6704b699eb
Author: Bruno da Silva Belo
Date: Mon Oct 28 11:43:56 2019 -0300
csharp: Add missing exception ctor from Errors.cs.
Summary: ref T8392
Reviewers: lauromoura, felipealmeida, segfaultxavi, YOhoho
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8392
Differential Revision: https://phab.enlightenment.org/D10455
---
src/tests/efl_mono/Errors.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/tests/efl_mono/Errors.cs b/src/tests/efl_mono/Errors.cs
index ee22ff9619..94156e9a16 100644
--- a/src/tests/efl_mono/Errors.cs
+++ b/src/tests/efl_mono/Errors.cs
@@ -37,7 +37,9 @@ class TestEolianError
{
public class CustomException : Exception {
+public CustomException() {}
public CustomException(string msg): base(msg) {}
+public CustomException(string msg, Exception inner) : base(msg, inner)
{}
}
class Overrider : Dummy.TestObject {
--
[EGIT] [core/efl] master 01/02: csharp: Add missing exception ctr from iwrapper.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=898ced96f68fbbc186617e54b9adf16f4eff5197
commit 898ced96f68fbbc186617e54b9adf16f4eff5197
Author: Bruno da Silva Belo
Date: Mon Oct 28 11:59:52 2019 -0300
csharp: Add missing exception ctr from iwrapper.
Summary: ref T8392
Reviewers: felipealmeida, lauromoura, segfaultxavi, YOhoho
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8392
Differential Revision: https://phab.enlightenment.org/D10454
---
src/bindings/mono/eo_mono/iwrapper.cs | 93 ++-
1 file changed, 82 insertions(+), 11 deletions(-)
diff --git a/src/bindings/mono/eo_mono/iwrapper.cs
b/src/bindings/mono/eo_mono/iwrapper.cs
index d9ae4e56c5..8ba47b4aa8 100644
--- a/src/bindings/mono/eo_mono/iwrapper.cs
+++ b/src/bindings/mono/eo_mono/iwrapper.cs
@@ -573,7 +573,7 @@ public static class Globals
}
else
{
-tcs.TrySetException(new Efl.FutureException(received));
+tcs.TrySetException(new Efl.FutureException(err));
}
}
else
@@ -1383,10 +1383,29 @@ public class StrbufKeepOwnershipMarshaler:
ICustomMarshaler
/// General exception for errors inside the binding.
public class EflException : Exception
{
+///
+/// Default Constructor.
+/// Since EFL 1.23.
+///
+public EflException()
+{
+}
+
/// Create a new EflException with the given message.
public EflException(string message) : base(message)
{
}
+
+///
+/// Create a new EflException with the given message and inner exception.
+/// Since EFL 1.23.
+///
+/// The message of the exception.
+/// The inner exception.
+public EflException(string message, Exception innerException)
+: base(message, innerException)
+{
+}
}
/// Exception to be raised when a Task fails due to a failed
Eina.Future.
@@ -1395,18 +1414,70 @@ public class FutureException : EflException
/// The error code returned by the failed Eina.Future.
public Eina.Error Error { get; private set; }
-/// Construct a new exception from the Eina.Error stored in the
given Eina.Value.
-public FutureException(Eina.Value value) : base("Future failed.")
+///
+/// Default constructor.
+/// Since EFL 1.23.
+///
+public FutureException() : this(Eina.Error.UNHANDLED_EXCEPTION)
{
-if (value.GetValueType() != Eina.ValueType.Error)
-{
-throw new ArgumentException("FutureException must receive an
Eina.Value with Eina.Error.");
-}
+}
-Eina.Error err;
-value.Get(out err);
-Error = err;
+///
+/// Construct a new exception from the
+/// with a given message
+/// Since EFL 1.23.
+///
+/// The message of the exception.
+public FutureException(string message)
+: this(Eina.Error.UNHANDLED_EXCEPTION, message)
+{
}
-}
+///
+/// Construct a new exception from the
+/// with a given message and inner exception.
+/// Since EFL 1.23.
+///
+/// The message of the exception.
+/// The inner exception.
+public FutureException(string message, Exception innerException)
+: this(Eina.Error.UNHANDLED_EXCEPTION, message, innerException)
+{
+}
+
+///
+/// Construct a new exception from the
+/// with a given error.
+/// Since EFL 1.23.
+///
+/// The error of the exception..
+public FutureException(Eina.Error error)
+: this(error, "Future failed.")
+{
+}
+
+///
+/// Construct a new exception from the
+/// with a given error and message.
+/// Since EFL 1.23.
+///
+/// The error of the exception..
+/// The message of the exception.
+public FutureException(Eina.Error error, string message)
+: this(error, message, null)
+{
+}
+
+///
+/// Construct a new exception from the
+/// with a given error, message and innerException.
+/// Since EFL 1.23.
+///
+/// The error of the exception..
+/// The message of the exception.
+/// The inner exception.
+public FutureException(Eina.Error error, string message,
+ Exception innerException)
+: base(message, innerException) => Error = error;
+}
} // namespace efl
--
[EGIT] [core/efl] master 01/01: csharp:Changing ex access modifier from Errors.cs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=31be3b6a5d55afdfeb2365e64d61c52d17926f7e
commit 31be3b6a5d55afdfeb2365e64d61c52d17926f7e
Author: Bruno da Silva Belo
Date: Fri Oct 25 15:02:54 2019 -0300
csharp:Changing ex access modifier from Errors.cs.
Summary: ref T8401
Reviewers: lauromoura, felipealmeida, YOhoho, segfaultxavi
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8401
Differential Revision: https://phab.enlightenment.org/D10502
---
src/tests/efl_mono/Errors.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/efl_mono/Errors.cs b/src/tests/efl_mono/Errors.cs
index e7f73f9b5f..ee22ff9619 100644
--- a/src/tests/efl_mono/Errors.cs
+++ b/src/tests/efl_mono/Errors.cs
@@ -36,7 +36,7 @@ class TestEinaError
class TestEolianError
{
-class CustomException : Exception {
+public class CustomException : Exception {
public CustomException(string msg): base(msg) {}
}
--
[EGIT] [core/efl] master 02/02: csharp: Using Array.Empty Eina.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fee91831cb18d210406a946f3066e4e8da1f27cb
commit fee91831cb18d210406a946f3066e4e8da1f27cb
Author: Bruno da Silva Belo
Date: Fri Oct 25 13:49:24 2019 -0300
csharp: Using Array.Empty Eina.
Summary: ref T8421
Reviewers: lauromoura, felipealmeida, segfaultxavi, YOhoho
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8421
Differential Revision: https://phab.enlightenment.org/D10500
---
src/tests/efl_mono/Eina.cs | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/tests/efl_mono/Eina.cs b/src/tests/efl_mono/Eina.cs
index d009dc8893..c9194c7662 100644
--- a/src/tests/efl_mono/Eina.cs
+++ b/src/tests/efl_mono/Eina.cs
@@ -37,7 +37,7 @@ class TestEinaBinbuf
{
var binbuf = new Eina.Binbuf();
Test.Assert(binbuf.Handle != IntPtr.Zero);
-Test.Assert(binbuf.GetBytes().SequenceEqual(new byte[0]));
+Test.Assert(binbuf.GetBytes().SequenceEqual(Array.Empty()));
}
public static void eina_binbuf_bytes()
@@ -89,7 +89,7 @@ class TestEinaBinbuf
Test.Assert(cmp.SequenceEqual(test_string));
binbuf.Reset();
Test.Assert(binbuf.Handle != IntPtr.Zero);
-Test.Assert(binbuf.GetBytes().SequenceEqual(new byte[0]));
+Test.Assert(binbuf.GetBytes().SequenceEqual(Array.Empty()));
}
public static void append_bytes()
@@ -114,7 +114,7 @@ class TestEinaBinbuf
public static void append_binbuf()
{
var binbuf = new Eina.Binbuf();
-Test.Assert(binbuf.GetBytes().SequenceEqual(new byte[0]));
+Test.Assert(binbuf.GetBytes().SequenceEqual(Array.Empty()));
var binbuf2 = new Eina.Binbuf(test_string);
binbuf.Append(binbuf2);
byte[] cmp = binbuf.GetBytes();
@@ -158,7 +158,7 @@ class TestEinaBinbuf
Test.Assert(binbuf.GetBytes().SequenceEqual(test_string));
binbuf.FreeString();
Test.Assert(binbuf.Handle != IntPtr.Zero);
-Test.Assert(binbuf.GetBytes().SequenceEqual(new byte[0]));
+Test.Assert(binbuf.GetBytes().SequenceEqual(Array.Empty()));
}
public static void binbuf_length()
--
[EGIT] [core/efl] master 01/02: csharp:Using Array.Empty genericmodel.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5844ab43203f83b79fd33ec3ce96f9cdcd9160f0
commit 5844ab43203f83b79fd33ec3ce96f9cdcd9160f0
Author: Bruno da Silva Belo
Date: Fri Oct 25 13:57:48 2019 -0300
csharp:Using Array.Empty genericmodel.
Summary: ref T8421
Reviewers: lauromoura, felipealmeida, YOhoho, segfaultxavi
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8421
Differential Revision: https://phab.enlightenment.org/D10501
---
src/bindings/mono/efl_mono/GenericModel.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bindings/mono/efl_mono/GenericModel.cs
b/src/bindings/mono/efl_mono/GenericModel.cs
index cda0647cbc..5f333746f4 100644
--- a/src/bindings/mono/efl_mono/GenericModel.cs
+++ b/src/bindings/mono/efl_mono/GenericModel.cs
@@ -124,7 +124,7 @@ public class GenericModel : Efl.Object, Efl.IModel
if (v.GetValueType().IsContainer())
{
var child = (Efl.IModel)v[0];
- T obj = (T)Activator.CreateInstance(typeof(T), new
System.Object[] {});
+ T obj = (T)Activator.CreateInstance(typeof(T),
Array.Empty());
ModelHelper.GetProperties(obj, child);
return obj;
}
--
[EGIT] [core/efl] master 01/02: csharp: Using Count eina_promises.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=68eefe18725ddd79e704eca2c7aaf1835d61fad1
commit 68eefe18725ddd79e704eca2c7aaf1835d61fad1
Author: Bruno da Silva Belo
Date: Fri Oct 25 13:06:59 2019 -0300
csharp: Using Count eina_promises.
Summary: ref T8422
Reviewers: lauromoura, felipealmeida, YOhoho, segfaultxavi
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8422
Differential Revision: https://phab.enlightenment.org/D10498
---
src/bindings/mono/eina_mono/eina_promises.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_promises.cs
b/src/bindings/mono/eina_mono/eina_promises.cs
index a220e0c30c..4b14a0d894 100644
--- a/src/bindings/mono/eina_mono/eina_promises.cs
+++ b/src/bindings/mono/eina_mono/eina_promises.cs
@@ -380,11 +380,11 @@ public class Future
{
SanityChecks();
System.Collections.Generic.IList cbsList = cbs.ToList();
-FutureDesc[] descs = new FutureDesc[cbsList.Count() + 1]; // +1 due to
the null-cb terminating descriptor.
+FutureDesc[] descs = new FutureDesc[cbsList.Count + 1]; // +1 due to
the null-cb terminating descriptor.
int i = 0;
try
{
-for (; i < cbsList.Count(); i++)
+for (; i < cbsList.Count; i++)
{
ResolvedCb cb = cbsList[i];
descs[i].cb = NativeResolvedCbDelegate;
--
[EGIT] [core/efl] master 02/02: csharp: Changing Count() to Length on eina_value.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e17213a09ba5da543bb951492ec2aca7f0af7656
commit e17213a09ba5da543bb951492ec2aca7f0af7656
Author: Bruno da Silva Belo
Date: Fri Oct 25 13:08:37 2019 -0300
csharp: Changing Count() to Length on eina_value.
Summary: ref T8422
Reviewers: lauromoura, felipealmeida, YOhoho, segfaultxavi
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8422
Differential Revision: https://phab.enlightenment.org/D10499
---
src/bindings/mono/eina_mono/eina_value.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bindings/mono/eina_mono/eina_value.cs
b/src/bindings/mono/eina_mono/eina_value.cs
index 636a7b5012..35c85c83ac 100644
--- a/src/bindings/mono/eina_mono/eina_value.cs
+++ b/src/bindings/mono/eina_mono/eina_value.cs
@@ -1293,7 +1293,7 @@ public class Value : IDisposable, IComparable,
IEquatable
}
Type[] genericArguments = objType.GetGenericArguments();
-if (genericArguments.Count() != 1)
+if (genericArguments.Length != 1)
{
throw new ArgumentException($"Unsupported type for direct
construction: {objType}");
}
--
[EGIT] [core/efl] master 02/03: csharp: Calling ConfigureAwait on tasks Model.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c0f3febccfc75c4a5876c5b4166c9d9142723b2a
commit c0f3febccfc75c4a5876c5b4166c9d9142723b2a
Author: Bruno da Silva Belo
Date: Fri Oct 25 11:22:35 2019 -0300
csharp: Calling ConfigureAwait on tasks Model.
Summary: ref T8424
Reviewers: lauromoura, felipealmeida, YOhoho, segfaultxavi
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8424
Differential Revision: https://phab.enlightenment.org/D10496
---
src/tests/efl_mono/Model.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tests/efl_mono/Model.cs b/src/tests/efl_mono/Model.cs
index 13e0d1559f..54f7200575 100644
--- a/src/tests/efl_mono/Model.cs
+++ b/src/tests/efl_mono/Model.cs
@@ -42,10 +42,10 @@ public class TestModel {
var model = new Efl.GenericModel(veggies, loop);
Test.AssertEquals(3, (int)model.GetChildrenCount());
-VeggieViewModel r2 = await model.GetAtAsync(1);
+VeggieViewModel r2 = await model.GetAtAsync(1).ConfigureAwait(false);
Test.AssertEquals(r2.Name, "Romaine Lettuce");
-VeggieViewModel r = await model.GetAtAsync(0);
+VeggieViewModel r = await model.GetAtAsync(0).ConfigureAwait(false);
Test.AssertEquals(r.Name, "Tomato");
loop.End();
--
[EGIT] [core/efl] master 01/03: csharp: Calling ConfigureAwait on task eopromises.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=882a2d4ec46853edfa2d34032a6a80abee6dc211
commit 882a2d4ec46853edfa2d34032a6a80abee6dc211
Author: Bruno da Silva Belo
Date: Fri Oct 25 11:17:53 2019 -0300
csharp: Calling ConfigureAwait on task eopromises.
Summary: ref T8424
Reviewers: lauromoura, felipealmeida, YOhoho, segfaultxavi
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8424
Differential Revision: https://phab.enlightenment.org/D10495
---
src/tests/efl_mono/EoPromises.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/efl_mono/EoPromises.cs b/src/tests/efl_mono/EoPromises.cs
index 998c66e785..18acbe82ba 100644
--- a/src/tests/efl_mono/EoPromises.cs
+++ b/src/tests/efl_mono/EoPromises.cs
@@ -106,7 +106,7 @@ class LoopConsumer
public static async Task Consume(Efl.Loop loop)
{
Task task = loop.IdleAsync();
-Eina.Value v = await task;
+Eina.Value v = await task.ConfigureAwait(false);
loop.Quit(v);
}
}
--
[EGIT] [core/efl] master 03/03: csharp: Calling ConfigureAwait on tasks GM.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=827a3011314bc5e4dc23a05a54f000148609d87c
commit 827a3011314bc5e4dc23a05a54f000148609d87c
Author: Bruno da Silva Belo
Date: Fri Oct 25 11:23:08 2019 -0300
csharp: Calling ConfigureAwait on tasks GM.
Summary: ref T8424
Reviewers: lauromoura, felipealmeida, YOhoho, segfaultxavi
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8424
Differential Revision: https://phab.enlightenment.org/D10497
---
src/bindings/mono/efl_mono/GenericModel.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bindings/mono/efl_mono/GenericModel.cs
b/src/bindings/mono/efl_mono/GenericModel.cs
index 8bfa8ce2f7..cda0647cbc 100644
--- a/src/bindings/mono/efl_mono/GenericModel.cs
+++ b/src/bindings/mono/efl_mono/GenericModel.cs
@@ -119,7 +119,7 @@ public class GenericModel : Efl.Object, Efl.IModel
/// Token to notify the async operation of external request to
cancel.
async public System.Threading.Tasks.Task GetAtAsync(uint index)
{
- using (Eina.Value v = await GetChildrenSliceAsync(index, 1))
+ using (Eina.Value v = await GetChildrenSliceAsync(index,
1).ConfigureAwait(false))
{
if (v.GetValueType().IsContainer())
{
--
[EGIT] [core/efl] master 01/01: csharp: Returning only method name iwrapper.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1adb7658790a705e19d3d4350800eb6269a7a612
commit 1adb7658790a705e19d3d4350800eb6269a7a612
Author: Bruno da Silva Belo
Date: Thu Oct 24 18:50:48 2019 -0300
csharp: Returning only method name iwrapper.
Summary:
GetUserMethods returning only strings,
not the whole method informations.
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10503
---
.../eolian/mono/function_registration.hh | 2 +-
src/bindings/mono/eo_mono/iwrapper.cs | 30 +-
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/function_registration.hh
b/src/bin/eolian_mono/eolian/mono/function_registration.hh
index 55e76dbbfa..bef9e21384 100644
--- a/src/bin/eolian_mono/eolian/mono/function_registration.hh
+++ b/src/bin/eolian_mono/eolian/mono/function_registration.hh
@@ -64,7 +64,7 @@ struct function_registration_generator
return false;
if(!as_generator(
-indent << "if (methods.FirstOrDefault(m => m.Name == \"" << string <<
"\") != null)\n"
+indent << "if (methods.Contains(\"" << string << "\"))\n"
<< indent << "{\n"
<< indent << scope_tab << "descs.Add(new EflOpDescription() {"
#ifdef _WIN32
diff --git a/src/bindings/mono/eo_mono/iwrapper.cs
b/src/bindings/mono/eo_mono/iwrapper.cs
index 5154c4b2a2..d9ae4e56c5 100644
--- a/src/bindings/mono/eo_mono/iwrapper.cs
+++ b/src/bindings/mono/eo_mono/iwrapper.cs
@@ -22,6 +22,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Reflection;
using System.Threading;
+using System.Linq;
using static Eina.NativeCustomExportFunctions;
using EoG = Efl.Eo.Globals;
@@ -368,26 +369,31 @@ public static class Globals
return null;
}
-public static System.Collections.Generic.List
+public static System.Collections.Generic.List
GetUserMethods(System.Type type)
{
-var r = new
System.Collections.Generic.List();
-var flags = System.Reflection.BindingFlags.Instance
-| System.Reflection.BindingFlags.DeclaredOnly
-| System.Reflection.BindingFlags.Public
-| System.Reflection.BindingFlags.NonPublic;
-r.AddRange(type.GetMethods(flags));
-var base_type = type.BaseType;
+var r = new System.Collections.Generic.List();
+var flags =
+System.Reflection.BindingFlags.Instance
+| System.Reflection.BindingFlags.DeclaredOnly
+| System.Reflection.BindingFlags.Public
+| System.Reflection.BindingFlags.NonPublic;
-for (;base_type != null; base_type = base_type.BaseType)
+for (var base_type = type;;base_type = base_type.BaseType)
{
-if (IsGeneratedClass(base_type))
+r.AddRange(base_type.GetMethods(flags)
+ .AsParallel().Select(info=>info.Name).ToList());
+if (IsGeneratedClass(base_type.BaseType))
{
-return r;
+break;
}
-r.AddRange(base_type.GetMethods(flags));
+if (base_type.BaseType == null)
+{
+break;
+}
}
+
return r;
}
--
[EGIT] [core/efl] master 01/01: csharp: Setting ELM_ENGINE if it is none.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4e2b9e208964bda733d75b26fc0cf480bd5635e9
commit 4e2b9e208964bda733d75b26fc0cf480bd5635e9
Author: Bruno da Silva Belo
Date: Fri Oct 18 11:40:33 2019 -0300
csharp: Setting ELM_ENGINE if it is none.
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8322
Differential Revision: https://phab.enlightenment.org/D10442
---
src/tests/efl_mono/Main.cs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/tests/efl_mono/Main.cs b/src/tests/efl_mono/Main.cs
index 06add7edd2..b7b6276040 100644
--- a/src/tests/efl_mono/Main.cs
+++ b/src/tests/efl_mono/Main.cs
@@ -15,6 +15,9 @@ class TestMain
static int Main(string[] args)
{
+if (Environment.GetEnvironmentVariable("ELM_ENGINE") == null)
+Environment.SetEnvironmentVariable("ELM_ENGINE", "buffer");
+
Efl.All.Init(Efl.Csharp.Components.Ui);
bool pass = true;
--
[EGIT] [core/efl] master 05/05: csharp: updating eldbus_message doc and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dfd49533c036e5e9304007319b152dfb93c931d2
commit dfd49533c036e5e9304007319b152dfb93c931d2
Author: Bruno da Silva Belo
Date: Thu Oct 17 15:53:48 2019 -0300
csharp: updating eldbus_message doc and hide api.
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8361
Differential Revision: https://phab.enlightenment.org/D10431
---
src/bindings/mono/eldbus_mono/eldbus_message.cs | 474 +++-
1 file changed, 472 insertions(+), 2 deletions(-)
diff --git a/src/bindings/mono/eldbus_mono/eldbus_message.cs
b/src/bindings/mono/eldbus_mono/eldbus_message.cs
index 2bd7431c98..56fa30b9af 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_message.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_message.cs
@@ -2,12 +2,14 @@
using System;
using System.Runtime.InteropServices;
+using System.ComponentModel;
using static eldbus.EldbusMessageNativeFunctions;
namespace eldbus
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class EldbusMessageNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern IntPtr
@@ -190,11 +192,11 @@ public static class EldbusMessageNativeFunctions
/// Represents a DBus message.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Message : IDisposable
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get;set;} = IntPtr.Zero;
public bool Own {get;set;} = true;
@@ -213,16 +215,26 @@ public class Message : IDisposable
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public Message(IntPtr handle, bool own)
{
InitNew(handle, own);
}
+/// Finalizes with garbage collector.
+/// Since EFL 1.23.
+///
~Message()
{
Dispose(false);
}
+
+/// Disposes of this wrapper, releasing the native if owned.
+/// Since EFL 1.23.
+///
+/// True if this was called from public method. False if
+/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
{
IntPtr h = Handle;
@@ -245,17 +257,28 @@ public class Message : IDisposable
}
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Free()
{
Dispose();
}
+///
+/// Releases the native handler.
+/// Since EFL 1.23.
+///
+/// The native handler.
public IntPtr Release()
{
IntPtr h = Handle;
@@ -263,6 +286,15 @@ public class Message : IDisposable
return h;
}
+///
+/// Create a new message to invoke a method on a remote object.
+/// Since EFL 1.23.
+///
+/// The bus name or unique id of the remote
application.
+/// The object path.
+/// The interface name.
+/// The name of the method to be called.
+/// A new .
public static eldbus.Message NewMethodCall(string dest, string path,
string iface, string method)
{
var ptr = eldbus_message_method_call_new(dest, path, iface, method);
@@ -274,6 +306,14 @@ public class Message : IDisposable
return new eldbus.Message(ptr, true);
}
+///
+/// Create a new signal message.
+/// Since EFL 1.23.
+///
+/// The object path.
+/// The interface name.
+/// The name of the signal to be broadcasted.
+/// A new .
public static eldbus.Message NewSignal(string path, string _interface,
string name)
{
var ptr = eldbus_message_signal_new(path, _interface, name);
@@ -285,18 +325,31 @@ public class Message : IDisposable
return new eldbus.Message(ptr, true);
}
+///
+/// Increase message reference.
+/// Since EFL 1.23.
+///
public void Ref()
{
CheckHandle();
eldbus_message_ref(Handle);
}
+///
+/// Decrease message reference.
+/// Since EFL 1.23.
+///
public void Unref()
{
CheckHandle();
eldbus_message_unref(Handle);
}
+///
+/// Get the eldbus message path.
+/// Since EFL 1.23.
+///
+/// A string containing the dbus message path.
public string GetPath()
{
CheckHandle();
@@ -304,6 +357,11 @@ public class Message : IDisposable
return Eina.StringConversion.NativeUtf8ToManagedString(ptr);
}
+///
+/// The eldbus message interface.
+/// Since EFL 1.23.
+///
+/// A string containing the dbus message interface.
public string GetInterface
[EGIT] [core/efl] master 01/05: csharp: hide eldbus_service api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=67c07117c849a886f075b6de0e2595d0d2beb2e5
commit 67c07117c849a886f075b6de0e2595d0d2beb2e5
Author: Bruno da Silva Belo
Date: Thu Oct 17 14:40:48 2019 -0300
csharp: hide eldbus_service api.
Summary: ref T8361
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8361
Differential Revision: https://phab.enlightenment.org/D10425
---
src/bindings/mono/eldbus_mono/eldbus_service.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/bindings/mono/eldbus_mono/eldbus_service.cs
b/src/bindings/mono/eldbus_mono/eldbus_service.cs
index 6e089720e1..d405aa8df3 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_service.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_service.cs
@@ -2,12 +2,14 @@
using System;
using System.Runtime.InteropServices;
+using System.ComponentModel;
using static eldbus.EldbusServiceNativeFunctions;
namespace eldbus
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class EldbusServiceNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern IntPtr
--
[EGIT] [core/efl] master 04/05: csharp: updating eldbus_proxy doc and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6162b1a23e55100f88aeaf04fa751b3195c2eaea
commit 6162b1a23e55100f88aeaf04fa751b3195c2eaea
Author: Bruno da Silva Belo
Date: Thu Oct 17 15:39:47 2019 -0300
csharp: updating eldbus_proxy doc and hide api.
Summary: ref T8361
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8361
Differential Revision: https://phab.enlightenment.org/D10428
---
src/bindings/mono/eldbus_mono/eldbus_proxy.cs | 35 +--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/bindings/mono/eldbus_mono/eldbus_proxy.cs
b/src/bindings/mono/eldbus_mono/eldbus_proxy.cs
index 2d692cdd65..6b4c68e5c9 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_proxy.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_proxy.cs
@@ -2,12 +2,14 @@
using System;
using System.Runtime.InteropServices;
+using System.ComponentModel;
using static eldbus.EldbusProxyNativeFunctions;
namespace eldbus
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class EldbusProxyNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern IntPtr
@@ -66,12 +68,15 @@ public static class EldbusProxyNativeFunctions
}
/// Represents a DBus proxy object.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Proxy : IDisposable
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get;set;} = IntPtr.Zero;
+/// Whether this managed list owns the native one.
+/// Since EFL 1.23.
+///
public bool Own {get;set;} = true;
private void InitNew(IntPtr handle, bool own)
@@ -89,21 +94,36 @@ public class Proxy : IDisposable
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public Proxy(IntPtr handle, bool own)
{
InitNew(handle, own);
}
+///
+/// Constructor
+/// Since EFL 1.23.
+///
+/// The .
+/// The interface name.
public Proxy(eldbus.Object obj, string _interface)
{
InitNew(eldbus_proxy_get(obj.Handle, _interface), true);
}
+/// Finalizes with garbage collector.
+/// Since EFL 1.23.
+///
~Proxy()
{
Dispose(false);
}
+/// Disposes of this list.
+/// Since EFL 1.23.
+///
+/// Whether this was called from the finalizer
(false) or from the
+/// method.
protected virtual void Dispose(bool disposing)
{
IntPtr h = Handle;
@@ -126,17 +146,28 @@ public class Proxy : IDisposable
}
}
+/// Disposes of this list.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Free()
{
Dispose();
}
+///
+/// Releases the native handler.
+/// Since EFL 1.23.
+///
+/// The native handler.
public IntPtr Release()
{
IntPtr h = Handle;
--
[EGIT] [core/efl] master 02/05: csharp: updating eldbus_object docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=351b9650dfc456ebdf001c08347a65d5d4b70742
commit 351b9650dfc456ebdf001c08347a65d5d4b70742
Author: Bruno da Silva Belo
Date: Thu Oct 17 14:49:15 2019 -0300
csharp: updating eldbus_object docs and hide api.
Summary: ref T8361
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8361
Differential Revision: https://phab.enlightenment.org/D10426
---
src/bindings/mono/eldbus_mono/eldbus_object.cs | 110 -
1 file changed, 106 insertions(+), 4 deletions(-)
diff --git a/src/bindings/mono/eldbus_mono/eldbus_object.cs
b/src/bindings/mono/eldbus_mono/eldbus_object.cs
index d86ad6cc61..7c7e325a5e 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_object.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_object.cs
@@ -1,7 +1,7 @@
-
#pragma warning disable 1591
using System.Runtime.InteropServices;
+using System.ComponentModel;
using static eldbus.EldbusObjectNativeFunctions;
@@ -10,6 +10,7 @@ using IntPtr = System.IntPtr;
namespace eldbus
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class EldbusObjectNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern IntPtr
@@ -83,15 +84,18 @@ public static class EldbusObjectNativeFunctions
}
/// Represents a DBus object.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Object : System.IDisposable
{
-
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get;set;} = IntPtr.Zero;
+/// Whether this managed list owns the native one.
+/// Since EFL 1.23.
+///
public bool Own {get;set;} = true;
+[EditorBrowsable(EditorBrowsableState.Never)]
private void InitNew(IntPtr handle, bool own)
{
Handle = handle;
@@ -107,11 +111,21 @@ public class Object : System.IDisposable
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public Object(IntPtr handle, bool own)
{
InitNew(handle, own);
}
+///
+/// Constructor.
+/// Since EFL 1.23.
+///
+/// where object
+/// belongs.
+/// The name of the bus or unique id who listens for
calls
+/// of this object
+/// The object path of this object.
public Object(eldbus.Connection conn, string bus, string path)
{
if (conn == null)
@@ -139,11 +153,20 @@ public class Object : System.IDisposable
InitNew(handle, true);
}
+/// Finalizes with garbage collector.
+/// Since EFL 1.23.
+///
~Object()
{
Dispose(false);
}
+
+/// Disposes of this list.
+/// Since EFL 1.23.
+///
+/// Whether this was called from the finalizer
(false) or from the
+/// method.
protected virtual void Dispose(bool disposing)
{
IntPtr h = Handle;
@@ -166,17 +189,28 @@ public class Object : System.IDisposable
}
}
+/// Disposes of this list.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
System.GC.SuppressFinalize(this);
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Free()
{
Dispose();
}
+///
+/// Releases the native handler.
+/// Since EFL 1.23.
+///
+/// The native handler.
public IntPtr Release()
{
IntPtr h = Handle;
@@ -184,6 +218,12 @@ public class Object : System.IDisposable
return h;
}
+///
+/// Get the object associated with a
+///
+/// Since EFL 1.23.
+///
+/// The object
public eldbus.Connection GetConnection()
{
CheckHandle();
@@ -197,6 +237,12 @@ public class Object : System.IDisposable
return new eldbus.Connection(conn, false);
}
+///
+/// Get the name associated with a
+/// Since EFL 1.23.
+///
+/// A string corresponding to the
+/// name
public string GetBusName()
{
CheckHandle();
@@ -204,6 +250,12 @@ public class Object : System.IDisposable
return Eina.StringConversion.NativeUtf8ToManagedString(ptr);
}
+///
+/// Get the path associated with a
+/// Since EFL 1.23.
+///
+/// A string corresponding to the
+/// path.
public string GetPath()
{
CheckHandle();
@@ -211,18 +263,37 @@ public class Object : System.IDisposable
return Eina.StringConversion.NativeUtf8ToManagedString(ptr);
}
+///
+/// Increse object reference
+/// Since EFL 1.23.
+///
public void Ref()
{
CheckHandle();
eldbus_object_ref(Handle);
}
+///
+/// Decrease object reference.
+/// If reference == 0 object
[EGIT] [core/efl] master 03/05: csharp: updating eldbus_pending docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=62a773c17e71e297b816bb902b560daa1005619a
commit 62a773c17e71e297b816bb902b560daa1005619a
Author: Bruno da Silva Belo
Date: Thu Oct 17 15:25:17 2019 -0300
csharp: updating eldbus_pending docs and hide api.
Summary: ref T8361
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8361
Differential Revision: https://phab.enlightenment.org/D10427
---
src/bindings/mono/eldbus_mono/eldbus_pending.cs | 41 +++--
1 file changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/bindings/mono/eldbus_mono/eldbus_pending.cs
b/src/bindings/mono/eldbus_mono/eldbus_pending.cs
index 3570ca1842..7fbaf62034 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_pending.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_pending.cs
@@ -2,12 +2,14 @@
using System;
using System.Runtime.InteropServices;
+using System.ComponentModel;
using static eldbus.EldbusPendingNativeFunctions;
namespace eldbus
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class EldbusPendingNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern void
@@ -42,12 +44,15 @@ public static class EldbusPendingNativeFunctions
}
/// Represents a DBus pending.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Pending
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get;set;} = IntPtr.Zero;
+/// Whether this managed list owns the native one.
+/// Since EFL 1.23.
+///
public bool Own {get;set;} = true;
private void InitNew(IntPtr handle, bool own)
@@ -65,11 +70,17 @@ public class Pending
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public Pending(IntPtr handle, bool own)
{
InitNew(handle, own);
}
+///
+/// Releases the native handler.
+/// Since EFL 1.23.
+///
+/// The native handler.
public IntPtr Release()
{
IntPtr h = Handle;
@@ -77,12 +88,22 @@ public class Pending
return h;
}
+///
+/// Cancel the pending message.
+/// Since EFL 1.23.
+///
public void Cancel()
{
CheckHandle();
eldbus_pending_cancel(Handle);
}
+///
+/// Get the destination of the pending message.
+/// Since EFL 1.23.
+///
+/// A string corresponding to the destination of the
+/// message
public string GetDestination()
{
CheckHandle();
@@ -90,6 +111,11 @@ public class Pending
return Eina.StringConversion.NativeUtf8ToManagedString(ptr);
}
+///
+/// Get the path of the pending message.
+/// Since EFL 1.23.
+///
+/// A string corresponding to the path of the message.
public string GetPath()
{
CheckHandle();
@@ -97,6 +123,12 @@ public class Pending
return Eina.StringConversion.NativeUtf8ToManagedString(ptr);
}
+///
+/// Get the interface of the pending message.
+/// Since EFL 1.23.
+///
+/// A string corresponding to the interface of the
+/// message.
public string GetInterface()
{
CheckHandle();
@@ -104,6 +136,11 @@ public class Pending
return Eina.StringConversion.NativeUtf8ToManagedString(ptr);
}
+///
+/// Get the method of the pending message.
+/// Since EFL 1.23.
+///
+/// A string corresponding to the method of the message.
public string GetMethod()
{
CheckHandle();
--
[EGIT] [core/efl] master 03/03: csharp: Updating eldbus_common docs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4885e0764d6ea0ed542b90f9e02dd1eb5d1fa8d7
commit 4885e0764d6ea0ed542b90f9e02dd1eb5d1fa8d7
Author: Bruno da Silva Belo
Date: Wed Oct 16 11:26:03 2019 -0300
csharp: Updating eldbus_common docs.
Summary: ref T8361
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8361
Differential Revision: https://phab.enlightenment.org/D10416
---
src/bindings/mono/eldbus_mono/eldbus_common.cs | 663 -
1 file changed, 661 insertions(+), 2 deletions(-)
diff --git a/src/bindings/mono/eldbus_mono/eldbus_common.cs
b/src/bindings/mono/eldbus_mono/eldbus_common.cs
index 80b1e25c60..99a7aef6e5 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_common.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_common.cs
@@ -2,182 +2,466 @@
using System;
using System.Runtime.InteropServices;
+using System.ComponentModel;
using static eldbus.EldbusMessageNativeFunctions;
namespace eldbus
{
-
+///
+/// Representation for Timeout flags.
+/// Since EFL 1.23.
+///
public static class Timeout
{
+///
+/// Infinite flag.
+/// Since EFL 1.23.
+///
public const int Infinite = 0x7fff;
}
+///
+/// The path to an object.
+/// Since EFL 1.23.
+///
[StructLayout(LayoutKind.Sequential)]
public struct ObjectPath
{
+///
+/// The string of the path.
+/// Since EFL 1.23.
+///
public string value;
+///
+/// Constructor
+/// Since EFL 1.23.
+///
+/// The string of the path.
public ObjectPath(string str)
{
value = str;
}
+///
+/// Conversion operator of ObjectPath from string.
+/// Since EFL 1.23.
+///
+/// The string of the path.
public static implicit operator ObjectPath(string str)
{
return new ObjectPath(str);
}
+///
+/// Conversion operator of string from ObjectPath.
+/// Since EFL 1.23.
+///
+/// The ObjectPath to be converted.
public static implicit operator string(ObjectPath path)
{
return path.value;
}
}
+///
+/// String to a signature.
+/// Since EFL 1.23.
+///
[StructLayout(LayoutKind.Sequential)]
public struct SignatureString
{
+///
+/// The string of the signature.
+/// Since EFL 1.23.
+///
public string value;
+///
+/// Constructor.
+/// Since EFL 1.23.
+///
+/// The string of the signature.
public SignatureString(string str)
{
value = str;
}
+///
+/// Conversion operator of SignatureString from string.
+/// Since EFL 1.23.
+///
+/// The string of the signature.
public static implicit operator SignatureString(string str)
{
return new SignatureString(str);
}
+///
+/// Conversion operator of string from SignatureString.
+/// Since EFL 1.23.
+///
+/// The SignatureString to be conversion.
public static implicit operator string(SignatureString sig)
{
return sig.value;
}
}
+///
+/// Representation for Unix file descriptor.
+/// Since EFL 1.23.
+///
[StructLayout(LayoutKind.Sequential)]
public struct UnixFd
{
+///
+/// The value of the file descriptor.
+/// Since EFL 1.23.
+///
public Int32 value;
+///
+/// Constructor.
+/// Since EFL 1.23.
+///
+/// The file descriptor.
public UnixFd(Int32 fd)
{
value = fd;
}
+///
+/// Conversion operator of UnixFd from Int32.
+/// Since EFL 1.23.
+///
+/// The file descriptor.
public static implicit operator UnixFd(Int32 fd)
{
return new UnixFd(fd);
}
+///
+/// Conversion operator of Int32 from UnixFd.
+/// Since EFL 1.23.
+///
+/// The UnixFd to be converted.
public static implicit operator Int32(UnixFd unix_fd)
{
return unix_fd.value;
}
}
-
+///
+/// Arguments of EldBus.
+/// Since EFL 1.23.
+///
public static class Argument
{
+///
+/// The type of a byte.
+/// Since EFL 1.23.
+///
public class ByteType
{
+///
+/// The code of the byte.
+/// Since EFL 1.23.
+///
public const char Code = 'y';
+///
+/// The signature of the byte.
+/// Since EFL 1.23.
+///
public const string Signature = "y";
}
+///
+/// The type of a boolean
+/// Since EFL 1.23.
+///
public class BooleanType
{
+///
+/// The code of the boolean.
+/// Since EFL 1.23.
+///
public const char Code = 'b';
+///
+/// The signature of the boolean.
+/// Sinc
[EGIT] [core/efl] master 02/03: csharp: updating eldbus_config docs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2ace33915b61339a8dcf0be046a8243310041241
commit 2ace33915b61339a8dcf0be046a8243310041241
Author: Bruno da Silva Belo
Date: Wed Oct 16 11:00:29 2019 -0300
csharp: updating eldbus_config docs.
Summary: ref T8361
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8361
Differential Revision: https://phab.enlightenment.org/D10417
---
src/bindings/mono/eldbus_mono/eldbus_config.cs | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/bindings/mono/eldbus_mono/eldbus_config.cs
b/src/bindings/mono/eldbus_mono/eldbus_config.cs
index b0a0c1fd13..f42452e2fb 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_config.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_config.cs
@@ -7,14 +7,17 @@ namespace eldbus
{
/// Initializes Eldbus.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public static class Config
{
[DllImport(efl.Libs.Eldbus)] private static extern int eldbus_init();
[DllImport(efl.Libs.Eldbus)] private static extern int eldbus_shutdown();
+///
+/// Initialization of the eldbus.
+/// Since EFL 1.23.
+///
public static void Init()
{
if (eldbus_init() == 0)
@@ -23,6 +26,10 @@ public static class Config
}
}
+///
+/// Shutdown the eldbus.
+/// Since EFL 1.23.
+///
public static void Shutdown()
{
eldbus_shutdown();
--
[EGIT] [core/efl] master 01/03: csharp: updating eldbus_connection docs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e6bffe1e2b65eb4625a16c32fee0d37b2c2aafc8
commit e6bffe1e2b65eb4625a16c32fee0d37b2c2aafc8
Author: Bruno da Silva Belo
Date: Wed Oct 16 10:50:10 2019 -0300
csharp: updating eldbus_connection docs.
Summary: ref T8361
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8361
Differential Revision: https://phab.enlightenment.org/D10418
---
src/bindings/mono/eldbus_mono/eldbus_connection.cs | 151 -
1 file changed, 147 insertions(+), 4 deletions(-)
diff --git a/src/bindings/mono/eldbus_mono/eldbus_connection.cs
b/src/bindings/mono/eldbus_mono/eldbus_connection.cs
index 18ec10f32a..6a75bb97ee 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_connection.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_connection.cs
@@ -2,12 +2,14 @@
using System;
using System.Runtime.InteropServices;
+using System.ComponentModel;
using static eldbus.EldbusConnectionNativeFunctions;
namespace eldbus
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class EldbusConnectionNativeFunctions
{
[DllImport(efl.Libs.Eldbus)] public static extern IntPtr
@@ -89,22 +91,55 @@ public static class EldbusConnectionNativeFunctions
}
/// Represents a DBus connection.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Connection : IDisposable
{
+///
+/// The type of the Connection.
+/// Since EFL 1.23.
+///
public enum Type
{
+///
+/// Unknown type.
+/// It's a sentinel.
+/// Since EFL 1.23.
+///
Unknown = 0, // sentinel, not a real type
+///
+/// Session type.
+/// Since EFL 1.23.
+///
Session,
+///
+/// System type.
+/// Since EFL 1.23.
+///
System,
+///
+/// Starter type.
+/// Since EFL 1.23.
+///
Starter,
+///
+/// Address type.
+/// Since EFL 1.23.
+///
Address,
+///
+/// Last type.
+/// It's a sentinel.
+/// Since EFL 1.23.
+///
Last // sentinel, not a real type
};
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get;set;} = IntPtr.Zero;
+/// Whether this wrapper owns the native handle.
+/// Since EFL 1.23.
+///
public bool Own {get;set;} = true;
private void InitNew(IntPtr handle, bool own)
@@ -122,38 +157,67 @@ public class Connection : IDisposable
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public Connection(IntPtr handle, bool own)
{
InitNew(handle, own);
}
-
+///
+/// Constructor.
+/// Since EFL 1.23.
+///
+/// The type of the connection.
public Connection(eldbus.Connection.Type type)
{
InitNew(eldbus_connection_get(type), true);
}
+///
+/// Constructor.
+/// Since EFL 1.23.
+///
+/// The address of the connection.
public Connection(string address)
{
InitNew(eldbus_address_connection_get(address), true);
}
+///
+/// Gets a Connection with a type.
+/// Since EFL 1.23.
+///
+///
+/// A Connection with the type.
public static eldbus.Connection GetPrivate(eldbus.Connection.Type type)
{
return new eldbus.Connection(eldbus_private_connection_get(type),
true);
}
+///
+/// Gets a Connection with a address.
+/// Since EFL 1.23.
+///
+/// The address of the connection.
public static eldbus.Connection GetPrivate(string address)
{
return new
eldbus.Connection(eldbus_private_address_connection_get(address), true);
}
-
+///
+/// Finalizer to be called from the Garbage Collector.
+/// Since EFL 1.23.
+///
~Connection()
{
Dispose(false);
}
+/// Disposes of this wrapper, releasing the native array if owned.
+/// Since EFL 1.23.
+///
+/// True if this was called from public method. False if
+/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
{
IntPtr h = Handle;
@@ -176,17 +240,28 @@ public class Connection : IDisposable
}
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Free()
{
Dispose();
}
+///
+/// Releases the native handler.
+/// Since EFL 1.23
[EGIT] [core/efl] master 01/03: csharp: updating Factory docs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=902ea935e4df7115a5b0577053045a8581b56e5e
commit 902ea935e4df7115a5b0577053045a8581b56e5e
Author: Bruno da Silva Belo
Date: Mon Oct 14 18:01:30 2019 -0300
csharp: updating Factory docs.
Summary: ref T8345
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8345
Differential Revision: https://phab.enlightenment.org/D10375
---
src/bindings/mono/efl_mono/Factory.cs | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bindings/mono/efl_mono/Factory.cs
b/src/bindings/mono/efl_mono/Factory.cs
index 2c9f139ca7..be429fd12a 100644
--- a/src/bindings/mono/efl_mono/Factory.cs
+++ b/src/bindings/mono/efl_mono/Factory.cs
@@ -14,13 +14,12 @@ namespace Efl { namespace Ui {
/// var factory = Efl.Ui.FactoryEfl.Ui.Button();
/// factory.Style().Bind("Name"); // The factory Style property is bound to
the Name property for the given model.
///
-///
-/// Since EFL 1.23.
-///
///
public class ItemFactory : Efl.Ui.LayoutFactory, IDisposable
{
-/// Creates a new factory.
+/// Creates a new factory.
+///
+/// The parent of the factory.
public ItemFactory(Efl.Object parent = null)
: base (parent, typeof(T))
{
--
[EGIT] [core/efl] master 03/03: csharp: updating GenericModel.cs docs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0cfcfd30987f74130d840162f8e09ce7830e460b
commit 0cfcfd30987f74130d840162f8e09ce7830e460b
Author: Bruno da Silva Belo
Date: Mon Oct 14 18:33:01 2019 -0300
csharp: updating GenericModel.cs docs.
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8345
Differential Revision: https://phab.enlightenment.org/D10376
---
src/bindings/mono/efl_mono/GenericModel.cs | 37 --
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/bindings/mono/efl_mono/GenericModel.cs
b/src/bindings/mono/efl_mono/GenericModel.cs
index b9ef325750..2da3da6803 100644
--- a/src/bindings/mono/efl_mono/GenericModel.cs
+++ b/src/bindings/mono/efl_mono/GenericModel.cs
@@ -15,8 +15,6 @@ namespace Efl {
/// It provides an expanded API like async helpers to get
children.
///
/// For MVVM-based models,
provides a simpler API.
-///
-/// Since EFL 1.24.
///
/// The type of the child model. It is the type used when
adding/removing/getting items to this
/// model.
@@ -25,6 +23,8 @@ public class GenericModel : Efl.Object, Efl.IModel,
IDisposable
private Efl.IModel model;
/// Creates a new model wrapping model.
+ /// The model to be wrapped.
+ /// The parent of the model.
public GenericModel (Efl.IModel model, Efl.Object parent = null) :
base(parent)
{
this.model = model;
@@ -43,42 +43,57 @@ public class GenericModel : Efl.Object, Efl.IModel,
IDisposable
}
/// The list of properties available in the wrapped
model.
+ /// The list of properties in the model.
public Eina.Iterator GetProperties()
{
return model.GetProperties();
}
/// Gets the value of the given property in the wrapped
model.
+ /// The property of the model.
+ /// The value of the property.
public Eina.Value GetProperty( System.String property)
{
return model.GetProperty(property);
}
/// Sets the value of the given property in the given
model.
+ /// The property of the model.
+ /// The value of the property.
+ /// An that resolves when the property
has
+ /// been set or reports an error if it could not be set.
public Eina.Future SetProperty( System.String property, Eina.Value value)
{
return model.SetProperty(property, value);
}
/// Returns the number of children in the wrapped model.
+ /// The number of children.
public uint GetChildrenCount()
{
return model.GetChildrenCount();
}
/// Returns an that will resolve when
the property is ready to be read.
+ /// The property of the model.
+ /// An that resolves when the property
is ready.
public Eina.Future GetPropertyReady( System.String property)
{
return model.GetPropertyReady(property);
}
/// Gets a number of children from the wrapped model.
+ /// The start of the range.
+ /// The size of the range.
+ /// An that resolves to an
+ /// of children models.
public Eina.Future GetChildrenSlice( uint start, uint count)
{
return model.GetChildrenSlice(start, count);
}
/// Adds a new object to the wrapper model.
+ /// The object to get the properties from.
public void Add(T o)
{
Efl.IModel child = (Efl.IModel)this.AddChild();
@@ -86,18 +101,22 @@ public class GenericModel : Efl.Object, Efl.IModel,
IDisposable
}
/// Adds a new child to the model and returns it.
+ /// The object to be wrapped.
public Efl.Object AddChild()
{
return model.AddChild();
}
/// Deletes the given child from the wrapped
model.
+ /// The child to be deleted.
public void DelChild( Efl.Object child)
{
model.DelChild(child);
}
/// Gets the element at the specified index.
+ /// The position of the element.
+ /// Token to notify the async operation of external request to
cancel.
async public System.Threading.Tasks.Task GetAtAsync(uint index)
{
using (Eina.Value v = await GetChildrenSliceAsync(index, 1))
@@ -117,18 +136,32 @@ public class GenericModel : Efl.Object, Efl.IModel,
IDisposable
}
/// Async wrapper around .
+ /// The property to be added.
+ /// The value of the property.
+ /// The token for the task's cancellation.
+ /// Task that resolves when the property has been set or could not
+ /// be set.
public System.Threading.Tasks.Task SetPropertyAsync(
System.String property, Eina.Value value, System.Threading.CancellationToken
token=default(System.Threading.CancellationToken))
{
return model.SetPropertyAsync(property, value, token);
}
/// Async wrapper around .
+ /// The property of the model.
+ /// The token for the task's cancellation.
+ /// Task
[EGIT] [core/efl] master 02/03: csharp: updating Bind docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=53e1d3ad08cda904bd52e1e1fc187bc8315f3693
commit 53e1d3ad08cda904bd52e1e1fc187bc8315f3693
Author: Bruno da Silva Belo
Date: Mon Oct 14 18:27:49 2019 -0300
csharp: updating Bind docs and hide api.
Summary: ref T8345
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8345
Differential Revision: https://phab.enlightenment.org/D10374
---
src/bindings/mono/efl_mono/Bind.cs | 59 +++---
1 file changed, 43 insertions(+), 16 deletions(-)
diff --git a/src/bindings/mono/efl_mono/Bind.cs
b/src/bindings/mono/efl_mono/Bind.cs
index c4aec5b5e1..2a4fcbded5 100644
--- a/src/bindings/mono/efl_mono/Bind.cs
+++ b/src/bindings/mono/efl_mono/Bind.cs
@@ -12,13 +12,15 @@ namespace Efl {
/// Represents a bindable property as used by instances.
///
/// It is internally instantiated and returned by generated extension
methods.
-///
-/// Since EFL 1.23.
///
public class BindableProperty
{
-/// Creates a new bindable property with the source name
name.
+/// Creates a new bindable property with the source name
+/// name.
+///
+/// The property name of the bind.
+/// The binder that will be used to bind the
properties.
public BindableProperty(string name, Efl.Ui.IPropertyBind binder)
{
this.propertyName = name;
@@ -26,7 +28,11 @@ public class BindableProperty
this.binder = binder;
}
-/// Creates a new bindable property for part
part.
+/// Creates a new bindable property for part part.
+///
+/// The name of the part this instance
wraps.
+/// The property name of the bind.
+/// Yhe binder that will be used to bind the
properties.
public BindableProperty(string partName, string partProperty,
Efl.Ui.IPropertyBind binder)
{
this.partName = partName;
@@ -34,7 +40,10 @@ public class BindableProperty
this.binder = binder;
}
-/// Binds the model property modelProperty to the property
name set in the constructor.
+/// Binds the model property modelProperty to the property
+/// name set in the constructor.
+///
+/// The model property
public Eina.Error Bind(string modelProperty)
{
if (this.partName == null)
@@ -70,52 +79,69 @@ public class BindableProperty
}
}
+///
+/// The property name of the bind.
+///
string propertyName;
+///
+/// The name of the part this instance wraps.
+///
string partName;
+///
+/// The binder that will be used to bind the properties.
+///
Efl.Ui.IPropertyBind binder;
}
/// Represents bindable parts as used by instances.
///
/// It is internally instantiated and returned by generated extension
methods.
-///
-/// Since EFL 1.23.
///
public class BindablePart
{
-/// Creates a new bindable property with the binder
binder.
+/// Creates a new bindable property with the binder binder.
+///
+/// The name of the part this instance
wraps.
+/// Yhe binder that will be used to bind the
properties.
public BindablePart(string partName, Efl.Ui.IPropertyBind binder)
{
this.PartName = partName;
this.Binder = binder;
}
-/// The name of the part this instance wraps.
+/// The name of the part this instance wraps.
+///
public string PartName { get; private set; }
-/// The binder that will be used to bind the properties.
+/// The binder that will be used to bind the properties.
+///
public Efl.Ui.IPropertyBind Binder { get; private set; }
}
/// Represents bindable factory parts as used by instances.
-///
-/// Since EFL 1.23.
///
public class BindableFactoryPart
{
-/// Creates a new bindable factory part with the binder
binder.
+/// Creates a new bindable factory part with the binder
binder.
+///
+/// The name of the part this instance
wraps.
+/// Yhe binder that will be used to bind the
properties.
public BindableFactoryPart(string partName, Efl.Ui.IFactoryBind binder)
{
this.PartName = partName;
this.Binder = binder;
}
-/// The name of the part this instance wraps.
+/// The name of the part this instance wraps.
+///
public string PartName { get; private set; }
-/// The binder that will be used to bind the properties.
+/// The binder that will be used to bind the properties.
+///
public Efl.Ui.IFactoryBind Binder { get; private set; }
-/// Binds the given factory to this part.
+/// Binds the given factory to this part.
+///
+/// The factory to be used.
public Eina.Error BindFactory(Efl.Ui.IFactory factory)
{
return
[EGIT] [core/efl] master 01/03: csharp: updating eina_config docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8ba2638f0ea0e5542cb93d9880e3b0740b8d325e
commit 8ba2638f0ea0e5542cb93d9880e3b0740b8d325e
Author: Bruno da Silva Belo
Date: Mon Oct 14 12:23:56 2019 -0300
csharp: updating eina_config docs and hide api.
Reviewers: felipealmeida, lauromoura, woohyun, segfaultxavi
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10312
---
src/bindings/mono/eina_mono/eina_config.cs | 34 +-
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_config.cs
b/src/bindings/mono/eina_mono/eina_config.cs
index 1b57da029c..833b7d5da8 100644
--- a/src/bindings/mono/eina_mono/eina_config.cs
+++ b/src/bindings/mono/eina_mono/eina_config.cs
@@ -2,20 +2,24 @@
using System;
using System.Runtime.InteropServices;
+using System.ComponentModel;
namespace Eina
{
///
/// Manage the initialization and cleanup for eina.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Config
{
[DllImport(efl.Libs.Eina)] private static extern int eina_init();
[DllImport(efl.Libs.Eina)] private static extern int eina_shutdown();
+///
+/// Initialize the Eina library.
+/// Since EFL 1.23.
+///
public static void Init()
{
if (eina_init() == 0)
@@ -24,6 +28,10 @@ public class Config
}
}
+///
+/// Finalize the Eina library.
+/// Since EFL 1.23.
+///
public static int Shutdown()
{
return eina_shutdown();
@@ -33,29 +41,41 @@ public class Config
///
/// Wrapper class for pointers that need some cleanup afterwards like strings
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class DisposableIntPtr : IDisposable
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle { get; set; }
private bool ShouldFree;
private bool Disposed;
/// Wraps a new ptr what will be freed based on the
-/// value of shouldFree
+/// value of shouldFree
+/// Since EFL 1.23.
+///
public DisposableIntPtr(IntPtr ptr, bool shouldFree = false)
{
Handle = ptr;
ShouldFree = shouldFree;
}
+
+/// Release the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
+/// Disposes of this wrapper, releasing the native handle if
+/// owned.
+/// Since EFL 1.23.
+///
+/// True if this was called from public method. False if
+/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
{
if (!Disposed && ShouldFree)
@@ -66,6 +86,10 @@ public class DisposableIntPtr : IDisposable
Disposed = true;
}
+
+/// Release the native resources held by this instance.
+/// Since EFL 1.23.
+///
~DisposableIntPtr()
{
Dispose(false);
--
[EGIT] [core/efl] master 02/03: csharp: updating eina_common docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=def27320b3e798ad0a822edc9980b75d539c2ea3
commit def27320b3e798ad0a822edc9980b75d539c2ea3
Author: Bruno da Silva Belo
Date: Mon Oct 14 16:36:25 2019 -0300
csharp: updating eina_common docs and hide api.
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10311
---
src/bindings/mono/eina_mono/eina_common.cs | 31 ++
1 file changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_common.cs
b/src/bindings/mono/eina_mono/eina_common.cs
index 77ed8b719e..badd62ecfa 100644
--- a/src/bindings/mono/eina_mono/eina_common.cs
+++ b/src/bindings/mono/eina_mono/eina_common.cs
@@ -3,6 +3,7 @@
using System;
using System.Text;
using System.Runtime.InteropServices;
+using System.ComponentModel;
namespace Eina
{
@@ -11,7 +12,7 @@ namespace Callbacks
{
internal delegate int EinaCompareCb(IntPtr data1, IntPtr data2);
-public delegate void EinaFreeCb(IntPtr data);
+internal delegate void EinaFreeCb(IntPtr data);
}
@@ -42,9 +43,9 @@ internal static class NativeCustomExportFunctions
}
/// Wrapper around native memory DllImport'd functions.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class MemoryNative
{
public static void Free(IntPtr ptr)
@@ -78,6 +79,13 @@ public static class MemoryNative
return NativeCustomExportFunctions.efl_mono_native_strdup(str);
}
+///
+/// Retrieves an instance of a string for use in program.
+/// Since EFL 1.23.
+///
+/// The NULL-terminated string to retrieve an instance
of.
+/// A pointer to an instance of the string on success,
+/// on failure a exception is raised.
public static IntPtr AddStringshare(string str)
{
IntPtr nativeStr =
StringConversion.ManagedStringToNativeUtf8Alloc(str);
@@ -92,6 +100,10 @@ public static class MemoryNative
}
}
+///
+/// Notes that the given string has lost an instance.
+///
+/// the given string
public static void DelStringshare(IntPtr str)
{
NativeMethods.eina_stringshare_del(str);
@@ -131,9 +143,9 @@ public static class MemoryNative
///
/// Conversor of raw pointer to a type and type to raw pointer
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class PrimitiveConversion
{
public static T PointerToManaged(IntPtr nat)
@@ -158,9 +170,9 @@ public static class PrimitiveConversion
///
/// Conversor of string to native string and native string to string.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class StringConversion
{
public static IntPtr ManagedStringToNativeUtf8Alloc(string managedString)
@@ -204,7 +216,10 @@ public static class StringConversion
}
}
-/// Enum to handle resource ownership between managed and unmanaged
code.
+/// Enum to handle resource ownership between managed and unmanaged
code.
+/// Since EFL 1.23.
+///
+[EditorBrowsable(EditorBrowsableState.Never)]
public enum Ownership
{
/// The resource is owned by the managed code. It should free
the handle on disposal.
--
[EGIT] [core/efl] master 03/03: csharp: Updating eina_array docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=66a26a378bb380350f4e6a26e42f95e43e206194
commit 66a26a378bb380350f4e6a26e42f95e43e206194
Author: Bruno da Silva Belo
Date: Mon Oct 14 17:02:45 2019 -0300
csharp: Updating eina_array docs and hide api.
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10309
---
src/bindings/mono/eina_mono/eina_array.cs | 68 +--
1 file changed, 55 insertions(+), 13 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_array.cs
b/src/bindings/mono/eina_mono/eina_array.cs
index 0b96920fbd..617664b34e 100644
--- a/src/bindings/mono/eina_mono/eina_array.cs
+++ b/src/bindings/mono/eina_mono/eina_array.cs
@@ -3,6 +3,7 @@
using System;
using System.Runtime.InteropServices;
using System.Collections.Generic;
+using System.ComponentModel;
using static Eina.TraitFunctions;
using static Eina.ArrayNativeFunctions;
@@ -10,6 +11,7 @@ using static Eina.ArrayNativeFunctions;
namespace Eina
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class ArrayNativeFunctions
{
[DllImport(efl.Libs.Eina)] public static extern IntPtr
@@ -46,20 +48,27 @@ public static class ArrayNativeFunctions
}
/// A container of contiguous allocated elements.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Array : IEnumerable, IDisposable
{
public static uint DefaultStep = 32;
/// Pointer to the native buffer.
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get;set;} = IntPtr.Zero;
-///Whether this wrapper owns the native buffer.
+/// Whether this wrapper owns the native buffer.
+/// Since EFL 1.23.
+///
public bool Own {get;set;}
-/// Who is in charge of releasing the resources wrapped by this
instance.
+/// Who is in charge of releasing the resources wrapped by
+/// this instance.
+/// Since EFL 1.23.
+///
public bool OwnContent {get;set;}
-/// Length of the array.
+/// Length of the array.
+/// Since EFL 1.23.
+///
public int Length
{
get { return Count(); }
@@ -98,6 +107,7 @@ public class Array : IEnumerable, IDisposable
///
/// Create a new array.
+/// Since EFL 1.23.
///
public Array()
{
@@ -106,6 +116,7 @@ public class Array : IEnumerable, IDisposable
///
/// Create a new array.
+/// Since EFL 1.23.
///
/// Step size of the array.
public Array(uint step)
@@ -118,6 +129,7 @@ public class Array : IEnumerable, IDisposable
///
/// The native handle to be wrapped.
/// Whether this wrapper owns the native handle.
+[EditorBrowsable(EditorBrowsableState.Never)]
public Array(IntPtr handle, bool own)
{
if (handle == IntPtr.Zero)
@@ -131,11 +143,12 @@ public class Array : IEnumerable, IDisposable
}
///
-/// Create a new array
+/// Create a new array.
///
/// The native array to be wrapped.
/// Whether this wrapper owns the native array.
/// For compatibility with other EFL#
containers.
+[EditorBrowsable(EditorBrowsableState.Never)]
public Array(IntPtr handle, bool own, bool ownContent)
{
if (handle == IntPtr.Zero)
@@ -150,12 +163,15 @@ public class Array : IEnumerable, IDisposable
///
/// Finalizer to be called from the Garbage Collector.
+/// Since EFL 1.23.
///
~Array()
{
Dispose(false);
}
-/// Disposes of this wrapper, releasing the native array if
owned.
+/// Disposes of this wrapper, releasing the native array if owned.
+/// Since EFL 1.23.
+///
/// True if this was called from public method. False if
/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
@@ -189,14 +205,18 @@ public class Array : IEnumerable, IDisposable
}
}
-/// Releases the native resources held by this instance.
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
-/// Releases the native resources held by this instance.
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Free()
{
Dispose();
@@ -204,6 +224,7 @@ public class Array : IEnumerable, IDisposable
///
/// Releases the native array.
+/// Since EFL 1.23.
///
/// The native array.
public IntPtr Release()
@@ -227,6 +248,7 @@ public class Array : IEnumerable, IDisposable
///
/// Clears an array's elements and deallocates
[EGIT] [core/efl] master 01/05: csharp: updating eina_log docs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0477a7256091425ab845160f2b14bef264fcd7ed
commit 0477a7256091425ab845160f2b14bef264fcd7ed
Author: Bruno da Silva Belo
Date: Mon Oct 14 10:26:02 2019 -0300
csharp: updating eina_log docs.
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10352
---
src/bindings/mono/eina_mono/eina_log.cs | 121
1 file changed, 91 insertions(+), 30 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_log.cs
b/src/bindings/mono/eina_mono/eina_log.cs
index 5782ef6466..2671971550 100644
--- a/src/bindings/mono/eina_mono/eina_log.cs
+++ b/src/bindings/mono/eina_mono/eina_log.cs
@@ -10,8 +10,7 @@ namespace Eina
// Manual wrappers around eina functions
/// EFL Logging facilities.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Log
{
@@ -31,55 +30,97 @@ public class Log
[DllImport(efl.Libs.Eina)] private static extern Level
eina_log_level_get();
-/// The levels of logging.
+/// The levels of logging.
+/// Since EFL 1.23.
+///
public enum Level
{
-/// Critical events.
+/// Critical events.
+/// Since EFL 1.23.
+///
Critical,
-/// Error events.
+/// Error events.
+/// Since EFL 1.23.
+///
Error,
-/// Warning events.
+/// Warning events.
+/// Since EFL 1.23.
+///
Warning,
-/// Informative events.
+/// Informative events.
+/// Since EFL 1.23.
+///
Info,
-/// Debugging messages.
+/// Debugging messages.
+/// Since EFL 1.23.
+///
Debug,
-/// Unknown events.
+/// Unknown events.
+/// Since EFL 1.23.
+///
Unkown = (-2147483647 - 1)
}
-/// The colors to be used by the logging system.
+/// The colors to be used by the logging system.
+/// Since EFL 1.23.
+///
public class Color
{
-/// Light red
+/// Light red
+/// Since EFL 1.23.
+///
public static string LIGHTRED = "\033[31;1m";
-/// Red
+/// Red
+/// Since EFL 1.23.
+///
public static string RED = "\033[31m";
-/// Light blue
+/// Light blue
+/// Since EFL 1.23.
+///
public static string LIGHTBLUE = "\033[34;1m";
-/// Blue
+/// Blue
+/// Since EFL 1.23.
+///
public static string BLUE = "\033[34m";
-/// Green
+/// Green
+/// Since EFL 1.23.
+///
public static string GREEN = "\033[32;1m";
-/// Yellow
+/// Yellow
+/// Since EFL 1.23.
+///
public static string YELLOW= "\033[33;1m";
-/// Orange
+/// Orange
+/// Since EFL 1.23.
+///
public static string ORANGE= "\033[0;33m";
-/// White
+/// White
+/// Since EFL 1.23.
+///
public static string WHITE = "\033[37;1m";
-/// Light cyan
+/// Light cyan
+/// Since EFL 1.23.
+///
public static string LIGHTCYAN = "\033[36;1m";
-/// Cyan
+/// Cyan
+/// Since EFL 1.23.
+///
public static string CYAN = "\033[36m";
-/// Reset
+/// Reset
+/// Since EFL 1.23.
+///
public static string RESET = "\033[0m";
-/// Bold
+/// Bold
+/// Since EFL 1.23.
+///
public static string HIGH = "\033[1m";
}
private static int domain = -1;
-/// Static class initializer.
+/// Static class initializer.
+/// Since EFL 1.23.
+///
static Log()
{
const String name = "mono";
@@ -105,7 +146,10 @@ public class Log
}
}
-/// Prints a critical message with context info. This context is
filled automatically by the C# compiler.
+/// Prints a critical message with context info. This context is
+/// filled automatically by the C# compiler.
+/// Since EFL 1.23.
+///
/// The message to be printed.
/// The line number this method was called from.
/// The file this method was called from.
@@ -116,7 +160,10 @@ public class Log
eina_log_print(domain, Level.Critical, file, member, line, message);
}
-/// Prints an error message with context info. This context is
filled automatically by the C# compiler.
+/// Pr
[EGIT] [core/efl] master 02/05: csharp: updating eina_list docs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4eee6f560c7f42aedf59002f976d14eeea8c3143
commit 4eee6f560c7f42aedf59002f976d14eeea8c3143
Author: Bruno da Silva Belo
Date: Mon Oct 14 11:01:36 2019 -0300
csharp: updating eina_list docs.
Summary: ref T8293
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10351
---
src/bindings/mono/eina_mono/eina_list.cs | 147 +++
1 file changed, 111 insertions(+), 36 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_list.cs
b/src/bindings/mono/eina_mono/eina_list.cs
index cf787455bd..bb269db0ea 100644
--- a/src/bindings/mono/eina_mono/eina_list.cs
+++ b/src/bindings/mono/eina_mono/eina_list.cs
@@ -107,24 +107,33 @@ public static class ListNativeFunctions
}
/// Native wrapper around a linked list of items.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class List : IEnumerable, IDisposable
{
[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get;set;} = IntPtr.Zero;
-/// Whether this managed list owns the native one.
+/// Whether this managed list owns the native one.
+/// Since EFL 1.23.
+///
public bool Own {get;set;}
-/// Whether the native list wrapped owns the content it points
to.
+/// Whether the native list wrapped owns the content it points to.
+/// Since EFL 1.23.
+///
public bool OwnContent {get;set;}
-/// Delegate for comparing two elements of this list.
+/// Delegate for comparing two elements of this list.
+/// Since EFL 1.23.
+///
+/// First element.
+/// Second element.
/// -1, 0 or 1 for respectively smaller, equal or
larger.
public delegate int Compare(T a, T b);
-/// The number of elements on this list.
+/// The number of elements on this list.
+/// Since EFL 1.23.
+///
public int Length
{
get { return Count(); }
@@ -164,7 +173,9 @@ public class List : IEnumerable, IDisposable
}
-/// Creates a new empty list.
+/// Creates a new empty list.
+/// Since EFL 1.23.
+///
public List()
{
InitNew();
@@ -188,13 +199,17 @@ public class List : IEnumerable, IDisposable
OwnContent = ownContent;
}
-/// Finalizes this list.
+/// Finalizes this list.
+/// Since EFL 1.23.
+///
~List()
{
Dispose(false);
}
-/// Disposes of this list.
+/// Disposes of this list.
+/// Since EFL 1.23.
+///
/// Whether this was called from the finalizer
(false) or from the
/// method.
protected virtual void Dispose(bool disposing)
@@ -227,20 +242,26 @@ public class List : IEnumerable, IDisposable
}
}
-/// Disposes of this list.
+/// Disposes of this list.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
-/// Disposes of this list.
+/// Disposes of this list.
+/// Since EFL 1.23.
+///
public void Free()
{
Dispose();
}
-/// Relinquishes of the native list.
+/// Relinquishes of the native list.
+/// Since EFL 1.23.
+///
/// The previously wrapped native list handle.
public IntPtr Release()
{
@@ -249,27 +270,40 @@ public class List : IEnumerable, IDisposable
return h;
}
-/// Sets whether this wrapper should own the native list or
not.
+/// Sets whether this wrapper should own the native list or not.
+/// Since EFL 1.23.
+///
+/// If the hash own for all ownerships.
public void SetOwnership(bool ownAll)
{
Own = ownAll;
OwnContent = ownAll;
}
-/// Sets whether this wrapper should own the native list and its
content or not.
+/// Sets whether this wrapper should own the native list and
+/// its content or not.
+/// Since EFL 1.23.
+///
+/// If own the object.
+/// If own the content's object.
public void SetOwnership(bool own, bool ownContent)
{
Own = own;
OwnContent = ownContent;
}
-/// Returns the number of elements in this list.
+/// Returns the number of elements in this list.
+/// Since EFL 1.23.
+///
+/// The number of elements.
public int Count()
{
return (int)eina_list_count_custom_export_mono(Handle);
}
-/// Appends val to the list.
+/// Appends val to the list.
+/// Since EFL 1.23.
+///
/// The item to be appended.
public void Append(T val)
{
@@ -277,7 +311,9 @@ public class List : IEnumerable, IDisposable
Handle = eina_list_append(Handle, ele
[EGIT] [core/efl] master 05/05: csharp: updating eina_container_common doc and api
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=37e6430e462f4218672866aaa55ca4718ef522cd
commit 37e6430e462f4218672866aaa55ca4718ef522cd
Author: Bruno da Silva Belo
Date: Mon Oct 14 11:57:01 2019 -0300
csharp: updating eina_container_common doc and api
Reviewers: felipealmeida, lauromoura, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10314
---
src/bindings/mono/eina_mono/eina_container_common.cs | 19 +++
1 file changed, 19 insertions(+)
diff --git a/src/bindings/mono/eina_mono/eina_container_common.cs
b/src/bindings/mono/eina_mono/eina_container_common.cs
index 9798aff923..03a6875429 100644
--- a/src/bindings/mono/eina_mono/eina_container_common.cs
+++ b/src/bindings/mono/eina_mono/eina_container_common.cs
@@ -5,6 +5,7 @@ using System.Linq;
using System.Runtime.InteropServices;
using System.Collections.Generic;
using System.Reflection;
+using System.ComponentModel;
using Eina.Callbacks;
using static Eina.HashNativeFunctions;
@@ -15,6 +16,7 @@ using static Eina.NativeCustomExportFunctions;
namespace Eina
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public enum ElementType
{
NumericType,
@@ -23,6 +25,7 @@ public enum ElementType
ObjectType
};
+[EditorBrowsable(EditorBrowsableState.Never)]
[StructLayout(LayoutKind.Sequential)]
public struct InlistMem
{
@@ -31,6 +34,7 @@ public struct InlistMem
public IntPtr last {get;set;}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
[StructLayout(LayoutKind.Sequential)]
public struct InlistNode
{
@@ -38,6 +42,7 @@ public struct InlistNode
public T Val {get;set;}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public interface IBaseElementTraits
{
IntPtr ManagedToNativeAlloc(T man);
@@ -58,6 +63,7 @@ public interface IBaseElementTraits
IntPtr EinaHashIteratorKeyNew(IntPtr hash);
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public class StringElementTraits : IBaseElementTraits
{
public StringElementTraits()
@@ -196,6 +202,7 @@ public class StringElementTraits :
IBaseElementTraits
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public class StringshareElementTraits : IBaseElementTraits
{
public StringshareElementTraits()
@@ -335,6 +342,7 @@ public class StringshareElementTraits :
IBaseElementTraits
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public class EflObjectElementTraits : IBaseElementTraits
{
public IntPtr ManagedToNativeAlloc(T man)
@@ -492,6 +500,7 @@ public class EflObjectElementTraits :
IBaseElementTraits
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public abstract class PrimitiveElementTraits
{
private Eina.Callbacks.EinaCompareCb dlgt = null;
@@ -593,6 +602,7 @@ public abstract class PrimitiveElementTraits
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
abstract public class Primitive32ElementTraits : PrimitiveElementTraits,
IBaseElementTraits
{
private static IBaseElementTraits int32Traits = null;
@@ -631,6 +641,7 @@ abstract public class Primitive32ElementTraits :
PrimitiveElementTraits, I
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
abstract public class Primitive64ElementTraits : PrimitiveElementTraits,
IBaseElementTraits
{
private static IBaseElementTraits int64Traits = null;
@@ -669,6 +680,7 @@ abstract public class Primitive64ElementTraits :
PrimitiveElementTraits, I
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public class IntElementTraits : Primitive32ElementTraits,
IBaseElementTraits
{
override public void ManagedToNativeCopyTo(int man, IntPtr mem)
@@ -693,6 +705,7 @@ public class IntElementTraits :
Primitive32ElementTraits, IBaseElementTrait
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public class CharElementTraits : Primitive32ElementTraits,
IBaseElementTraits
{
override public void ManagedToNativeCopyTo(char man, IntPtr mem)
@@ -717,6 +730,7 @@ public class CharElementTraits :
Primitive32ElementTraits, IBaseElementTra
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public class LongElementTraits : Primitive64ElementTraits,
IBaseElementTraits
{
override public void ManagedToNativeCopyTo(long man, IntPtr mem)
@@ -741,6 +755,7 @@ public class LongElementTraits :
Primitive64ElementTraits, IBaseElementTra
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public class ShortElementTraits : Primitive32ElementTraits,
IBaseElementTraits
{
override public void ManagedToNativeCopyTo(short man, IntPtr mem)
@@ -765,6 +780,7 @@ public class ShortElementTraits :
Primitive32ElementTraits, IBaseElementT
}
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public class FloatElementTraits : Primitive32ElementTraits
[EGIT] [core/efl] master 03/05: csharp: updating eina_hash docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3be9b6a12977b8cb550ab1f44b74d5e86b251014
commit 3be9b6a12977b8cb550ab1f44b74d5e86b251014
Author: Bruno da Silva Belo
Date: Mon Oct 14 11:22:56 2019 -0300
csharp: updating eina_hash docs and hide api.
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10324
---
src/bindings/mono/eina_mono/eina_hash.cs | 160 ++-
1 file changed, 159 insertions(+), 1 deletion(-)
diff --git a/src/bindings/mono/eina_mono/eina_hash.cs
b/src/bindings/mono/eina_mono/eina_hash.cs
index f4678a1f26..04acc4f3d0 100644
--- a/src/bindings/mono/eina_mono/eina_hash.cs
+++ b/src/bindings/mono/eina_mono/eina_hash.cs
@@ -3,6 +3,7 @@
using System;
using System.Runtime.InteropServices;
using System.Collections.Generic;
+using System.ComponentModel;
using static Eina.TraitFunctions;
using static Eina.IteratorNativeFunctions;
@@ -13,6 +14,7 @@ namespace Eina
{
[StructLayout(LayoutKind.Sequential)]
+[EditorBrowsable(EditorBrowsableState.Never)]
public struct HashTupleNative
{
public IntPtr key;
@@ -20,6 +22,7 @@ public struct HashTupleNative
public uint key_length;
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class HashNativeFunctions
{
[DllImport(efl.Libs.Eina)] public static extern IntPtr
@@ -136,11 +139,24 @@ public static class HashNativeFunctions
///
public class Hash : IEnumerable>,
IDisposable
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get; set;} = IntPtr.Zero;
+/// Whether this wrapper owns the native hash.
+/// Since EFL 1.23.
+///
public bool Own {get; set;}
+/// Whether this wrapper owns the key.
+/// Since EFL 1.23.
+///
public bool OwnKey {get; set;}
+/// Whether this wrapper owns the value.
+/// Since EFL 1.23.
+///
public bool OwnValue {get; set;}
+/// Quantity of elements in the hash.
+/// Since EFL 1.23.
+///
public int Count
{
get
@@ -158,28 +174,42 @@ public class Hash :
IEnumerable>, IDi
SetOwnValue(true);
}
+/// Default constructor.
+/// Since EFL 1.23.
+///
public Hash()
{
InitNew();
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public Hash(IntPtr handle, bool own)
{
Handle = handle;
SetOwnership(own);
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public Hash(IntPtr handle, bool own, bool ownKey, bool ownValue)
{
Handle = handle;
SetOwnership(own, ownKey, ownValue);
}
+/// Default destructor.
+/// Since EFL 1.23.
+///
~Hash()
{
Dispose(false);
}
+/// Disposes of this wrapper, releasing the native accessor if
+/// owned.
+/// Since EFL 1.23.
+///
+/// True if this was called from public method. False if
+/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
{
IntPtr h = Handle;
@@ -202,17 +232,27 @@ public class Hash :
IEnumerable>, IDi
}
}
+/// Release the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
+/// Release the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Free()
{
Dispose();
}
+/// Release the pointer.
+/// Since EFL 1.23.
+///
+/// The instance.
public IntPtr Release()
{
IntPtr h = Handle;
@@ -220,16 +260,28 @@ public class Hash :
IEnumerable>, IDi
return h;
}
+/// Sets ownership.
+/// Since EFL 1.23.
+///
+/// If the hash own the object.
public void SetOwn(bool own)
{
Own = own;
}
+/// Sets key's ownership.
+/// Since EFL 1.23.
+///
+/// If the hash own the key's object.
public void SetOwnKey(bool ownKey)
{
OwnKey = ownKey;
}
+/// Sets value's ownership.
+/// Since EFL 1.23.
+///
+/// If the hash own the value's object.
public void SetOwnValue(bool ownValue)
{
OwnValue = ownValue;
@@ -240,6 +292,10 @@ public class Hash :
IEnumerable>, IDi
}
}
+/// Sets all ownership.
+/// Since EFL 1.23.
+///
+/// If the hash own for all ownerships.
public void SetOwnership(bool ownAll)
{
SetOwn(ownAll);
@@ -247,6 +303,12 @@ public class Hash :
IEnumerable>, IDi
SetOwnValue(ownAll);
}
+/// Sets own individually.
+/// Since EFL 1.23.
+///
+/// If the h
[EGIT] [core/efl] master 04/05: csharp: updating eina_error docs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e4385c084cd726667817742fb21d318a38a21acc
commit e4385c084cd726667817742fb21d318a38a21acc
Author: Bruno da Silva Belo
Date: Mon Oct 14 11:36:25 2019 -0300
csharp: updating eina_error docs.
Reviewers: felipealmeida, lauromoura, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10323
---
src/bindings/mono/eina_mono/eina_error.cs | 87 +--
1 file changed, 84 insertions(+), 3 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_error.cs
b/src/bindings/mono/eina_mono/eina_error.cs
index a1b4f1e9d9..8292295e9d 100644
--- a/src/bindings/mono/eina_mono/eina_error.cs
+++ b/src/bindings/mono/eina_mono/eina_error.cs
@@ -7,45 +7,94 @@ namespace Eina
{
/// Error codes from native Eina methods.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public struct Error : IComparable
{
int code;
+///
+/// The error's message.
+/// Since EFL 1.23.
+///
public string Message
{
get { return MsgGet(this); }
}
+///
+/// Unhandled Exception error identifier.
+/// Since EFL 1.23.
+///
public static Error UNHANDLED_EXCEPTION;
+///
+/// No error identifier.
+/// Since EFL 1.23.
+///
public static Error NO_ERROR = new Error(0);
+///
+/// Permission error identifier.
+/// Since EFL 1.23.
+///
public static Error EPERM = new Error(1);
+///
+/// No entity error identifier.
+/// Since EFL 1.23.
+///
public static Error ENOENT = new Error(2);
+///
+/// Cancelled error identifier.
+/// Since EFL 1.23.
+///
public static Error ECANCELED = new Error(125);
+///
+/// Constructor.
+/// Since EFL 1.23.
+///
+/// The value of the error.
public Error(int value)
{
code = value;
}
+///
+/// Error identifier conversion from int.
+/// Since EFL 1.23.
+///
+/// Value to be converted to Error
static public implicit operator Error(int val)
{
return new Error(val);
}
+///
+/// Int conversion from Error.
+/// Since EFL 1.23.
+///
+/// Error identifier to be converted to int
static public implicit operator int(Error error)
{
return error.code;
}
+///
+/// Compare two Errors.
+/// Since EFL 1.23.
+///
+/// Error to be compared with
+/// True with the Errors is equal, False otherwise.
public int CompareTo(Error err)
{
return code.CompareTo(err.code);
}
+///
+/// Transform the object to a string representing the object.
+/// Since EFL 1.23.
+///
+/// The string representing the value of this.
public override string ToString()
{
return "Eina.Error(" + code + ")";
@@ -61,16 +110,32 @@ public struct Error : IComparable
[DllImport(efl.Libs.Eina)] static extern void eina_error_set(Error error);
[DllImport(efl.Libs.Eina)] static extern IntPtr eina_error_msg_get(Error
error);
+///
+/// Sets the last error.
+/// Since EFL 1.23.
+///
+/// The error identifier.
public static void Set(Error error)
{
eina_error_set(error);
}
+///
+/// Returns the last set error.
+/// Since EFL 1.23.
+///
+/// The last error or NO_ERROR identifier.
public static Error Get()
{
return eina_error_get();
}
+///
+/// Returns the description of the given error identifier.
+/// Since EFL 1.23.
+///
+/// Error identifier.
+/// The description of the error.
public static String MsgGet(Error error)
{
IntPtr cstr = eina_error_msg_get(error);
@@ -78,7 +143,9 @@ public struct Error : IComparable
}
/// Raises an exception if an unhandled exception occurred before
switching
-/// back to the native code. For example, in an event handler.
+/// back to the native code. For example, in an event handler.
+/// Since EFL 1.23.
+///
public static void RaiseIfUnhandledException()
{
Error e = Get();
@@ -89,6 +156,10 @@ public struct Error : IComparable
}
}
+///
+/// Raises an exception.
+/// Since EFL 1.23.
+///
public static void Raise(Error e)
{
if (e != 0)
@@ -97,11 +168,21 @@ public struct Error : IComparable
}
}
+///
+/// Set identifier to a NO_ERROR.
+/// Since EFL 1.23.
+///
public static void Clear()
{
Set(0);
}
+///
+/// Registers a new error type.
+/// Since EFL 1.23.
+///
+/// The desc
[EGIT] [core/efl] master 01/03: csharp: updating efl_csharp_application docs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=09744f6c289a09f0c6533ad9b54964f004bf4666
commit 09744f6c289a09f0c6533ad9b54964f004bf4666
Author: Bruno da Silva Belo
Date: Mon Oct 14 00:53:34 2019 -0300
csharp: updating efl_csharp_application docs.
Summary: ref T8345
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8345
Differential Revision: https://phab.enlightenment.org/D10379
---
.../mono/efl_mono/efl_csharp_application.cs| 24 --
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/bindings/mono/efl_mono/efl_csharp_application.cs
b/src/bindings/mono/efl_mono/efl_csharp_application.cs
index 809b2433bd..b4ce5d2940 100644
--- a/src/bindings/mono/efl_mono/efl_csharp_application.cs
+++ b/src/bindings/mono/efl_mono/efl_csharp_application.cs
@@ -10,14 +10,18 @@ namespace Csharp
{
/// The components to be initialized.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public enum Components
{
-///Basic components: Eina, Eo, Ecore, Evas and DBus.
+///Basic components: Eina, Eo, Ecore, Evas and DBus.
+/// Since EFL 1.23.
+///
Basic,
-///The same components of and the Elementary widget
toolkit.
+///The same components of
+/// and the Elementary widget toolkit.
+/// Since EFL 1.23.
+///
Ui,
}
@@ -25,8 +29,7 @@ public enum Components
/// This represents the entry point for the EFL framework
/// You can use this class to implement the 4 abstract methods which will then
be called accordingly
/// All subsystems of efl are booted up correctly when the abstract methods of
this class are called.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
///
/// Calls to efl outside those efl-callbacks or outside the mainloop are not
allowed and will lead to issues
@@ -94,22 +97,27 @@ public abstract class Application
///
/// Called when the application is started. Arguments from the command
line are passed here.
+/// Since EFL 1.23.
///
+/// Arguments passed from command line.
protected abstract void OnInitialize(string[] args);
///
/// Arguments are passed here, Additional calls to this function may
occure,
/// but then the initialization flag is set to false.
+/// Since EFL 1.23.
///
///
/// When Initialize is true then OnInitialize is also called
///
+/// Argsuments passed from command line
protected virtual void OnArguments(Efl.LoopArguments args)
{
}
///
/// Called when the application is not going to be displayed, or is not
used by a user for some time.
+/// Since EFL 1.23.
///
protected virtual void OnPause()
{
@@ -117,6 +125,7 @@ public abstract class Application
///
/// Called before an application is used again after a call to OnPause().
+/// Since EFL 1.23.
///
protected virtual void OnResume()
{
@@ -124,6 +133,7 @@ public abstract class Application
///
/// Called before starting the shutdown of the application.
+/// Since EFL 1.23.
///
protected virtual void OnTerminate()
{
@@ -132,7 +142,9 @@ public abstract class Application
///
/// This function initializices everything in EFL and runs your
application.
/// This call will result in a call to OnInitialize(), which you
application should override.
+/// Since EFL 1.23.
///
+/// The to
run the application.
public void Launch(Efl.Csharp.Components components = Components.Ui)
{
Init(components);
--
[EGIT] [core/efl] master 02/03: csharp: updating efl_all docs.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d1e9f8f6d7100d800292a99407a3da212a375b2d
commit d1e9f8f6d7100d800292a99407a3da212a375b2d
Author: Bruno da Silva Belo
Date: Mon Oct 14 01:01:10 2019 -0300
csharp: updating efl_all docs.
Summary: ref T8345
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8345
Differential Revision: https://phab.enlightenment.org/D10378
---
src/bindings/mono/efl_mono/efl_all.cs | 35 ++-
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/bindings/mono/efl_mono/efl_all.cs
b/src/bindings/mono/efl_mono/efl_all.cs
index 1ea57df70d..54385ca0cc 100644
--- a/src/bindings/mono/efl_mono/efl_all.cs
+++ b/src/bindings/mono/efl_mono/efl_all.cs
@@ -40,13 +40,16 @@ static class UnsafeNativeMethods
}
/// Wrapper around the initialization functions of all modules.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public static class All
{
private static bool InitializedUi = false;
+///
+/// If the main loop was initialized.
+/// Since EFL 1.23.
+///
public static bool MainLoopInitialized {
get;
private set;
@@ -54,6 +57,11 @@ public static class All
internal static readonly object InitLock = new object();
+///
+/// Initialize the Efl.
+/// Since EFL 1.23.
+///
+/// The that
initialize the Efl.
public static void Init(Efl.Csharp.Components components =
Efl.Csharp.Components.Basic)
{
Eina.Config.Init();
@@ -73,7 +81,9 @@ public static class All
Monitor.Exit(InitLock);
}
-/// Shutdowns all EFL subsystems.
+/// Shutdowns all EFL subsystems.
+/// Since EFL 1.23.
+///
public static void Shutdown()
{
// Try to cleanup everything before actually shutting down.
@@ -113,11 +123,14 @@ namespace Ui
{
/// Initialization and shutdown of the UI libraries.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public static class Config
{
+///
+/// Initialize the configuration of Elm.
+/// Since EFL 1.23.
+///
public static void Init()
{
// TODO Support elm command line arguments
@@ -133,16 +146,28 @@ public static class Config
Efl.Ui.Win.ExitOnAllWindowsClosed = new Eina.Value(0);
}
+///
+/// Shutdown Elm systems.
+/// Since EFL 1.24.
+///
public static void Shutdown()
{
elm_shutdown();
}
+///
+/// Run Elm system.
+/// Since EFL 1.23.
+///
public static void Run()
{
elm_run();
}
+///
+/// Exit Elm.
+/// Since EFL 1.23.
+///
public static void Exit()
{
elm_exit();
--
[EGIT] [core/efl] master 03/03: csharp: updating UserModel docs.
lauromoura pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1c9f5d4f63a86833fa54765cdf654370169a273d commit 1c9f5d4f63a86833fa54765cdf654370169a273d Author: Bruno da Silva Belo Date: Mon Oct 14 01:06:49 2019 -0300 csharp: updating UserModel docs. Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun Reviewed By: lauromoura Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T8345 Differential Revision: https://phab.enlightenment.org/D10377 --- src/bindings/mono/efl_mono/UserModel.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bindings/mono/efl_mono/UserModel.cs b/src/bindings/mono/efl_mono/UserModel.cs index c2597cc421..1116dfc561 100644 --- a/src/bindings/mono/efl_mono/UserModel.cs +++ b/src/bindings/mono/efl_mono/UserModel.cs @@ -64,8 +64,6 @@ internal class ModelHelper /// var model = new Efl.GenericModelPersonModel(modelData, parent); /// PersonModel p = await model.GetAtAsync(0); /// -/// -/// Since EFL 1.24. /// /// The enclosed C# model class with the properties to be added to the native model. [Efl.Eo.BindingEntity] --
[EGIT] [core/efl] master 01/01: csharp: updating eina_iterator docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d9595d840d91e545b0deaf4a898b16b8ab3b46e6
commit d9595d840d91e545b0deaf4a898b16b8ab3b46e6
Author: Bruno da Silva Belo
Date: Thu Oct 10 01:46:51 2019 -0300
csharp: updating eina_iterator docs and hide api.
Summary: ref T8293
Reviewers: felipealmeida, lauromoura, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10330
---
src/bindings/mono/eina_mono/eina_iterator.cs | 52 ++--
1 file changed, 50 insertions(+), 2 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_iterator.cs
b/src/bindings/mono/eina_mono/eina_iterator.cs
index defbd9601d..b8ed06cad8 100644
--- a/src/bindings/mono/eina_mono/eina_iterator.cs
+++ b/src/bindings/mono/eina_mono/eina_iterator.cs
@@ -3,6 +3,7 @@
using System;
using System.Runtime.InteropServices;
using System.Collections.Generic;
+using System.ComponentModel;
using static Eina.TraitFunctions;
using static Eina.IteratorNativeFunctions;
@@ -10,6 +11,7 @@ using static Eina.IteratorNativeFunctions;
namespace Eina
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class IteratorNativeFunctions
{
[DllImport(efl.Libs.Eina)] public static extern void
@@ -30,25 +32,38 @@ public static class IteratorNativeFunctions
}
/// Wrapper around a native Eina iterator.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Iterator : IEnumerable, IDisposable
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get;set;} = IntPtr.Zero;
+/// Whether this wrapper owns the native iterator.
+/// Since EFL 1.23.
+///
public bool Own {get;set;} = true;
+[EditorBrowsable(EditorBrowsableState.Never)]
public Iterator(IntPtr handle, bool own)
{
Handle = handle;
Own = own;
}
+///
+/// Finalizer to be called from the Garbage Collector.
+/// Since EFL 1.23.
+///
~Iterator()
{
Dispose(false);
}
+/// Disposes of this wrapper, releasing the native array if owned.
+/// Since EFL 1.23.
+///
+/// True if this was called from public method. False if
+/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
{
var h = Handle;
@@ -71,17 +86,28 @@ public class Iterator : IEnumerable, IDisposable
}
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Free()
{
Dispose();
}
+///
+/// Releases the native iterator.
+/// Since EFL 1.23.
+///
+/// The native array.
public IntPtr Release()
{
IntPtr h = Handle;
@@ -89,11 +115,20 @@ public class Iterator : IEnumerable, IDisposable
return h;
}
+/// Sets own.
+/// Since EFL 1.23.
+///
+/// If own the object.
public void SetOwnership(bool own)
{
Own = own;
}
+///
+/// Go to the next one.
+/// Since EFL 1.23.
+///
+///
public bool Next(out T res)
{
IntPtr data;
@@ -108,16 +143,29 @@ public class Iterator : IEnumerable, IDisposable
return true;
}
+///
+/// Locks the container of the iterator.
+/// Since EFL 1.23.
+///
+/// true on success, false otherwise.
public bool Lock()
{
return eina_iterator_lock(Handle);
}
+///
+/// Unlocks the container of the iterator.
+/// Since EFL 1.23.
+///
+/// true on success, false otherwise.
public bool Unlock()
{
return eina_iterator_unlock(Handle);
}
+/// Gets an Enumerator for this iterator.
+/// Since EFL 1.23.
+///
public IEnumerator GetEnumerator()
{
for (T curr; Next(out curr);)
--
[EGIT] [core/efl] master 01/01: csharp: updating eina_inlist docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5e6a965a79e91b966cce0a061fd551c35e2b3419
commit 5e6a965a79e91b966cce0a061fd551c35e2b3419
Author: Bruno da Silva Belo
Date: Thu Oct 10 01:15:14 2019 -0300
csharp: updating eina_inlist docs and hide api.
Summary: ref T8293
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10329
---
src/bindings/mono/eina_mono/eina_inlist.cs | 113 +++--
1 file changed, 108 insertions(+), 5 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_inlist.cs
b/src/bindings/mono/eina_mono/eina_inlist.cs
index ed98730c5d..53b86c1ad1 100644
--- a/src/bindings/mono/eina_mono/eina_inlist.cs
+++ b/src/bindings/mono/eina_mono/eina_inlist.cs
@@ -3,6 +3,7 @@
using System;
using System.Runtime.InteropServices;
using System.Collections.Generic;
+using System.ComponentModel;
using static Eina.TraitFunctions;
using static Eina.InlistNativeFunctions;
@@ -11,6 +12,7 @@ using Eina.Callbacks;
namespace Eina
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class InlistNativeFunctions
{
[DllImport(efl.Libs.Eina)] public static extern IntPtr
@@ -81,13 +83,20 @@ public static class InlistNativeFunctions
}
/// Wrapper around an inplace list.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Inlist : IEnumerable, IDisposable
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get;set;} = IntPtr.Zero;
+/// Whether this wrapper owns the native buffer.
+/// Since EFL 1.23.
+///
public bool Own {get;set;}
+/// Who is in charge of releasing the resources wrapped by
+/// this instance.
+/// Since EFL 1.23.
+///
public bool OwnContent {get;set;}
public int Length
@@ -140,11 +149,16 @@ public class Inlist : IEnumerable, IDisposable
}
+///
+/// Default constructor.
+/// Since EFL 1.23.
+///
public Inlist()
{
InitNew();
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public Inlist(IntPtr handle, bool own)
{
Handle = handle;
@@ -152,6 +166,7 @@ public class Inlist : IEnumerable, IDisposable
OwnContent = own;
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public Inlist(IntPtr handle, bool own, bool ownContent)
{
Handle = handle;
@@ -159,11 +174,20 @@ public class Inlist : IEnumerable, IDisposable
OwnContent = ownContent;
}
+///
+/// Finalizer to be called from the Garbage Collector.
+/// Since EFL 1.23.
+///
~Inlist()
{
Dispose(false);
}
+/// Disposes of this wrapper, releasing the native array if owned.
+/// Since EFL 1.23.
+///
+/// True if this was called from public method. False if
+/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
{
IntPtr h = Handle;
@@ -192,41 +216,70 @@ public class Inlist : IEnumerable, IDisposable
}
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Free()
{
Dispose();
}
+///
+/// Releases the native inlist.
+/// Since EFL 1.23.
+///
+/// The native inlist.
public IntPtr Release()
{
IntPtr h = Handle;
Handle = IntPtr.Zero;
return h;
}
-
+
+/// Sets all ownership.
+/// Since EFL 1.23.
+///
+/// If the hash own for all ownerships.
public void SetOwnership(bool ownAll)
{
Own = ownAll;
OwnContent = ownAll;
}
+/// Sets own individually.
+/// Since EFL 1.23.
+///
+/// If own the object.
+/// If own the content's object.
public void SetOwnership(bool own, bool ownContent)
{
Own = own;
OwnContent = ownContent;
}
+///
+/// Gets the count of the number of items.
+/// Since EFL 1.23.
+///
+/// The number of members in the list.
public int Count()
{
return (int)eina_inlist_count(Handle);
}
+///
+/// Cleanup the inlist.
+/// Since EFL 1.23.
+///
public void Clean()
{
while (Handle != IntPtr.Zero)
@@ -237,18 +290,33 @@ public class Inlist : IEnumerable, IDisposable
}
}
+///
+/// Adds a new value to the end.
+/// Since EFL 1.23.
+///
+/// The value to be added.
public void Append(T val)
{
IntPtr
[EGIT] [core/efl] master 01/01: csharp: updating eina_inarray docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fe93c519ab2833aa997d53318777e357021224f4
commit fe93c519ab2833aa997d53318777e357021224f4
Author: Bruno da Silva Belo
Date: Thu Oct 10 00:52:26 2019 -0300
csharp: updating eina_inarray docs and hide api.
Reviewers: lauromoura, felipealmeida, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10328
---
src/bindings/mono/eina_mono/eina_inarray.cs | 139 +++-
1 file changed, 134 insertions(+), 5 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_inarray.cs
b/src/bindings/mono/eina_mono/eina_inarray.cs
index a9c8d5fc92..a8c52374eb 100644
--- a/src/bindings/mono/eina_mono/eina_inarray.cs
+++ b/src/bindings/mono/eina_mono/eina_inarray.cs
@@ -3,6 +3,7 @@
using System;
using System.Runtime.InteropServices;
using System.Collections.Generic;
+using System.ComponentModel;
using static Eina.TraitFunctions;
using static Eina.InarrayNativeFunctions;
@@ -10,6 +11,7 @@ using static Eina.InarrayNativeFunctions;
namespace Eina
{
+[EditorBrowsable(EditorBrowsableState.Never)]
public static class InarrayNativeFunctions
{
[DllImport(efl.Libs.Eina)] public static extern IntPtr
@@ -68,17 +70,25 @@ public static class InarrayNativeFunctions
}
/// Wrapper around an inplace array.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Inarray : IEnumerable, IDisposable
{
public static uint DefaultStep = 0;
-
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get;set;} = IntPtr.Zero;
+/// Whether this wrapper owns the native buffer.
+/// Since EFL 1.23.
+///
public bool Own {get;set;}
+/// Who is in charge of releasing the resources wrapped by
+/// this instance.
+/// Since EFL 1.23.
+///
public bool OwnContent {get;set;}
-
+/// Length of the array.
+/// Since EFL 1.23.
+///
public int Length
{
get { return Count(); }
@@ -96,16 +106,26 @@ public class Inarray : IEnumerable, IDisposable
}
}
+///
+/// Default constructor
+/// Since EFL 1.23.
+///
public Inarray()
{
InitNew(DefaultStep);
}
+///
+/// Constructor with step.
+/// Since EFL 1.23.
+///
+/// Step size of the array.
public Inarray(uint step)
{
InitNew(step);
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public Inarray(IntPtr handle, bool own)
{
Handle = handle;
@@ -113,6 +133,7 @@ public class Inarray : IEnumerable, IDisposable
OwnContent = own;
}
+[EditorBrowsable(EditorBrowsableState.Never)]
public Inarray(IntPtr handle, bool own, bool ownContent)
{
Handle = handle;
@@ -120,11 +141,20 @@ public class Inarray : IEnumerable, IDisposable
OwnContent = ownContent;
}
+///
+/// Finalizer to be called from the Garbage Collector.
+/// Since EFL 1.23.
+///
~Inarray()
{
Dispose(false);
}
+/// Disposes of this wrapper, releasing the native array if owned.
+/// Since EFL 1.23.
+///
+/// True if this was called from public method. False if
+/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
{
IntPtr h = Handle;
@@ -156,17 +186,28 @@ public class Inarray : IEnumerable, IDisposable
}
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Free()
{
Dispose();
}
+///
+/// Releases the native array.
+/// Since EFL 1.23.
+///
+/// The native array.
public IntPtr Release()
{
IntPtr h = Handle;
@@ -186,29 +227,54 @@ public class Inarray : IEnumerable, IDisposable
}
}
+///
+/// Removes every member from the array.
+/// Since EFL 1.23.
+///
public void Flush()
{
FreeElementsIfOwned();
eina_inarray_flush(Handle);
}
+///
+/// Counts the number of members in an array.
+/// Since EFL 1.23.
+///
+/// THe number of members in the array.
public int Count()
{
return (int)eina_inarray_count(Handle);
}
+/// Sets all ownership.
+/// Since EFL 1.23.
+///
+/// If the hash own for all ownerships.
public void SetOwnership(bool ownAll)
{
Own = ownAll;
OwnContent = ownAll;
}
+/// Sets own individually.
+/// Since EFL 1.23
[EGIT] [core/efl] master 01/02: csharp: updating eina_accessor docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3f4c7637dbee7d7ab0eac8aff5b21bb1ab2cf225
commit 3f4c7637dbee7d7ab0eac8aff5b21bb1ab2cf225
Author: Bruno da Silva Belo
Date: Tue Oct 8 21:49:04 2019 -0300
csharp: updating eina_accessor docs and hide api.
Reviewers: felipealmeida, lauromoura, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10308
---
src/bindings/mono/eina_mono/eina_accessor.cs | 66 +++-
1 file changed, 46 insertions(+), 20 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_accessor.cs
b/src/bindings/mono/eina_mono/eina_accessor.cs
index 5880503062..c848a2cf97 100644
--- a/src/bindings/mono/eina_mono/eina_accessor.cs
+++ b/src/bindings/mono/eina_mono/eina_accessor.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Runtime.InteropServices;
+using System.ComponentModel;
using static Eina.TraitFunctions;
@@ -20,19 +21,23 @@ internal class AccessorNativeFunctions
/// Accessors provide an uniform way of accessing Eina containers,
/// similar to C++ STL's and C# IEnumerable.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Accessor : IEnumerable, IDisposable
{
/// Pointer to the native accessor.
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle { get; private set; } = IntPtr.Zero;
-/// Who is in charge of releasing the resources wrapped by this
instance.
+/// Who is in charge of releasing the resources wrapped by this
instance.
+/// Since EFL 1.23.
+///
private Ownership Ownership { get; set; }
// FIXME Part of the implicit EFL Container interface. Need to make it
explicit.
-///Whether this wrapper owns the native accessor.
+/// Whether this wrapper owns the native accessor.
+/// Since EFL 1.23.
+///
public bool Own
{
get
@@ -45,31 +50,42 @@ public class Accessor : IEnumerable, IDisposable
}
}
-/// Create a new accessor wrapping the given pointer.
+/// Create a new accessor wrapping the given pointer.
+/// Since EFL 1.23.
+///
/// The native handle to be wrapped.
/// Whether this wrapper owns the native
accessor.
+[EditorBrowsable(EditorBrowsableState.Never)]
public Accessor(IntPtr handle, Ownership owner = Ownership.Managed)
{
Handle = handle;
Ownership = owner;
}
-/// Create a new accessor wrapping the given pointer.
+/// Create a new accessor wrapping the given pointer.
+/// Since EFL 1.23.
+///
/// The native handle to be wrapped.
/// Whether this wrapper owns the native
accessor.
/// For compatibility with other EFL# containers.
Ignored in acessors.
+[EditorBrowsable(EditorBrowsableState.Never)]
public Accessor(IntPtr handle, bool own, bool ownContent = false)
: this(handle, own ? Ownership.Managed : Ownership.Unmanaged)
{
}
-/// Release the native resources held by this instance.
+/// Release the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
}
-/// Disposes of this wrapper, releasing the native accessor if
owned.
+/// Disposes of this wrapper, releasing the native accessor if
+/// owned.
+/// Since EFL 1.23.
+///
/// True if this was called from public method. False if
/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
@@ -88,22 +104,28 @@ public class Accessor : IEnumerable, IDisposable
}
}
-/// Finalizer to be called from the Garbage Collector.
+/// Finalizer to be called from the Garbage Collector.
+/// Since EFL 1.23.
+///
~Accessor()
{
Dispose(false);
}
/// Convert the native data into managed. This is used when
returning the data through a
-/// .
+/// .
+/// Since EFL 1.23.
+///
/// The data to be converted
/// The managed data representing data.
-protected virtual T Convert(IntPtr data)
+internal virtual T Convert(IntPtr data)
{
return NativeToManaged(data);
}
-/// Returns an enumerator that iterates throught this
accessor.
+/// Returns an enumerator that iterates throught this accessor.
+/// Since EFL 1.23.
+///
/// An enumerator to walk through the acessor items.
public IEnumerator GetEnumerator()
{
@@ -137,14 +159,16 @@ public class Accessor : IEnumerable, IDisposable
}
/// Accessor for Inlists.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class AccessorInList : Accessor
{
-/// Create a new accessor wrapping the given pointer
[EGIT] [core/efl] master 02/02: csharp: updating eina_binbuf docs and hide api.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=85c57500ea8cbbea1ecb7b489060df8855ed1387
commit 85c57500ea8cbbea1ecb7b489060df8855ed1387
Author: Bruno da Silva Belo
Date: Tue Oct 8 22:05:34 2019 -0300
csharp: updating eina_binbuf docs and hide api.
Reviewers: felipealmeida, lauromoura, segfaultxavi, woohyun
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10310
---
src/bindings/mono/eina_mono/eina_binbuf.cs | 64 --
1 file changed, 52 insertions(+), 12 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_binbuf.cs
b/src/bindings/mono/eina_mono/eina_binbuf.cs
index e2c2d8436a..63b42e239d 100644
--- a/src/bindings/mono/eina_mono/eina_binbuf.cs
+++ b/src/bindings/mono/eina_mono/eina_binbuf.cs
@@ -2,14 +2,14 @@
using System;
using System.Runtime.InteropServices;
+using System.ComponentModel;
namespace Eina
{
///
/// A Generic buffer designed to be a mutable string.
-///
-/// Since EFL 1.23.
+/// Since EFL 1.23.
///
public class Binbuf : IDisposable
{
@@ -45,11 +45,16 @@ public class Binbuf : IDisposable
eina_binbuf_slice_get(IntPtr buf);
/// Pointer to the native buffer.
+[EditorBrowsable(EditorBrowsableState.Never)]
public IntPtr Handle {get;set;} = IntPtr.Zero;
-///Whether this wrapper owns the native buffer.
+/// Whether this wrapper owns the native buffer.
+/// Since EFL 1.23.
+///
public bool Own {get;set;}
-/// Length of the buffer.
+/// Length of the buffer.
+/// Since EFL 1.23.
+///
public int Length
{
get { return (int)GetLength(); }
@@ -67,12 +72,17 @@ public class Binbuf : IDisposable
///
/// Create a new buffer.
+/// Since EFL 1.23.
///
public Binbuf()
{
InitNew();
}
+///
+/// Create a new buffer.
+/// Since EFL 1.23.
+///
public Binbuf(byte[] str, uint? length = null)
{
InitNew();
@@ -90,6 +100,7 @@ public class Binbuf : IDisposable
///
/// Create a new buffer with elements.
///
+/// Since EFL 1.23.
/// Elements to initialize the new buffer.
public Binbuf(Binbuf bb)
{
@@ -106,6 +117,7 @@ public class Binbuf : IDisposable
///
/// The native handle to be wrapped.
/// Whether this wrapper owns the native handle.
+[EditorBrowsable(EditorBrowsableState.Never)]
public Binbuf(IntPtr handle, bool own)
{
Handle = handle;
@@ -117,8 +129,11 @@ public class Binbuf : IDisposable
Dispose(false);
}
-/// Disposes of this wrapper, releasing the native buffer if
owned.
-/// True if this was called from public method. False if
+/// Disposes of this wrapper, releasing the native buffer if
owned.
+/// Since EFL 1.23.
+///
+/// True if this was called from
+/// public method. False if
/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
{
@@ -137,14 +152,18 @@ public class Binbuf : IDisposable
}
}
-/// Releases the native resources held by this instance.
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
-/// Releases the native resources held by this instance.
+/// Releases the native resources held by this instance.
+/// Since EFL 1.23.
+///
public void Free()
{
Dispose();
@@ -152,6 +171,7 @@ public class Binbuf : IDisposable
///
/// Releases the native buffer.
+/// Since EFL 1.23.
///
/// The native buffer.
public IntPtr Release()
@@ -163,6 +183,7 @@ public class Binbuf : IDisposable
///
/// Resets the buffer.
+/// Since EFL 1.23.
///
public void Reset()
{
@@ -170,7 +191,9 @@ public class Binbuf : IDisposable
}
///
-/// Appends a string of inputed buffer's length to the buffer,
reallocating as necessary.
+/// Appends a string of inputed buffer's length to the buffer,
+/// reallocating as necessary.
+/// Since EFL 1.23.
///
/// The string buffer.
/// true on success, false if data could not be
appended.
@@ -180,7 +203,9 @@ public class Binbuf : IDisposable
}
///
-/// Appends a string of exact length to the buffer, reallocating as
necessary.
+/// Appends a string of exact length to the buffer, reallocating
+/// as necessary.
+/// Since EFL 1.23.
///
/// The string buffer.
/// The exact length to use.
@@ -192,6 +217,7 @@ public class Binbuf : IDisposable
///
/// Appends a Binbuf to the buffer.
+/// Since EFL 1.23
[EGIT] [core/efl] master 02/02: csharp: removing extra //
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=78cd5df179fe3865a637db946140c0496c9b02dd
commit 78cd5df179fe3865a637db946140c0496c9b02dd
Author: Bruno da Silva Belo
Date: Tue Oct 8 18:01:11 2019 -0300
csharp: removing extra //
Summary: dotnet warning about extras /
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10282
---
src/bindings/mono/eina_mono/eina_array.cs | 22 +++
src/bindings/mono/eina_mono/eina_binbuf.cs | 44 +++---
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_array.cs
b/src/bindings/mono/eina_mono/eina_array.cs
index 655fbab03a..0b96920fbd 100644
--- a/src/bindings/mono/eina_mono/eina_array.cs
+++ b/src/bindings/mono/eina_mono/eina_array.cs
@@ -107,7 +107,7 @@ public class Array : IEnumerable, IDisposable
///
/// Create a new array.
///
-/ Step size of the array.
+/// Step size of the array.
public Array(uint step)
{
InitNew(step);
@@ -116,8 +116,8 @@ public class Array : IEnumerable, IDisposable
///
/// Create a new array.
///
-/ The native handle to be wrapped.
-/ Whether this wrapper owns the native
handle.
+/// The native handle to be wrapped.
+/// Whether this wrapper owns the native handle.
public Array(IntPtr handle, bool own)
{
if (handle == IntPtr.Zero)
@@ -133,9 +133,9 @@ public class Array : IEnumerable, IDisposable
///
/// Create a new array
///
-/ The native array to be wrapped.
-/ Whether this wrapper owns the native array.
-/ For compatibility with other EFL#
containers.
+/// The native array to be wrapped.
+/// Whether this wrapper owns the native array.
+/// For compatibility with other EFL#
containers.
public Array(IntPtr handle, bool own, bool ownContent)
{
if (handle == IntPtr.Zero)
@@ -267,7 +267,7 @@ public class Array : IEnumerable, IDisposable
///
/// Inserts the element of the array at the end.
///
-/ The value of the element to be inserted.
+/// The value of the element to be inserted.
public bool Push(T val)
{
IntPtr ele = ManagedToNativeAlloc(val);
@@ -308,7 +308,7 @@ public class Array : IEnumerable, IDisposable
///
/// Returns the element of the array at the specified position.
///
-/ The position of the desired element.
+/// The position of the desired element.
/// The element at the specified position
public T DataGet(int idx)
{
@@ -319,7 +319,7 @@ public class Array : IEnumerable, IDisposable
///
/// Returns the element of the array at the specified position.
///
-/ The position of the desired element.
+/// The position of the desired element.
/// The element at the specified position
public T At(int idx)
{
@@ -329,8 +329,8 @@ public class Array : IEnumerable, IDisposable
///
/// Replaces the element at the specified position.
///
-/ The position of the desired element.
-/ The value of the element to be inserted.
+/// The position of the desired element.
+/// The value of the element to be inserted.
public void DataSet(int idx, T val)
{
IntPtr ele = InternalDataGet(idx); // TODO: check bondaries ??
diff --git a/src/bindings/mono/eina_mono/eina_binbuf.cs
b/src/bindings/mono/eina_mono/eina_binbuf.cs
index 66b89e272d..e2c2d8436a 100644
--- a/src/bindings/mono/eina_mono/eina_binbuf.cs
+++ b/src/bindings/mono/eina_mono/eina_binbuf.cs
@@ -90,7 +90,7 @@ public class Binbuf : IDisposable
///
/// Create a new buffer with elements.
///
-/ Elements to initialize the new buffer.
+/// Elements to initialize the new buffer.
public Binbuf(Binbuf bb)
{
InitNew();
@@ -104,8 +104,8 @@ public class Binbuf : IDisposable
///
/// Create a new buffer.
///
-/ The native handle to be wrapped.
-/ Whether this wrapper owns the native
handle.
+/// The native handle to be wrapped.
+/// Whether this wrapper owns the native handle.
public Binbuf(IntPtr handle, bool own)
{
Handle = handle;
@@ -172,7 +172,7 @@ public class Binbuf : IDisposable
///
/// Appends a string of inputed buffer's length to the buffer,
reallocating as necessary.
///
-/ The string buffer.
+/// The string buffer.
/// true on success, false if data could not be
appended.
public bool Append(byte[] str)
{
@@ -182,8 +182,8 @@ public class Binbuf : IDisposable
///
/// Appends a string of exact length to the buffer
[EGIT] [core/efl] master 01/09: c: coverity: resource leaked when using realloc.
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f18a5b4389d1ed779998c9f07901fb49db28b279
commit f18a5b4389d1ed779998c9f07901fb49db28b279
Author: Bruno da Silva Belo
Date: Mon Oct 7 09:02:10 2019 -0400
c: coverity: resource leaked when using realloc.
Summary:
from https://en.cppreference.com/w/c/memory/realloc
```
On success, returns the pointer to the beginning of newly allocated memory.
To avoid a memory leak, the returned pointer must be deallocated with free()
or realloc(). The original pointer ptr is invalidated and any access to it
is undefined behavior (even if reallocation was in-place).
On failure, returns a null pointer. The original pointer ptr remains valid
and may need to be deallocated with free() or realloc(). ```
So a temporary to test if `realloc` failed
then use the original pointer to use `free`.
`CID1404749`
`CID1404741`
Reviewers: lauromoura, felipealmeida, zmike
Reviewed By: zmike
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10284
---
src/lib/elementary/efl_ui_caching_factory.c | 19 ---
src/lib/elementary/efl_ui_widget_factory.c | 17 +++--
2 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/lib/elementary/efl_ui_caching_factory.c
b/src/lib/elementary/efl_ui_caching_factory.c
index 7dbfc0aae9..5c714d99b8 100644
--- a/src/lib/elementary/efl_ui_caching_factory.c
+++ b/src/lib/elementary/efl_ui_caching_factory.c
@@ -201,15 +201,15 @@ _efl_ui_caching_factory_efl_ui_factory_create(Eo *obj,
Efl_Ui_Caching_Factory_Data *pd,
Eina_Iterator *models)
{
- Efl_Ui_Caching_Factory_Request *r;
- Efl_Ui_Caching_Factory_Group_Request *gr;
+ Efl_Ui_Caching_Factory_Request *r = NULL;
+ Efl_Ui_Caching_Factory_Group_Request *gr = NULL;
Efl_Gfx_Entity *w = NULL;
- Efl_Model *model;
- Eina_Future *f;
+ Efl_Model *model = NULL;
+ Eina_Future *f = NULL;
if (pd->cache && pd->style && !pd->klass)
{
-Eina_Future **all;
+Eina_Future **all = NULL;
int count = 0;
r = calloc(1, sizeof (Efl_Ui_Caching_Factory_Request));
@@ -228,8 +228,13 @@ _efl_ui_caching_factory_efl_ui_factory_create(Eo *obj,
.success =
_efl_ui_caching_factory_create_then,
.data = r);
- all = realloc(all, (count + 1) * sizeof (Eina_Future *));
- if (!all) goto alloc_array_error;
+ Eina_Future **tmp = realloc(all, (count + 1) * sizeof
(Eina_Future *));
+ if (!tmp)
+ {
+ free(all);
+ goto alloc_array_error;
+ }
+ all = tmp;
}
eina_iterator_free(models);
diff --git a/src/lib/elementary/efl_ui_widget_factory.c
b/src/lib/elementary/efl_ui_widget_factory.c
index 13160af8e1..5ab9477a85 100644
--- a/src/lib/elementary/efl_ui_widget_factory.c
+++ b/src/lib/elementary/efl_ui_widget_factory.c
@@ -267,9 +267,9 @@ static Eina_Future *
_efl_ui_widget_factory_efl_ui_factory_create(Eo *obj,
Efl_Ui_Widget_Factory_Data *pd,
Eina_Iterator *models)
{
- Efl_Ui_Widget_Factory_Request *r;
- Eina_Future **f;
- Efl_Model *model;
+ Efl_Ui_Widget_Factory_Request *r = NULL;
+ Eina_Future **f = NULL;
+ Efl_Model *model = NULL;
int count = 0;
if (!pd->klass)
@@ -277,7 +277,7 @@ _efl_ui_widget_factory_efl_ui_factory_create(Eo *obj,
Efl_Ui_Widget_Factory_Data
if (!pd->style)
{
-Efl_Ui_Widget *w;
+Efl_Ui_Widget *w = NULL;
Eina_Value r;
eina_value_array_setup(, EINA_VALUE_TYPE_OBJECT, 4);
@@ -309,8 +309,13 @@ _efl_ui_widget_factory_efl_ui_factory_create(Eo *obj,
Efl_Ui_Widget_Factory_Data
.success =
_efl_ui_widget_factory_create_then,
.free =
_efl_ui_widget_factory_single_cleanup);
-f = realloc(f, (count + 1) * sizeof (Eina_Future *));
-if (!f) goto alloc_array_error;
+Eina_Future** tmp = realloc(f, (count + 1) * sizeof (Eina_Future *));
+if (!tmp)
+ {
+free(f);
+goto alloc_array_error;
+ }
+f = tmp;
}
eina_iterator_free(models);
--
[EGIT] [core/efl] master 01/01: csharp: Standardizing doc tag.
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=04a49f58752060dfac9360b3d83ed50164cfae79
commit 04a49f58752060dfac9360b3d83ed50164cfae79
Author: Bruno da Silva Belo
Date: Fri Oct 4 08:46:29 2019 +0200
csharp: Standardizing doc tag.
Reviewers: felipealmeida, brunobelo, segfaultxavi
Reviewed By: segfaultxavi
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10280
---
src/bin/eolian_mono/eolian/mono/documentation.hh | 2 +-
src/bindings/mono/efl_mono/Bind.cs | 6 +++---
src/bindings/mono/efl_mono/Factory.cs | 2 +-
src/bindings/mono/efl_mono/GenericModel.cs | 2 +-
src/bindings/mono/efl_mono/UserModel.cs| 2 +-
src/bindings/mono/efl_mono/efl_all.cs | 10 +++--
.../mono/efl_mono/efl_csharp_application.cs| 9 +---
src/bindings/mono/eina_mono/eina_accessor.cs | 15 +++---
src/bindings/mono/eina_mono/eina_array.cs | 5 -
src/bindings/mono/eina_mono/eina_binbuf.cs | 4 +++-
src/bindings/mono/eina_mono/eina_common.cs | 13 +---
src/bindings/mono/eina_mono/eina_config.cs | 9 +---
src/bindings/mono/eina_mono/eina_error.cs | 5 -
src/bindings/mono/eina_mono/eina_hash.cs | 5 -
src/bindings/mono/eina_mono/eina_inarray.cs| 5 -
src/bindings/mono/eina_mono/eina_inlist.cs | 5 -
src/bindings/mono/eina_mono/eina_iterator.cs | 5 -
src/bindings/mono/eina_mono/eina_list.cs | 5 -
src/bindings/mono/eina_mono/eina_log.cs| 5 -
src/bindings/mono/eina_mono/eina_promises.cs | 2 +-
src/bindings/mono/eina_mono/eina_slice.cs | 10 +++--
src/bindings/mono/eina_mono/eina_strbuf.cs | 5 -
src/bindings/mono/eina_mono/eina_value.cs | 24 --
src/bindings/mono/eldbus_mono/eldbus_config.cs | 5 -
src/bindings/mono/eldbus_mono/eldbus_connection.cs | 5 -
src/bindings/mono/eldbus_mono/eldbus_message.cs| 5 -
src/bindings/mono/eldbus_mono/eldbus_object.cs | 5 -
src/bindings/mono/eldbus_mono/eldbus_pending.cs| 5 -
src/bindings/mono/eldbus_mono/eldbus_proxy.cs | 5 -
29 files changed, 139 insertions(+), 46 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/documentation.hh
b/src/bin/eolian_mono/eolian/mono/documentation.hh
index 0035754dbe..0bdfbda64e 100644
--- a/src/bin/eolian_mono/eolian/mono/documentation.hh
+++ b/src/bin/eolian_mono/eolian/mono/documentation.hh
@@ -560,7 +560,7 @@ struct documentation_generator
{
std::string str = doc.full_text;
if (!doc.since.empty())
-str += "\\Since EFL " + doc.since;
+str += "\\Since EFL " + doc.since + ".";
str += tail_text;
return generate_tag_summary(sink, str, context);
}
diff --git a/src/bindings/mono/efl_mono/Bind.cs
b/src/bindings/mono/efl_mono/Bind.cs
index 27c78593d6..c4aec5b5e1 100644
--- a/src/bindings/mono/efl_mono/Bind.cs
+++ b/src/bindings/mono/efl_mono/Bind.cs
@@ -13,7 +13,7 @@ namespace Efl {
///
/// It is internally instantiated and returned by generated extension
methods.
///
-/// (Since EFL 1.23)
+/// Since EFL 1.23.
///
public class BindableProperty
{
@@ -79,7 +79,7 @@ public class BindableProperty
///
/// It is internally instantiated and returned by generated extension
methods.
///
-/// (Since EFL 1.23)
+/// Since EFL 1.23.
///
public class BindablePart
{
@@ -99,7 +99,7 @@ public class BindablePart
/// Represents bindable factory parts as used by instances.
///
-/// (Since EFL 1.23)
+/// Since EFL 1.23.
///
public class BindableFactoryPart
{
diff --git a/src/bindings/mono/efl_mono/Factory.cs
b/src/bindings/mono/efl_mono/Factory.cs
index f0d62bbb68..2c9f139ca7 100644
--- a/src/bindings/mono/efl_mono/Factory.cs
+++ b/src/bindings/mono/efl_mono/Factory.cs
@@ -15,7 +15,7 @@ namespace Efl { namespace Ui {
/// factory.Style().Bind("Name"); // The factory Style property is bound to
the Name property for the given model.
///
///
-/// (Since EFL 1.23)
+/// Since EFL 1.23.
///
///
public class ItemFactory : Efl.Ui.LayoutFactory, IDisposable
diff --git a/src/bindings/mono/efl_mono/GenericModel.cs
b/src/bindings/mono/efl_mono/GenericModel.cs
index 6b162ed58d..79cca5f2a5 100644
--- a/src/bindings/mono/efl_mono/GenericModel.cs
+++ b/src/bindings/mono/efl_mono/GenericModel.cs
@@ -11,7 +11,7 @@ namespace Efl {
/// Generic implementation for MVVM models
based on
///
-/// (Since EFL 1.23)
+/// Since EFL 1.23.
///
public class GenericModel : Efl.Object, Efl.IModel, IDisposable
{
diff --git a/src/bindings/mono/efl_mono/UserModel.cs
b/src/bindings/mono/efl_mono/UserModel.cs
index ffe6f9e6d6..08e6f6e371 100644
--- a/src/bindi
[EGIT] [core/efl] master 01/01: csharp: More updated docs to 1.23.
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7b4a58313b3ab6f8e5610e90c5a1153c7f27b1c5
commit 7b4a58313b3ab6f8e5610e90c5a1153c7f27b1c5
Author: Bruno da Silva Belo
Date: Wed Oct 2 12:01:25 2019 +0200
csharp: More updated docs to 1.23.
Summary: eina_config and eina_common updated to 1.23.
Reviewers: lauromoura, felipealmeida, segfaultxavi
Reviewed By: segfaultxavi
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10263
---
src/bindings/mono/eina_mono/eina_common.cs | 8 +++-
src/bindings/mono/eina_mono/eina_config.cs | 5 -
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_common.cs
b/src/bindings/mono/eina_mono/eina_common.cs
index 7d97a9142e..d552f75128 100644
--- a/src/bindings/mono/eina_mono/eina_common.cs
+++ b/src/bindings/mono/eina_mono/eina_common.cs
@@ -41,7 +41,7 @@ internal static class NativeCustomExportFunctions
efl_mono_native_efl_unref_addr_get();
}
-/// Wrapper around native memory DllImport'd functions
+/// Wrapper around native memory DllImport'd functions (SINCE EFL
1.23).
public static class MemoryNative
{
public static void Free(IntPtr ptr)
@@ -126,6 +126,9 @@ public static class MemoryNative
}
}
+///
+/// Conversor of raw pointer to a type and type to raw pointer (SINCE EFL
1.23).
+///
public static class PrimitiveConversion
{
public static T PointerToManaged(IntPtr nat)
@@ -148,6 +151,9 @@ public static class PrimitiveConversion
}
}
+///
+/// Conversor of string to native string and native string to string..
(SINCE EFL 1.23).
+///
public static class StringConversion
{
public static IntPtr ManagedStringToNativeUtf8Alloc(string managedString)
diff --git a/src/bindings/mono/eina_mono/eina_config.cs
b/src/bindings/mono/eina_mono/eina_config.cs
index 9f3028f62d..3b35b2142f 100644
--- a/src/bindings/mono/eina_mono/eina_config.cs
+++ b/src/bindings/mono/eina_mono/eina_config.cs
@@ -6,6 +6,9 @@ using System.Runtime.InteropServices;
namespace Eina
{
+///
+/// Manage the initialization and cleanup for eina (SINCE EFL 1.23).
+///
public class Config
{
[DllImport(efl.Libs.Eina)] private static extern int eina_init();
@@ -28,7 +31,7 @@ public class Config
///
/// Wrapper class for pointers that need some cleanup afterwards
-/// like strings.
+/// like strings (SINCE EFL 1.23).
///
public class DisposableIntPtr : IDisposable
{
--
[EGIT] [core/efl] master 01/01: csharp: add since 1.23 to eina_accessor.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5ae7d92a1b05d5aba4e6b54345a72d9239b03b92
commit 5ae7d92a1b05d5aba4e6b54345a72d9239b03b92
Author: Bruno da Silva Belo
Date: Mon Sep 30 23:23:33 2019 -0300
csharp: add since 1.23 to eina_accessor.
Summary: updating to since 1.23.
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10257
---
src/bindings/mono/eina_mono/eina_accessor.cs | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_accessor.cs
b/src/bindings/mono/eina_mono/eina_accessor.cs
index bafbbd84fe..6442c55961 100644
--- a/src/bindings/mono/eina_mono/eina_accessor.cs
+++ b/src/bindings/mono/eina_mono/eina_accessor.cs
@@ -18,7 +18,8 @@ internal class AccessorNativeFunctions
eina_accessor_free(IntPtr accessor);
}
-/// Accessors provide an uniform way of accessing Eina containers,
similar to C++ STL's and C# IEnumerable.
+/// Accessors provide an uniform way of accessing Eina containers,
+/// similar to C++ STL's and C# IEnumerable (SINCE EFL 1.23).
public class Accessor : IEnumerable, IDisposable
{
/// Pointer to the native accessor.
@@ -132,7 +133,7 @@ public class Accessor : IEnumerable, IDisposable
}
}
-///Accessor for Inlists.
+///Accessor for Inlists (SINCE EFL 1.23).
public class AccessorInList : Accessor
{
/// Create a new accessor wrapping the given pointer.
@@ -152,7 +153,7 @@ public class AccessorInList : Accessor
}
}
-///Accessor for Inarrays.
+///Accessor for Inarrays (SINCE EFL 1.23).
public class AccessorInArray : Accessor
{
/// Create a new accessor wrapping the given pointer.
--
[EGIT] [core/efl] master 01/01: mono_docs:adding and updating eina_binbuf.cs.
felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=33f5167089402c0ff52f13619e648ff267a07f42
commit 33f5167089402c0ff52f13619e648ff267a07f42
Author: Bruno da Silva Belo
Date: Mon Sep 30 23:14:46 2019 -0300
mono_docs:adding and updating eina_binbuf.cs.
Summary: Generating docs and setting to 1.23.
Reviewers: lauromoura, felipealmeida
Reviewed By: felipealmeida
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10252
---
src/bindings/mono/eina_mono/eina_binbuf.cs | 106 +
1 file changed, 106 insertions(+)
diff --git a/src/bindings/mono/eina_mono/eina_binbuf.cs
b/src/bindings/mono/eina_mono/eina_binbuf.cs
index e5dc817085..3dcda65bf8 100644
--- a/src/bindings/mono/eina_mono/eina_binbuf.cs
+++ b/src/bindings/mono/eina_mono/eina_binbuf.cs
@@ -6,6 +6,9 @@ using System.Runtime.InteropServices;
namespace Eina
{
+///
+/// A Generic buffer designed to be a mutable string (SINCE EFL 1.23).
+///
public class Binbuf : IDisposable
{
[DllImport(efl.Libs.Eina)] public static extern IntPtr
@@ -39,9 +42,12 @@ public class Binbuf : IDisposable
[DllImport(efl.Libs.Eina)] public static extern Eina.Slice
eina_binbuf_slice_get(IntPtr buf);
+/// Pointer to the native buffer.
public IntPtr Handle {get;set;} = IntPtr.Zero;
+///Whether this wrapper owns the native buffer.
public bool Own {get;set;}
+/// Length of the buffer.
public int Length
{
get { return (int)GetLength(); }
@@ -57,6 +63,9 @@ public class Binbuf : IDisposable
}
}
+///
+/// Create a new buffer.
+///
public Binbuf()
{
InitNew();
@@ -76,6 +85,10 @@ public class Binbuf : IDisposable
}
}
+///
+/// Create a new buffer with elements.
+///
+/ Elements to initialize the new buffer.
public Binbuf(Binbuf bb)
{
InitNew();
@@ -86,6 +99,11 @@ public class Binbuf : IDisposable
}
}
+///
+/// Create a new buffer.
+///
+/ The native handle to be wrapped.
+/ Whether this wrapper owns the native
handle.
public Binbuf(IntPtr handle, bool own)
{
Handle = handle;
@@ -97,6 +115,9 @@ public class Binbuf : IDisposable
Dispose(false);
}
+/// Disposes of this wrapper, releasing the native buffer if
owned.
+/// True if this was called from public method. False if
+/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
{
IntPtr h = Handle;
@@ -114,17 +135,23 @@ public class Binbuf : IDisposable
}
}
+/// Releases the native resources held by this instance.
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
+/// Releases the native resources held by this instance.
public void Free()
{
Dispose();
}
+///
+/// Releases the native buffer.
+///
+/// The native buffer.
public IntPtr Release()
{
IntPtr h = Handle;
@@ -132,61 +159,127 @@ public class Binbuf : IDisposable
return h;
}
+///
+/// Resets the buffer.
+///
public void Reset()
{
eina_binbuf_reset(Handle);
}
+///
+/// Appends a string of inputed buffer's length to the buffer,
reallocating as necessary.
+///
+/ The string buffer.
+/// true on success, false if data could not be
appended.
public bool Append(byte[] str)
{
return 0 != eina_binbuf_append_length(Handle, str,
(UIntPtr)(str.Length));
}
+///
+/// Appends a string of exact length to the buffer, reallocating as
necessary.
+///
+/ The string buffer.
+/ The exact length to use.
+/// true on success, false if data could not be
appended.
public bool Append(byte[] str, uint length)
{
return 0 != eina_binbuf_append_length(Handle, str, (UIntPtr)length);
}
+///
+/// Appends a Binbuf to the buffer.
+///
+/ The buffer to be appended.
+/// true on success, false if data could not be
appended.
public bool Append(Binbuf bb)
{
return 0 != eina_binbuf_append_buffer(Handle, bb.Handle);
}
+///
+/// Appends a character to the buffer, reallocating as necessary.
+///
+/ The char to appended.
+/// true on success, false if data could not be
appended.
public bool Append(byte c)
{
return 0 != eina_binbuf_append_char(Handle, c);
}
+///
+/// Appends a slice to the buffer, reallocating as necessary.
+///
+/ The slice to appended.
+/// true on success, false if data could not be
appended.
public bool Append
[EGIT] [core/efl] master 01/01: mono-docs: adding and updating docs for eina_array.
felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0194ba8420fde2bbcfce0ea35adb200c76b7fc00
commit 0194ba8420fde2bbcfce0ea35adb200c76b7fc00
Author: Bruno da Silva Belo
Date: Mon Sep 30 23:13:07 2019 -0300
mono-docs: adding and updating docs for eina_array.
Summary: Generating docs and setting to 1.23 for eina_array.cs
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T8293
Differential Revision: https://phab.enlightenment.org/D10251
---
src/bindings/mono/eina_mono/eina_array.cs | 81 +--
1 file changed, 78 insertions(+), 3 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_array.cs
b/src/bindings/mono/eina_mono/eina_array.cs
index 8c09557098..90cc4b4cf1 100644
--- a/src/bindings/mono/eina_mono/eina_array.cs
+++ b/src/bindings/mono/eina_mono/eina_array.cs
@@ -45,20 +45,23 @@ public static class ArrayNativeFunctions
eina_array_foreach_custom_export_mono(IntPtr array, IntPtr cb, IntPtr
fdata);
}
+/// A container of contiguous allocated elements (SINCE EFL
1.23).
public class Array : IEnumerable, IDisposable
{
public static uint DefaultStep = 32;
+/// Pointer to the native buffer.
public IntPtr Handle {get;set;} = IntPtr.Zero;
+///Whether this wrapper owns the native buffer.
public bool Own {get;set;}
+/// Who is in charge of releasing the resources wrapped by this
instance.
public bool OwnContent {get;set;}
-
+/// Length of the array.
public int Length
{
get { return Count(); }
}
-
private void InitNew(uint step)
{
Handle = eina_array_new(step);
@@ -90,16 +93,28 @@ public class Array : IEnumerable, IDisposable
eina_array_data_set_custom_export_mono(Handle, (uint)idx, ele); //
TODO: Check bounds ???
}
+///
+/// Create a new array.
+///
public Array()
{
InitNew(DefaultStep);
}
+///
+/// Create a new array.
+///
+/ Step size of the array.
public Array(uint step)
{
InitNew(step);
}
+///
+/// Create a new array.
+///
+/ The native handle to be wrapped.
+/ Whether this wrapper owns the native
handle.
public Array(IntPtr handle, bool own)
{
if (handle == IntPtr.Zero)
@@ -112,6 +127,12 @@ public class Array : IEnumerable, IDisposable
OwnContent = own;
}
+///
+/// Create a new array
+///
+/ The native array to be wrapped.
+/ Whether this wrapper owns the native array.
+/ For compatibility with other EFL#
containers.
public Array(IntPtr handle, bool own, bool ownContent)
{
if (handle == IntPtr.Zero)
@@ -124,11 +145,16 @@ public class Array : IEnumerable, IDisposable
OwnContent = ownContent;
}
+///
+/// Finalizer to be called from the Garbage Collector.
+///
~Array()
{
Dispose(false);
}
-
+/// Disposes of this wrapper, releasing the native array if
owned.
+/// True if this was called from public method. False if
+/// called from the C# finalizer.
protected virtual void Dispose(bool disposing)
{
IntPtr h = Handle;
@@ -160,17 +186,23 @@ public class Array : IEnumerable, IDisposable
}
}
+/// Releases the native resources held by this instance.
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
+/// Releases the native resources held by this instance.
public void Free()
{
Dispose();
}
+///
+/// Releases the native array.
+///
+/// The native array.
public IntPtr Release()
{
IntPtr h = Handle;
@@ -190,18 +222,28 @@ public class Array : IEnumerable, IDisposable
}
}
+///
+/// Clears an array's elements and deallocates the memory.
+///
public void Clean()
{
FreeElementsIfOwned();
eina_array_clean_custom_export_mono(Handle);
}
+///
+/// Clears an array's elements and deallocates the memory.
+///
public void Flush()
{
FreeElementsIfOwned();
eina_array_flush(Handle);
}
+///
+/// Returns the number of elements in an array.
+///
+/// The number of elements.
public int Count()
{
return (int)eina_array_count_custom_export_mono(Handle);
@@ -219,6 +261,10 @@ public class Array : IEnumerable, IDisposable
OwnContent = ownContent;
}
+///
+/// Inserts the element of the array at the end.
+///
+/ The value of the element to be inserted.
public bool Push(T val)
{
IntPtr ele = ManagedToNativeAlloc(val);
@@ -240,6 +286,10 @@ public
[EGIT] [core/efl] master 02/06: Updating README for clang requirements.
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c2a9cc4de4eb7ee58aded43800259f882274fba2 commit c2a9cc4de4eb7ee58aded43800259f882274fba2 Author: Bruno da Silva Belo Date: Thu Sep 26 21:49:00 2019 + Updating README for clang requirements. OpenMP needs to be installed in system to sucessfully compile with clang, needs libomp, while gcc use his version, libgomp. Reviewed-by: Stefan Schmidt Differential Revision: https://phab.enlightenment.org/D10213 --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 10b88d15e0..2f0c41d4f4 100644 --- a/README +++ b/README @@ -472,6 +472,7 @@ Required by default: * libraw * libspectre * librsvg + * openmp (clang needs libomp, while gcc uses libgomp) You might want webp support so disable fewer loaders and remove webp from the disablers with: --
[EGIT] [core/efl] master 01/01: efl_ui_suite: Some pointers were being delete.
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=97846281b5cc8c77e243e2547ac14ad155961186 commit 97846281b5cc8c77e243e2547ac14ad155961186 Author: Bruno da Silva Belo Date: Fri Sep 27 15:07:37 2019 + efl_ui_suite: Some pointers were being delete. `efl_ui_smart_transition_lifetime` test causes segfault when compile with `clang`. Fixes half of T8277 Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D10221 --- src/tests/elementary/efl_ui_test_spotlight.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tests/elementary/efl_ui_test_spotlight.c b/src/tests/elementary/efl_ui_test_spotlight.c index 9749258273..c093efb46b 100644 --- a/src/tests/elementary/efl_ui_test_spotlight.c +++ b/src/tests/elementary/efl_ui_test_spotlight.c @@ -353,11 +353,11 @@ EFL_START_TEST (efl_ui_smart_transition_lifetime) t = _create_transition(); efl_wref_add(t, ); t1 = _create_transition(); - efl_wref_add(t1, ); efl_ui_spotlight_manager_set(container, t); efl_ui_spotlight_manager_set(container, t1); ck_assert_ptr_eq(t, NULL); + ck_assert_ptr_ne(t1, NULL); } EFL_END_TEST @@ -426,6 +426,7 @@ EFL_START_TEST (efl_ui_smart_indicator_calls) Efl_Ui_Spotlight_Manager*i = _create_indicator(); efl_ui_spotlight_indicator_set(container, i); _verify_indicator_calls(); + ck_assert_ptr_ne(i, NULL); } EFL_END_TEST @@ -438,6 +439,8 @@ EFL_START_TEST (efl_ui_smart_indicator_transition_calls) efl_ui_spotlight_indicator_set(container, i); efl_ui_spotlight_manager_set(container, t); _verify_indicator_calls(); + ck_assert_ptr_ne(i, NULL); + ck_assert_ptr_ne(t, NULL); } EFL_END_TEST --
[EGIT] [core/efl] master 01/01: eolian_cxx: Possible infinite loop, if called.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7ba4f00f57e117d05234d36568602ad73659069b
commit 7ba4f00f57e117d05234d36568602ad73659069b
Author: Bruno da Silva Belo
Date: Thu Sep 26 18:48:20 2019 -0300
eolian_cxx: Possible infinite loop, if called.
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10200
---
src/lib/eolian_cxx/grammar/klass_def.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eolian_cxx/grammar/klass_def.hpp
b/src/lib/eolian_cxx/grammar/klass_def.hpp
index d9c50e1df3..81f40d3ba5 100644
--- a/src/lib/eolian_cxx/grammar/klass_def.hpp
+++ b/src/lib/eolian_cxx/grammar/klass_def.hpp
@@ -635,7 +635,7 @@ struct expression_def
}
friend inline bool operator!=(expression_def const& lhs, expression_def
const& rhs)
{
-return lhs != rhs;
+return !(lhs == rhs);
}
expression_def(Eolian_Expression const* expression) :
value(::eolian_expression_eval(expression, EOLIAN_MASK_ALL))
--
[EGIT] [core/efl] master 02/02: eolian: fixing switch case.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=91ac3774b5bcb5649de4f0360b99c98244d05945
commit 91ac3774b5bcb5649de4f0360b99c98244d05945
Author: Bruno da Silva Belo
Date: Tue Sep 24 16:50:49 2019 -0300
eolian: fixing switch case.
Summary: Scope of the switch breaks compilation.
Reviewers: felipealmeida, segfaultxavi, brunobelo
Reviewed By: brunobelo
Subscribers: segfaultxavi, cedric, brunobelo, felipealmeida, #reviewers,
lauromoura, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10118
---
src/bin/eolian_mono/eolian/mono/documentation.hh | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/documentation.hh
b/src/bin/eolian_mono/eolian/mono/documentation.hh
index a7821c5e5d..6ed8169632 100644
--- a/src/bin/eolian_mono/eolian/mono/documentation.hh
+++ b/src/bin/eolian_mono/eolian/mono/documentation.hh
@@ -188,11 +188,13 @@ struct documentation_generator
is_beta = eolian_object_is_beta(data) ||
eolian_object_is_beta(data2);
break;
case ::EOLIAN_OBJECT_CONSTANT:
- auto names =
utils::split(name_helpers::managed_namespace(::eolian_object_name_get(data)),
'.');
- names.pop_back(); // Remove var name
- ref = name_helpers::join_namespaces(names, '.');
- ref += "Constants.";
- ref +=
name_helpers::managed_name(::eolian_object_short_name_get(data));
+ {
+ auto names =
utils::split(name_helpers::managed_namespace(::eolian_object_name_get(data)),
'.');
+ names.pop_back(); // Remove var name
+ ref = name_helpers::join_namespaces(names, '.');
+ ref += "Constants.";
+ ref +=
name_helpers::managed_name(::eolian_object_short_name_get(data));
+ }
break;
case ::EOLIAN_OBJECT_UNKNOWN:
// If the reference cannot be resolved, just return an empty string
and
--
[EGIT] [core/efl] master 01/01: efl-mono: Additional blank line between all methods.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=15897cd9c38002cfed85d312dd559c6fa4da4cb2
commit 15897cd9c38002cfed85d312dd559c6fa4da4cb2
Author: Bruno da Silva Belo
Date: Mon Sep 23 20:50:27 2019 -0300
efl-mono: Additional blank line between all methods.
Summary:
For better indentation, adding a blank line in the end of
methods.
Test Plan:
using efl_ui_layout.eo.cs, efl_access_object.eo.cs, efl_part.eo.cs and
efl_ui_factory_bind.eo.cs as references,
apply changes to the code then check the diffs of after and before of the
references files
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, felipealmeida, lauromoura
Tags: PHID-PROJ-uhnmnvlvunw6jgoqdnd4, #efl_language_bindings, #refactoring
Maniphest Tasks: T8167
Differential Revision: https://phab.enlightenment.org/D9712
---
.../eolian_mono/eolian/mono/alias_definition.hh| 4 +--
src/bin/eolian_mono/eolian/mono/documentation.hh | 7 ++---
src/bin/eolian_mono/eolian/mono/enum_definition.hh | 2 +-
src/bin/eolian_mono/eolian/mono/events.hh | 11 ---
.../eolian/mono/function_declaration.hh| 4 +--
.../eolian_mono/eolian/mono/function_definition.hh | 30 +--
.../eolian_mono/eolian/mono/function_helpers.hh| 34 +++---
src/bin/eolian_mono/eolian/mono/klass.hh | 24 +++
src/bin/eolian_mono/eolian/mono/name_helpers.hh| 2 +-
src/bin/eolian_mono/eolian/mono/parameter.hh | 24 +++
src/bin/eolian_mono/eolian/mono/part_definition.hh | 2 +-
.../eolian_mono/eolian/mono/struct_definition.hh | 6 ++--
src/bin/eolian_mono/eolian/mono/struct_fields.hh | 2 +-
13 files changed, 75 insertions(+), 77 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/alias_definition.hh
b/src/bin/eolian_mono/eolian/mono/alias_definition.hh
index 12d9ce78f9..d4a4b5d47f 100644
--- a/src/bin/eolian_mono/eolian/mono/alias_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/alias_definition.hh
@@ -62,8 +62,8 @@ struct alias_definition_generator
<< scope_tab << "public static implicit operator " <<
alias_type << "(" << alias_name << " value)\n"
<< scope_tab << "{\n"
<< scope_tab << scope_tab << "return value.payload;\n"
- << scope_tab << "}\n\n"
- << "}\n\n"
+ << scope_tab << "}\n"
+ << "}\n"
).generate(sink, alias, context))
return false;
diff --git a/src/bin/eolian_mono/eolian/mono/documentation.hh
b/src/bin/eolian_mono/eolian/mono/documentation.hh
index 2b4ed87a8d..234ce49430 100644
--- a/src/bin/eolian_mono/eolian/mono/documentation.hh
+++ b/src/bin/eolian_mono/eolian/mono/documentation.hh
@@ -23,7 +23,7 @@ struct documentation_generator
int scope_size = 0;
- documentation_generator(int scope_size)
+ documentation_generator(int scope_size = 0)
: scope_size(scope_size) {}
@@ -595,9 +595,8 @@ struct documentation_generator
else
ref = "";
- if (!as_generator(
- scope_tab << "/// " << summary << " See " << ref <<
"\n"
- ).generate(sink, param, context))
+ if (!as_generator(scope_tab(scope_size) << "/// " << summary << " See " << ref <<
"\n")
+.generate(sink, param, context))
return false;
}
return true;
diff --git a/src/bin/eolian_mono/eolian/mono/enum_definition.hh
b/src/bin/eolian_mono/eolian/mono/enum_definition.hh
index 4dae3cc7aa..c5ab79ae66 100644
--- a/src/bin/eolian_mono/eolian/mono/enum_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/enum_definition.hh
@@ -45,7 +45,7 @@ struct enum_definition_generator
return false;
}
- if(!as_generator("}\n\n").generate(sink, attributes::unused, context))
return false;
+ if(!as_generator("}\n").generate(sink, attributes::unused, context))
return false;
if(!name_helpers::close_namespaces(sink, enum_.namespaces, context))
return false;
diff --git a/src/bin/eolian_mono/eolian/mono/events.hh
b/src/bin/eolian_mono/eolian/mono/events.hh
index 14a7f9b5ce..6c5f12ea2a 100644
--- a/src/bin/eolian_mono/eolian/mono/events.hh
+++ b/src/bin/eolian_mono/eolian/mono/events.hh
@@ -255,7 +255,7 @@ struct event_argument_wrapper_generator
<< scope_tab << "/// Actual event
payload.\n"
<
[EGIT] [core/efl] master 01/01: eolian-mono: add compiler's complaint methods.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1f767c81e5d30d8caf88934bb36a71603fd5fc19
commit 1f767c81e5d30d8caf88934bb36a71603fd5fc19
Author: Bruno da Silva Belo
Date: Tue Sep 17 19:35:31 2019 -0300
eolian-mono: add compiler's complaint methods.
Summary: New default checkers breaks mono's test.
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D
---
src/tests/efl_mono/dummy_test_object.c | 22 ++
src/tests/efl_mono/dummy_test_object.eo | 3 +++
2 files changed, 25 insertions(+)
diff --git a/src/tests/efl_mono/dummy_test_object.c
b/src/tests/efl_mono/dummy_test_object.c
index a880dc40c6..110af73d6d 100644
--- a/src/tests/efl_mono/dummy_test_object.c
+++ b/src/tests/efl_mono/dummy_test_object.c
@@ -16,6 +16,8 @@ typedef struct Dummy_Test_Object_Data
Eina_List *list_for_accessor;
int setter_only;
int iface_prop;
+ int protected_prop;
+ int public_getter_private_setter;
Eo *provider;
Eo *iface_provider;
int prop1;
@@ -4672,6 +4674,26 @@ int _dummy_test_object_get_setter_only(EINA_UNUSED Eo
*obj, Dummy_Test_Object_Da
return pd->setter_only;
}
+void _dummy_test_object_dummy_test_iface_protected_prop_set(EINA_UNUSED Eo
*obj, Dummy_Test_Object_Data *pd, int value)
+{
+ pd->protected_prop = value;
+}
+
+int _dummy_test_object_dummy_test_iface_protected_prop_get(EINA_UNUSED const
Eo *obj, Dummy_Test_Object_Data *pd)
+{
+ return pd->protected_prop;
+}
+
+void
_dummy_test_object_dummy_test_iface_public_getter_private_setter_set(EINA_UNUSED
Eo *obj, Dummy_Test_Object_Data *pd, int value)
+{
+ pd->public_getter_private_setter = value;
+}
+
+int
_dummy_test_object_dummy_test_iface_public_getter_private_setter_get(EINA_UNUSED
const Eo *obj, Dummy_Test_Object_Data *pd)
+{
+ return pd->public_getter_private_setter;
+}
+
void _dummy_test_object_dummy_test_iface_iface_prop_set(EINA_UNUSED Eo *obj,
Dummy_Test_Object_Data *pd, int value)
{
pd->iface_prop = value;
diff --git a/src/tests/efl_mono/dummy_test_object.eo
b/src/tests/efl_mono/dummy_test_object.eo
index 676b68a421..52eab417f1 100644
--- a/src/tests/efl_mono/dummy_test_object.eo
+++ b/src/tests/efl_mono/dummy_test_object.eo
@@ -1653,6 +1653,9 @@ class Dummy.Test_Object extends Efl.Object implements
Dummy.Test_Iface {
Efl.Object.provider_find;
Dummy.Test_Iface.emit_nonconflicted;
Dummy.Test_Iface.iface_prop { get; set; }
+ Dummy.Test_Iface.protected_prop { get; set; }
+ Dummy.Test_Iface.public_getter_private_setter{ get; set; }
+ Dummy.Test_Iface.static_prop{ get; set; }
Dummy.Test_Iface.method_protected;
Dummy.Test_Iface.call_method_protected;
}
--
[EGIT] [core/efl] master 01/01: eolian-mono: Removing I prefix from classes.
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b36e159d313bae4a6dd4e0c60deae0aef2309b50
commit b36e159d313bae4a6dd4e0c60deae0aef2309b50
Author: Bruno da Silva Belo
Date: Fri Sep 6 16:03:23 2019 +0200
eolian-mono: Removing I prefix from classes.
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, brunobelo, felipealmeida, #reviewers, lauromoura,
#committers
Tags: #efl
Maniphest Tasks: T8166
Differential Revision: https://phab.enlightenment.org/D9816
---
src/bin/eolian_mono/eolian/mono/name_helpers.hh | 17 +++--
src/bindings/mono/efl_mono/GenericModel.cs | 6 +++---
src/tests/efl_mono/Model.cs | 2 +-
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/name_helpers.hh
b/src/bin/eolian_mono/eolian/mono/name_helpers.hh
index 8104a78af6..a1fd8cd6d0 100644
--- a/src/bin/eolian_mono/eolian/mono/name_helpers.hh
+++ b/src/bin/eolian_mono/eolian/mono/name_helpers.hh
@@ -293,11 +293,9 @@ struct klass_interface_name_generator
template
std::string operator()(T const& klass) const
{
-std::string name = utils::remove_all(klass.eolian_name, '_');
-if (klass.type == attributes::class_type::mixin || klass.type ==
attributes::class_type::interface_)
- return "I" + name;
-else
- return name;
+ return ((klass.type == attributes::class_type::mixin
+ || klass.type == attributes::class_type::interface_) ? "I" : "")
+ + utils::remove_all(klass.eolian_name, '_');
}
template
@@ -325,10 +323,9 @@ struct klass_full_interface_name_generator
template
inline std::string klass_concrete_name(T const& klass)
{
- if (klass.type == attributes::class_type::mixin || klass.type ==
attributes::class_type::interface_)
-return klass_interface_name(klass) + "Concrete";
-
- return utils::remove_all(klass.eolian_name, '_');
+ return utils::remove_all(klass.eolian_name, '_') + ((klass.type ==
attributes::class_type::mixin
+ || klass.type == attributes::class_type::interface_)
+ ? "Concrete" : "");
}
template
@@ -425,7 +422,7 @@ inline std::string managed_event_name(std::string const&
name)
inline std::string managed_event_args_short_name(attributes::event_def const&
evt)
{
- return klass_concrete_or_interface_name(evt.klass) +
name_helpers::managed_event_name(evt.name) + "Args";
+ return utils::remove_all(evt.klass.eolian_name, '_') +
name_helpers::managed_event_name(evt.name) + "Args";
}
inline std::string managed_event_args_name(attributes::event_def evt)
diff --git a/src/bindings/mono/efl_mono/GenericModel.cs
b/src/bindings/mono/efl_mono/GenericModel.cs
index 95389f8ddb..25d9c79955 100644
--- a/src/bindings/mono/efl_mono/GenericModel.cs
+++ b/src/bindings/mono/efl_mono/GenericModel.cs
@@ -125,7 +125,7 @@ public class GenericModel : Efl.Object, Efl.IModel,
IDisposable
}
/// Event triggered when properties on the wrapped model
changes.
- public event EventHandler
PropertiesChangedEvent
+ public event EventHandler
PropertiesChangedEvent
{
add {
model.PropertiesChangedEvent += value;
@@ -136,7 +136,7 @@ public class GenericModel : Efl.Object, Efl.IModel,
IDisposable
}
/// Event triggered when a child is added from the wrapped
model.
- public event EventHandler ChildAddedEvent
+ public event EventHandler ChildAddedEvent
{
add {
model.ChildAddedEvent += value;
@@ -147,7 +147,7 @@ public class GenericModel : Efl.Object, Efl.IModel,
IDisposable
}
/// Event triggered when a child is removed from the wrapped
model.
- public event EventHandler ChildRemovedEvent
+ public event EventHandler ChildRemovedEvent
{
add {
model.ChildRemovedEvent += value;
diff --git a/src/tests/efl_mono/Model.cs b/src/tests/efl_mono/Model.cs
index 829accfb5c..4ec6ef3f0b 100644
--- a/src/tests/efl_mono/Model.cs
+++ b/src/tests/efl_mono/Model.cs
@@ -66,7 +66,7 @@ public class TestModel {
string propertyBound = null;
bool callbackCalled = false;
var factory = new Efl.Ui.ItemFactory();
-factory.PropertyBoundEvent += (object sender,
Efl.Ui.IPropertyBindPropertyBoundEventArgs args) => {
+factory.PropertyBoundEvent += (object sender,
Efl.Ui.PropertyBindPropertyBoundEventArgs args) => {
propertyBound = args.arg;
callbackCalled = true;
};
--
[EGIT] [core/efl] master 01/01: csharp: Registering events when using Components.Basic.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c681b3a1b38a097d632784427225a19f1eddd82b
commit c681b3a1b38a097d632784427225a19f1eddd82b
Author: Bruno da Silva Belo
Date: Wed Sep 11 17:21:02 2019 -0300
csharp: Registering events when using Components.Basic.
Summary:
With `Components.Basic`, it isn't registering events,
while `Components.Ui` do with `elm_init`
Fixes T7770
Thanks @lauromoura
Test Plan: Look T7770
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, brunobelo, felipealmeida, #reviewers, lauromoura,
#committers
Tags: #efl
Maniphest Tasks: T7770
Differential Revision: https://phab.enlightenment.org/D9909
---
src/bindings/mono/efl_mono/efl_all.cs| 2 ++
src/bindings/mono/efl_mono/efl_csharp_application.cs | 1 +
2 files changed, 3 insertions(+)
diff --git a/src/bindings/mono/efl_mono/efl_all.cs
b/src/bindings/mono/efl_mono/efl_all.cs
index e1f020746b..2eedc4d896 100644
--- a/src/bindings/mono/efl_mono/efl_all.cs
+++ b/src/bindings/mono/efl_mono/efl_all.cs
@@ -13,6 +13,7 @@ static class UnsafeNativeMethods
{
private delegate void init_func_delegate();
[DllImport(efl.Libs.Ecore)] public static extern void ecore_init();
+[DllImport(efl.Libs.Ecore)] public static extern void ecore_init_ex(int
argc, IntPtr argv);
[DllImport(efl.Libs.Ecore)] public static extern void ecore_shutdown();
// dotnet loads libraries from DllImport with RTLD_LOCAL. Due to the
// way evas modules are built with meson, currently they do not link
directly
@@ -54,6 +55,7 @@ public static class All
Eina.Config.Init();
Efl.Eo.Config.Init();
ecore_init();
+ecore_init_ex(0, IntPtr.Zero);
evas_init();
eldbus.Config.Init();
diff --git a/src/bindings/mono/efl_mono/efl_csharp_application.cs
b/src/bindings/mono/efl_mono/efl_csharp_application.cs
index 93df6e7a3b..92714098c2 100644
--- a/src/bindings/mono/efl_mono/efl_csharp_application.cs
+++ b/src/bindings/mono/efl_mono/efl_csharp_application.cs
@@ -46,6 +46,7 @@ public abstract class Application
Eina.Config.Init();
Efl.Eo.Config.Init();
ecore_init();
+ecore_init_ex(0, IntPtr.Zero);
evas_init();
eldbus.Config.Init();
--
[EGIT] [core/efl] master 01/01: csharp: Adding ToString methods to Strbuf and custommarshaler.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=50a1572c093d8c2620cd4d1e9d48950fe7eeae95
commit 50a1572c093d8c2620cd4d1e9d48950fe7eeae95
Author: Bruno da Silva Belo
Date: Tue Sep 10 17:42:19 2019 -0300
csharp: Adding ToString methods to Strbuf and custommarshaler.
Summary:
WIN32 should use a allocator and deallocator different from EFL, sometimes,
when
freeing a pointer, it should use win32_free. To stardardize, A
custommarshaler
is used to fix this problem.
Fixes T8201
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, brunobelo, felipealmeida, #reviewers, lauromoura,
#committers
Tags: #efl
Maniphest Tasks: T8201
Differential Revision: https://phab.enlightenment.org/D9842
---
src/bindings/mono/eina_mono/eina_strbuf.cs | 25 ++---
src/bindings/mono/eina_mono/eina_value.cs | 11 ++-
src/tests/efl_mono/Strbuf.cs | 10 ++
3 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/src/bindings/mono/eina_mono/eina_strbuf.cs
b/src/bindings/mono/eina_mono/eina_strbuf.cs
index a538de0fd2..6fd35a4638 100644
--- a/src/bindings/mono/eina_mono/eina_strbuf.cs
+++ b/src/bindings/mono/eina_mono/eina_strbuf.cs
@@ -32,9 +32,18 @@ static internal class StrbufNativeMethods
[return: MarshalAsAttribute(UnmanagedType.U1)]
internal static extern bool eina_strbuf_append_char(IntPtr buf, char c);
-[DllImport(efl.Libs.Eina)]
+[DllImport(efl.Libs.Eina, CharSet=CharSet.Ansi)]
+[return:
+ MarshalAs(UnmanagedType.CustomMarshaler,
+ MarshalTypeRef=typeof(Efl.Eo.StringPassOwnershipMarshaler))]
internal static extern string eina_strbuf_string_steal(IntPtr buf);
+[DllImport(efl.Libs.Eina, CharSet=CharSet.Ansi)]
+[return:
+ MarshalAs(UnmanagedType.CustomMarshaler,
+ MarshalTypeRef=typeof(Efl.Eo.StringKeepOwnershipMarshaler))]
+internal static extern string eina_strbuf_string_get(IntPtr buf);
+
[DllImport(efl.Libs.Eina)]
internal static extern IntPtr eina_strbuf_length_get(IntPtr buf); // Uses
IntPtr as wrapper for size_t
}
@@ -176,8 +185,18 @@ public class Strbuf : IDisposable
throw new ObjectDisposedException(base.GetType().Name);
}
-return eina_strbuf_string_steal(Handle);
+return eina_strbuf_string_steal(this.Handle);
}
-}
+/// Copy the content of a buffer.
+public override string ToString()
+{
+if (Disposed)
+{
+throw new ObjectDisposedException(base.GetType().Name);
+}
+
+return eina_strbuf_string_get(this.Handle);
+}
+}
} // namespace eina
diff --git a/src/bindings/mono/eina_mono/eina_value.cs
b/src/bindings/mono/eina_mono/eina_value.cs
index 57a615772b..54c437d352 100644
--- a/src/bindings/mono/eina_mono/eina_value.cs
+++ b/src/bindings/mono/eina_mono/eina_value.cs
@@ -173,7 +173,10 @@ static internal class UnsafeNativeMethods
internal static extern int eina_value_compare_wrapper(IntPtr handle,
IntPtr other);
[DllImport(efl.Libs.Eina, CharSet=CharSet.Ansi)]
-internal static extern IntPtr eina_value_to_string(IntPtr handle); // We
take ownership of the returned string.
+[return:
+ MarshalAs(UnmanagedType.CustomMarshaler,
+ MarshalTypeRef=typeof(Efl.Eo.StringPassOwnershipMarshaler))]
+internal static extern string eina_value_to_string(IntPtr handle); // We
take ownership of the returned string.
[DllImport(efl.Libs.CustomExports)]
[return: MarshalAsAttribute(UnmanagedType.U1)]
@@ -2611,10 +2614,8 @@ public class Value : IDisposable, IComparable,
IEquatable
public override String ToString()
{
SanityChecks();
-IntPtr ptr = eina_value_to_string(this.Handle);
-String str = Marshal.PtrToStringAnsi(ptr);
-MemoryNative.Free(ptr);
-return str;
+return eina_value_to_string(this.Handle);
+
}
/// Empties an optional Eina.Value, freeing what was previously
contained.
diff --git a/src/tests/efl_mono/Strbuf.cs b/src/tests/efl_mono/Strbuf.cs
index ef2cc56f16..78e9c5cbc3 100644
--- a/src/tests/efl_mono/Strbuf.cs
+++ b/src/tests/efl_mono/Strbuf.cs
@@ -16,6 +16,16 @@ class TestStrBuf
Test.AssertEquals("Here's Johnny!", buf.Steal());
}
+public static void test_tostring()
+{
+Eina.Strbuf buf = new Eina.Strbuf();
+buf.Append("Hello");
+buf.Append(' ');
+buf.Append("World!");
+
+Test.AssertEquals("Hello World!", buf.ToString());
+}
+
public static void test_eolian()
{
var obj = new Dummy.TestObject();
--
[EGIT] [tools/examples] master 01/01: csharp: Basic components for all tests without Ui.
xartigas pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=242ed076f3836f60bf84a32f2ded77879f3bd860
commit 242ed076f3836f60bf84a32f2ded77879f3bd860
Author: Bruno da Silva Belo
Date: Thu Sep 12 15:01:45 2019 +0200
csharp: Basic components for all tests without Ui.
Summary:
Uiless tests use basic components.
Make test terminate again.
Reviewers: lauromoura, felipealmeida, segfaultxavi
Reviewed By: segfaultxavi
Subscribers: brunobelo, felipealmeida, lauromoura
Differential Revision: https://phab.enlightenment.org/D9916
---
reference/csharp/eina/src/eina_array.cs| 2 +-
reference/csharp/eina/src/eina_hash.cs | 2 +-
reference/csharp/eina/src/eina_iterator.cs | 2 +-
reference/csharp/eina/src/eina_list.cs | 2 +-
reference/csharp/eina/src/eina_log.cs | 2 +-
reference/csharp/eina/src/eina_value.cs| 2 +-
tutorial/csharp/eo-intro/src/eo_intro_main.cs | 2 +-
tutorial/csharp/hello-world/src/hello-world.cs | 9 +
8 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/reference/csharp/eina/src/eina_array.cs
b/reference/csharp/eina/src/eina_array.cs
index dffb394b..3864bded 100644
--- a/reference/csharp/eina/src/eina_array.cs
+++ b/reference/csharp/eina/src/eina_array.cs
@@ -76,7 +76,7 @@ public class Example : Efl.Csharp.Application
public static void Main()
{
var example = new Example();
-example.Launch();
+example.Launch(Efl.Csharp.Components.Basic);
}
}
diff --git a/reference/csharp/eina/src/eina_hash.cs
b/reference/csharp/eina/src/eina_hash.cs
index 07b23199..ee8e6019 100644
--- a/reference/csharp/eina/src/eina_hash.cs
+++ b/reference/csharp/eina/src/eina_hash.cs
@@ -131,6 +131,6 @@ public class Example : Efl.Csharp.Application
public static void Main()
{
var example = new Example();
-example.Launch();
+example.Launch(Efl.Csharp.Components.Basic);
}
}
diff --git a/reference/csharp/eina/src/eina_iterator.cs
b/reference/csharp/eina/src/eina_iterator.cs
index 498c3e5a..c8d29f8b 100644
--- a/reference/csharp/eina/src/eina_iterator.cs
+++ b/reference/csharp/eina/src/eina_iterator.cs
@@ -80,6 +80,6 @@ public class Example : Efl.Csharp.Application
public static void Main()
{
var example = new Example();
-example.Launch();
+example.Launch(Efl.Csharp.Components.Basic);
}
}
diff --git a/reference/csharp/eina/src/eina_list.cs
b/reference/csharp/eina/src/eina_list.cs
index 059f4d79..8f2956be 100644
--- a/reference/csharp/eina/src/eina_list.cs
+++ b/reference/csharp/eina/src/eina_list.cs
@@ -70,6 +70,6 @@ public class Example : Efl.Csharp.Application
public static void Main()
{
var example = new Example();
-example.Launch();
+example.Launch(Efl.Csharp.Components.Basic);
}
}
diff --git a/reference/csharp/eina/src/eina_log.cs
b/reference/csharp/eina/src/eina_log.cs
index f671c9af..159853dd 100644
--- a/reference/csharp/eina/src/eina_log.cs
+++ b/reference/csharp/eina/src/eina_log.cs
@@ -64,6 +64,6 @@ public class Example : Efl.Csharp.Application
public static void Main()
{
var example = new Example();
-example.Launch();
+example.Launch(Efl.Csharp.Components.Basic);
}
}
diff --git a/reference/csharp/eina/src/eina_value.cs
b/reference/csharp/eina/src/eina_value.cs
index 328a9dad..3e82e2c7 100644
--- a/reference/csharp/eina/src/eina_value.cs
+++ b/reference/csharp/eina/src/eina_value.cs
@@ -67,6 +67,6 @@ public class Example : Efl.Csharp.Application
public static void Main()
{
var example = new Example();
-example.Launch();
+example.Launch(Efl.Csharp.Components.Basic);
}
}
diff --git a/tutorial/csharp/eo-intro/src/eo_intro_main.cs
b/tutorial/csharp/eo-intro/src/eo_intro_main.cs
index a928b91f..b5ee7730 100644
--- a/tutorial/csharp/eo-intro/src/eo_intro_main.cs
+++ b/tutorial/csharp/eo-intro/src/eo_intro_main.cs
@@ -49,6 +49,6 @@ public class Example : Efl.Csharp.Application
public static void Main()
{
var example = new Example();
-example.Launch();
+example.Launch(Efl.Csharp.Components.Basic);
}
}
diff --git a/tutorial/csharp/hello-world/src/hello-world.cs
b/tutorial/csharp/hello-world/src/hello-world.cs
index a7b04575..2eac0bfe 100644
--- a/tutorial/csharp/hello-world/src/hello-world.cs
+++ b/tutorial/csharp/hello-world/src/hello-world.cs
@@ -2,6 +2,14 @@ using System;
public class Example : Efl.Csharp.Application
{
+// Callback to quit the application
+public static void QuitCb(object sender,
Efl.Gfx.EntityVisibilityChangedEventArgs e)
+{
+// Exit the EFL main loop
+if (e.arg == false)
+ Efl.App.AppMain.Quit(0);
+}
+
protected override void OnInitialize(string[] args)
{
// Create a window and initialize
[EGIT] [tools/examples] master 01/01: Fixing compiles errors from examples, c and c#.
felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=fa93b9f7c0c7f78d4c842cf2ac7758b0d3c2874b
commit fa93b9f7c0c7f78d4c842cf2ac7758b0d3c2874b
Author: Bruno da Silva Belo
Date: Fri Aug 16 15:30:41 2019 -0300
Fixing compiles errors from examples, c and c#.
Summary: Change from efl broke the compilation of examples, updating names
to the new changes.
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Differential Revision: https://phab.enlightenment.org/D9581
---
apps/c/life/src/life_main.c | 2 +-
apps/c/texteditor/src/texteditor_main.c | 2 +-
apps/csharp/life/src/life_main.cs | 2 +-
apps/csharp/texteditor/src/texteditor_main.cs | 12 ++--
reference/c/ui/src/focus_main.c | 4 ++--
reference/c/ui/src/ui_container.c | 2 +-
reference/c/ui/src/ui_translation.c | 2 +-
reference/csharp/ui/src/focus_main.cs | 6 +++---
reference/csharp/ui/src/ui_container.cs | 2 +-
reference/csharp/ui/src/ui_custom_widget.cs | 2 +-
tutorial/c/hello-gui/src/gui_main.c | 2 +-
tutorial/c/lifecycle_ui/src/lifecycle_main.c | 2 +-
tutorial/csharp/hello-gui/src/gui_main.cs | 2 +-
13 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/apps/c/life/src/life_main.c b/apps/c/life/src/life_main.c
index e06c6da6..0c7d8152 100644
--- a/apps/c/life/src/life_main.c
+++ b/apps/c/life/src/life_main.c
@@ -48,7 +48,7 @@ _life_win_key_down(void *data EINA_UNUSED, const Efl_Event
*event)
ev = event->info;
win = event->object;
- if (!strcmp(efl_input_key_get(ev), "space"))
+ if (!strcmp(efl_input_key_sym_get(ev), "space"))
life_board_pause_toggle(win);
}
diff --git a/apps/c/texteditor/src/texteditor_main.c
b/apps/c/texteditor/src/texteditor_main.c
index 89e65af4..7a5501bb 100644
--- a/apps/c/texteditor/src/texteditor_main.c
+++ b/apps/c/texteditor/src/texteditor_main.c
@@ -41,7 +41,7 @@ _gui_toolbar_button_add(Efl_Ui_Box *toolbar, const char *name,
button = efl_add(EFL_UI_BUTTON_CLASS, toolbar,
efl_text_set(efl_added, name),
efl_pack(toolbar, efl_added),
-efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
func, efl_added));
efl_add(EFL_UI_IMAGE_CLASS, toolbar,
diff --git a/apps/csharp/life/src/life_main.cs
b/apps/csharp/life/src/life_main.cs
index 11436a3c..a287f6c0 100644
--- a/apps/csharp/life/src/life_main.cs
+++ b/apps/csharp/life/src/life_main.cs
@@ -31,7 +31,7 @@ public class LifeWindow : Efl.Csharp.Application
void KeyDownEvt(object sender, Efl.Input.IInterfaceKeyDownEvt_Args ev)
{
-if (ev.arg.GetKey() == "space")
+if (ev.arg.GetKeySym() == "space")
lifeBoard.TogglePause(win);
}
diff --git a/apps/csharp/texteditor/src/texteditor_main.cs
b/apps/csharp/texteditor/src/texteditor_main.cs
index f01cb733..4b63c544 100644
--- a/apps/csharp/texteditor/src/texteditor_main.cs
+++ b/apps/csharp/texteditor/src/texteditor_main.cs
@@ -61,7 +61,7 @@ public class TextEditor : Efl.Csharp.Application
{
var popup = new Efl.Ui.TextAlertPopup (win);
popup.SetText(message);
-popup.SetExpandable(new Eina.Size2D(200, 200));
+popup.SetHintSizeMax(new Eina.Size2D(200, 200));
popup.SetButton(Efl.Ui.AlertPopupButton.Positive, "OK", null);
popup.ButtonClickedEvt +=
(object sender, Efl.Ui.AlertPopupButtonClickedEvt_Args ea) => {
@@ -72,7 +72,7 @@ public class TextEditor : Efl.Csharp.Application
// Adds a button to the toolbar, with the given text, icon and click event
handler
private Efl.Ui.Button GUIToolbarButtonAdd(Efl.Ui.Box toolbar, string name,
- string iconName,
EventHandler func)
+ string iconName,
EventHandler func)
{
var button = new Efl.Ui.Button(toolbar);
button.SetText(name);
@@ -102,7 +102,7 @@ public class TextEditor : Efl.Csharp.Application
// "New" button
toolbarButtonNew = GUIToolbarButtonAdd(bar, "New", "document-new",
- (object sender, Efl.Ui.IClickableClickedEvt_Args ea) => {
+ (object sender, Efl.Input.IClickableClickedEvt_Args ea) => {
// When this button is clicked, remove content and refresh
toolbar
editorTextBox.SetText("");
GUIToolbarRefresh();
@@ -110,7 +110,7 @@ public class TextEditor : Efl.Csharp.Application
// "Save" button
toolbarButtonSave = GUIToolbarButtonAdd(bar, "Save", "document-save",
[EGIT] [core/efl] master 01/01: csharp: Minor change to D9692
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=edae55fc764226c0de700dc3ae7b89dc113b2238
commit edae55fc764226c0de700dc3ae7b89dc113b2238
Author: Bruno da Silva Belo
Date: Wed Sep 11 23:17:39 2019 -0300
csharp: Minor change to D9692
Summary: Changing Evt to Event from some files that it wasn't catch on D9692
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, felipealmeida, #reviewers, lauromoura, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D9904
---
src/examples/ecore/efl_mono_loop_timer_example.cs | 6 +++---
src/examples/elementary/efl_ui_slider_mono.cs | 4 ++--
src/tests/efl_mono/Eo.cs | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/examples/ecore/efl_mono_loop_timer_example.cs
b/src/examples/ecore/efl_mono_loop_timer_example.cs
index a6ad05b491..7e8991676e 100644
--- a/src/examples/ecore/efl_mono_loop_timer_example.cs
+++ b/src/examples/ecore/efl_mono_loop_timer_example.cs
@@ -25,9 +25,9 @@ class TestMain
Console.WriteLine("Starting MainLoop");
-timer.TimerTickEvt += listener.on_tick;
-timer.TimerTickEvt += listener.another_callback;
-timer.TimerTickEvt -= listener.another_callback;
+timer.TimerTickEvent += listener.on_tick;
+timer.TimerTickEvent += listener.another_callback;
+timer.TimerTickEvent -= listener.another_callback;
loop.Begin();
diff --git a/src/examples/elementary/efl_ui_slider_mono.cs
b/src/examples/elementary/efl_ui_slider_mono.cs
index c2a3232f14..739601a498 100644
--- a/src/examples/elementary/efl_ui_slider_mono.cs
+++ b/src/examples/elementary/efl_ui_slider_mono.cs
@@ -11,7 +11,7 @@ public class Example
button.SetText(text);
button.SetSize(new Eina.Size2D(w, h));
-((Efl.Ui.Clickable)button).ClickedEvt += callback;
+((Efl.Ui.Clickable)button).ClickedEvent += callback;
return button;
}
@@ -57,7 +57,7 @@ public class Example
Efl.Ui.Slider slider = new Efl.Ui.Slider(box);
slider.SetSize(new Eina.Size2D(W, H));
-slider.ChangedEvt += (object sender, EventArgs e) => {
+slider.ChangedEvent += (object sender, EventArgs e) => {
bar.SetRangeValue(slider.GetRangeValue());
};
diff --git a/src/tests/efl_mono/Eo.cs b/src/tests/efl_mono/Eo.cs
index adfec9e175..4c7196ec5b 100644
--- a/src/tests/efl_mono/Eo.cs
+++ b/src/tests/efl_mono/Eo.cs
@@ -57,7 +57,7 @@ class TestEo
{
var obj = new Dummy.TestObject();
Eina.Log.Error($"Created object 0x{obj.NativeHandle.ToInt64():x}");
- obj.DelEvt += (object sender, EventArgs e) => { delEventCalled =
true; };
+ obj.DelEvent += (object sender, EventArgs e) => { delEventCalled =
true; };
Eina.Log.Error($"Will dispose object
0x{obj.NativeHandle.ToInt64():x}");
((IDisposable)obj).Dispose();
}
--
[EGIT] [core/efl] master 01/01: eolian-mono: Changing order of scope and modifier.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6ce53b9c0f85a8b94ad90bc9abebc0c21d08e84c
commit 6ce53b9c0f85a8b94ad90bc9abebc0c21d08e84c
Author: Bruno da Silva Belo
Date: Tue Sep 10 17:06:17 2019 -0300
eolian-mono: Changing order of scope and modifier.
Summary: sealed public is now public sealed and virtual public is public
virtual
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, brunobelo, felipealmeida, #reviewers, lauromoura,
#committers
Tags: #refactoring, PHID-PROJ-uhnmnvlvunw6jgoqdnd4, #efl_language_bindings
Maniphest Tasks: T8172
Differential Revision: https://phab.enlightenment.org/D9725
---
src/bin/eolian_mono/eolian/mono/function_definition.hh | 2 +-
src/bin/eolian_mono/eolian/mono/klass.hh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/function_definition.hh
b/src/bin/eolian_mono/eolian/mono/function_definition.hh
index b0bd88c40e..81e2ad81ef 100644
--- a/src/bin/eolian_mono/eolian/mono/function_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/function_definition.hh
@@ -188,7 +188,7 @@ struct function_definition_generator
self = "";
if(!as_generator
- (scope_tab << ((do_super && !f.is_static) ? "virtual " : "") <<
eolian_mono::function_scope_get(f) << (f.is_static ? "static " : "") <<
return_type << " " << string << "(" << (parameter % ", ")
+ (scope_tab << eolian_mono::function_scope_get(f) << ((do_super &&
!f.is_static) ? "virtual " : "") << (f.is_static ? "static " : "") <<
return_type << " " << string << "(" << (parameter % ", ")
<< ") {\n "
<< eolian_mono::function_definition_preamble()
<< klass_full_native_inherit_name(f.klass) << "." << string <<
"_ptr.Value.Delegate("
diff --git a/src/bin/eolian_mono/eolian/mono/klass.hh
b/src/bin/eolian_mono/eolian/mono/klass.hh
index c10bfb3fda..81d1070aab 100644
--- a/src/bin/eolian_mono/eolian/mono/klass.hh
+++ b/src/bin/eolian_mono/eolian/mono/klass.hh
@@ -198,7 +198,7 @@ struct klass
if(!as_generator
(
documentation
- << "sealed public " << (is_partial ? "partial ":"") << " class "
<< concrete_name << " :\n"
+ << "public sealed " << (is_partial ? "partial ":"") << "class "
<< concrete_name << " :\n"
<< scope_tab << (root ? "Efl.Eo.EoWrapper" : "") <<
(klass_full_concrete_or_interface_name % "") << "\n"
<< scope_tab << ", " << interface_name << "\n"
<< scope_tab << *(", " <<
name_helpers::klass_full_concrete_or_interface_name) << "\n"
--
[EGIT] [core/efl] master 01/01: eolian-mono: Renaming suffix for event and event args
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=353524e1b89deb48b64c6125a92c1627a05deb75
commit 353524e1b89deb48b64c6125a92c1627a05deb75
Author: Bruno da Silva Belo
Date: Fri Sep 6 15:45:18 2019 +0200
eolian-mono: Renaming suffix for event and event args
Summary: suffix _Args to Args, Evt to Event
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: Jaehyun_Cho, woohyun, segfaultxavi, cedric, felipealmeida,
#reviewers, lauromoura, #committers
Tags: #refactoring, PHID-PROJ-uhnmnvlvunw6jgoqdnd4, #efl_language_bindings
Maniphest Tasks: T8164, T8163
Differential Revision: https://phab.enlightenment.org/D9692
---
src/bin/eolian_mono/eolian/mono/name_helpers.hh| 6 ++--
src/bindings/mono/efl_mono/GenericModel.cs | 24 ++---
.../mono/efl_mono/efl_csharp_application.cs| 8 ++---
src/examples/elementary/efl_ui_unit_converter.cs | 6 ++--
src/tests/efl_mono/Errors.cs | 2 +-
src/tests/efl_mono/Events.cs | 40 +++---
src/tests/efl_mono/Model.cs| 2 +-
7 files changed, 43 insertions(+), 45 deletions(-)
diff --git a/src/bin/eolian_mono/eolian/mono/name_helpers.hh
b/src/bin/eolian_mono/eolian/mono/name_helpers.hh
index d6064b2d56..8104a78af6 100644
--- a/src/bin/eolian_mono/eolian/mono/name_helpers.hh
+++ b/src/bin/eolian_mono/eolian/mono/name_helpers.hh
@@ -420,14 +420,12 @@ inline std::string klass_get_full_name(T const& clsname)
// Events
inline std::string managed_event_name(std::string const& name)
{
- return utils::to_pascal_case(utils::split(name, "_,"), "") + "Evt";
+ return utils::to_pascal_case(utils::split(name, "_,"), "") + "Event";
}
inline std::string managed_event_args_short_name(attributes::event_def const&
evt)
{
- std::string ret;
- ret = klass_concrete_or_interface_name(evt.klass);
- return ret + name_helpers::managed_event_name(evt.name) + "_Args";
+ return klass_concrete_or_interface_name(evt.klass) +
name_helpers::managed_event_name(evt.name) + "Args";
}
inline std::string managed_event_args_name(attributes::event_def evt)
diff --git a/src/bindings/mono/efl_mono/GenericModel.cs
b/src/bindings/mono/efl_mono/GenericModel.cs
index 1bfa91e53d..95389f8ddb 100644
--- a/src/bindings/mono/efl_mono/GenericModel.cs
+++ b/src/bindings/mono/efl_mono/GenericModel.cs
@@ -125,46 +125,46 @@ public class GenericModel : Efl.Object, Efl.IModel,
IDisposable
}
/// Event triggered when properties on the wrapped model
changes.
- public event EventHandler
PropertiesChangedEvt
+ public event EventHandler
PropertiesChangedEvent
{
add {
- model.PropertiesChangedEvt += value;
+ model.PropertiesChangedEvent += value;
}
remove {
- model.PropertiesChangedEvt -= value;
+ model.PropertiesChangedEvent -= value;
}
}
/// Event triggered when a child is added from the wrapped
model.
- public event EventHandler ChildAddedEvt
+ public event EventHandler ChildAddedEvent
{
add {
- model.ChildAddedEvt += value;
+ model.ChildAddedEvent += value;
}
remove {
- model.ChildAddedEvt -= value;
+ model.ChildAddedEvent -= value;
}
}
/// Event triggered when a child is removed from the wrapped
model.
- public event EventHandler ChildRemovedEvt
+ public event EventHandler ChildRemovedEvent
{
add {
- model.ChildRemovedEvt += value;
+ model.ChildRemovedEvent += value;
}
remove {
- model.ChildRemovedEvt -= value;
+ model.ChildRemovedEvent -= value;
}
}
/// Event triggered when the number of children changes.
- public event EventHandler ChildrenCountChangedEvt
+ public event EventHandler ChildrenCountChangedEvent
{
add {
- model.ChildrenCountChangedEvt += value;
+ model.ChildrenCountChangedEvent += value;
}
remove {
- model.ChildrenCountChangedEvt -= value;
+ model.ChildrenCountChangedEvent -= value;
}
}
}
diff --git a/src/bindings/mono/efl_mono/efl_csharp_application.cs
b/src/bindings/mono/efl_mono/efl_csharp_application.cs
index 4e3a2522cc..93df6e7a3b 100644
--- a/src/bindings/mono/efl_mono/efl_csharp_application.cs
+++ b/src/bindings/mono/efl_mono/efl_csharp_application.cs
@@ -135,7 +135,7 @@ public abstract class Application
#if EFL_BETA
app.SetCommandArray(command_line);
#endif
-app.ArgumentsEvt += (object sender, LoopArgumentsEvt_Args evt) =>
+app.ArgumentsEvent += (object sender, LoopArgumentsEventArgs evt) =>
{
if (evt.arg.Initialization)
