efl_mono: Names fixes after the big rename

Summary: Depends on D5997

Reviewers: felipealmeida

Reviewed By: felipealmeida

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D5998

src/Makefile_Efl_Mono.am

@@ -132,8 +132,7 @@ efl_eolian_blacklisted_files = \
 lib/efl/interfaces/efl_io_buffer.eo.cs \
 lib/efl/interfaces/efl_io_positioner.eo.cs \
 lib/efl/interfaces/efl_io_queue.eo.cs \
-lib/efl/interfaces/efl_io_sizer.eo.cs \
-lib/efl/interfaces/efl_gfx_buffer.eo.cs
+lib/efl/interfaces/efl_io_sizer.eo.cs
 
 ecore_eolian_blacklisted_files = \
 lib/ecore/efl_io_closer_fd.eo.cs \

src/bindings/mono/eo_mono/workaround.cs

@@ -116,24 +116,16 @@ public struct Dbg_Info {
 };
 #pragma warning restore 0169
 
-namespace text {
-
-namespace cursor {
-
 [StructLayout(LayoutKind.Sequential)]
-public struct Cursor {
+public struct Text_Cursor_Cursor {
     IntPtr obj;
     UIntPtr pos; // UIntPtr to automatically change size_t between 32/64
     IntPtr node;
     [MarshalAsAttribute(UnmanagedType.U1)]bool changed;
 }
 
-} // namespace cursor
-
-namespace annotate {
-
 [StructLayout(LayoutKind.Sequential)]
-public struct Annotation {
+public struct Text_Annotate_Annotation {
     IntPtr list;
     IntPtr obj;
     IntPtr start_node;
@@ -141,23 +133,8 @@ public struct Annotation {
     [MarshalAsAttribute(UnmanagedType.U1)]bool is_item;
 }
 
-} // namespace annotate
-
-} // namespace text
-
 public delegate void Signal_Cb(IntPtr data, IntPtr obj, IntPtr emission, IntPtr source);
 
-
-namespace gfx {
-
-public interface Buffer {}
-
-namespace buffer {
-public struct Access_Mode {}
-}
-        
-} // namespace gfx
-
 namespace access {
 
 public struct State_Set {

src/examples/elementary/efl_ui_unit_converter.cs

@@ -21,9 +21,9 @@ public class Example
         popup_text.SetText($"Error: {message}");
         popup.SetContent(popup_text);
         popup.SetVisible(true);
-        popup.SetButton(efl.ui.popup_alert.Button.Positive, "Ok");
+        popup.SetButton(efl.ui.Popup_Alert_Button.Positive, "Ok");
         popup.SetSize(new eina.Size2D(150, 30));
-        popup.ButtonClickedEvt += (object sender, efl.ui.ButtonClickedEvt_Args e) => {
+        popup.ButtonClickedEvt += (object sender, efl.ui.Popup_AlertConcrete.ButtonClickedEvt_Args e) => {
             popup.SetParent(null);
             popup.Del();
         };
@@ -58,7 +58,7 @@ public class Example
         miles_label.SetSize(size);
         miles_label.SetVisible(true);
 
-        efl.ui.text.Editable miles_input = new efl.ui.text.EditableConcrete(miles_box);
+        efl.ui.Text_Editable miles_input = new efl.ui.Text_EditableConcrete(miles_box);
         miles_input.SetText("");
         miles_input.SetScrollable(true);
         miles_input.SetSize(size);
@@ -84,7 +84,7 @@ public class Example
         kms_label.SetSize(size);
         kms_label.SetVisible(true);
 
-        efl.ui.text.Editable kms_input = new efl.ui.text.EditableConcrete(kms_box);
+        efl.ui.Text_Editable kms_input = new efl.ui.Text_EditableConcrete(kms_box);
         kms_input.SetText("");
         kms_input.SetScrollable(true);
         kms_input.SetSize(size);

src/examples/evas/evas_mono_rectangle.cs

@@ -30,7 +30,7 @@ class TestMain
         rect.SetSize(size);
         rect.SetVisible(true);
 
-        canvas.KeyDownEvt += (object sender, efl.input.KeyDownEvt_Args e) => {
+        canvas.KeyDownEvt += (object sender, efl.input.InterfaceConcrete.KeyDownEvt_Args e) => {
             color_index = (color_index + 1) % 3;
             Console.WriteLine("Key Down");
             Console.WriteLine("Got key obj at {0}", e.arg.raw_handle.ToString("X"));

src/examples/evas/evas_mono_text.cs

@@ -87,7 +87,7 @@ class TestMain
 
     }
 
-    private void On_KeyDown(object sender, efl.input.KeyDownEvt_Args e)
+    private void On_KeyDown(object sender, efl.input.InterfaceConcrete.KeyDownEvt_Args e)
     {
         var key = e.arg.GetKey();
 

src/tests/efl_mono/Events.cs

@@ -1,5 +1,7 @@
 using System;
 
+using static test.TestingConcrete; // For the event args
+
 namespace TestSuite
 {
 
@@ -39,7 +41,7 @@ class TestEoEvents
         test.Testing obj = new test.TestingConcrete();
         string received_string = null;
 
-        obj.EvtWithStringEvt += (object sender, test.EvtWithStringEvt_Args e) => {
+        obj.EvtWithStringEvt += (object sender, EvtWithStringEvt_Args e) => {
             received_string = e.arg;
         };
 
@@ -53,7 +55,7 @@ class TestEoEvents
         test.Testing obj = new test.TestingConcrete();
         int received_int= 0;
 
-        obj.EvtWithIntEvt += (object sender, test.EvtWithIntEvt_Args e) => {
+        obj.EvtWithIntEvt += (object sender, EvtWithIntEvt_Args e) => {
             received_int = e.arg;
         };
 
@@ -67,7 +69,7 @@ class TestEoEvents
         test.Testing obj = new test.TestingConcrete();
         bool received_bool = false;
 
-        obj.EvtWithBoolEvt += (object sender, test.EvtWithBoolEvt_Args e) => {
+        obj.EvtWithBoolEvt += (object sender, EvtWithBoolEvt_Args e) => {
             received_bool = e.arg;
         };
 
@@ -84,7 +86,7 @@ class TestEoEvents
     {
         test.Testing obj = new test.TestingConcrete();
         uint received_uint = 0;
-        obj.EvtWithUintEvt += (object sender, test.EvtWithUintEvt_Args e) => {
+        obj.EvtWithUintEvt += (object sender, EvtWithUintEvt_Args e) => {
             received_uint = e.arg;
         };
 
@@ -98,7 +100,7 @@ class TestEoEvents
         test.Testing obj = new test.TestingConcrete();
         test.Testing received_obj = null;
 
-        obj.EvtWithObjEvt += (object sender, test.EvtWithObjEvt_Args e) => {
+        obj.EvtWithObjEvt += (object sender, EvtWithObjEvt_Args e) => {
             received_obj = e.arg;
         };
 
@@ -114,7 +116,7 @@ class TestEoEvents
         test.Testing obj = new test.TestingConcrete();
         eina.Error received_error = 0;
 
-        obj.EvtWithErrorEvt += (object sender, test.EvtWithErrorEvt_Args e) => {
+        obj.EvtWithErrorEvt += (object sender, EvtWithErrorEvt_Args e) => {
             received_error = e.arg;
         };
 
@@ -130,7 +132,7 @@ class TestEoEvents
         test.Testing obj = new test.TestingConcrete();
         test.StructSimple received_struct = default(test.StructSimple);
 
-        obj.EvtWithStructEvt += (object sender, test.EvtWithStructEvt_Args e) => {
+        obj.EvtWithStructEvt += (object sender, EvtWithStructEvt_Args e) => {
             received_struct = e.arg;
         };