eo: Avoid namespace clashes.

Summary:
This commit removes some clashes (i.e. names as classes and namespaces
at the same time). It'll avoid nested items that are either forbidden
(C#) or problematic (Python) in some languages.

Reviewers: segfaultxavi, bu5hm4n, felipealmeida

Reviewed By: segfaultxavi

Subscribers: cedric, #reviewers, #committers

Tags: #efl

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

10 files changed, 17 insertions, 17 deletions

diff --git a/src/bindings/mono/efl_mono/efl_all.cs b/src/bindings/mono/efl_mono/efl_all.cs
index 0d5821b0e9..0206ea1063 100644
--- a/src/bindings/mono/efl_mono/efl_all.cs
+++ b/src/bindings/mono/efl_mono/efl_all.cs
@@ -70,7 +70,7 @@ public static class Config {
 #endif
         elm_init(0, IntPtr.Zero);
 
-        elm_policy_set((int)elm.Policy.Quit, (int)elm.policy.Quit.Last_window_hidden);
+        elm_policy_set((int)elm.Policy.Quit, (int)elm.Policy_Quit.Last_window_hidden);
     }
     public static void Shutdown() {
         elm_shutdown();
diff --git a/src/lib/ecore/efl_loop_handler.eo b/src/lib/ecore/efl_loop_handler.eo
index 709017c199..0058ceb8a3 100644
--- a/src/lib/ecore/efl_loop_handler.eo
+++ b/src/lib/ecore/efl_loop_handler.eo
@@ -1,4 +1,4 @@
-enum Efl.Loop.Handler.Flags {
+enum Efl.Loop_Handler_Flags {
    [[ A set of flags that can be OR'd together to indicate which are
    desired ]]
    none = 0, [[ No I/O is desired (generally useless) ]]
@@ -20,7 +20,7 @@ class Efl.Loop_Handler (Efl.Object)
          set { }
          get { }
          values {
-            flags: Efl.Loop.Handler.Flags; [[ The flags that indicate what kind of I/O should be listened for like read, write or error channels. ]]
+            flags: Efl.Loop_Handler_Flags; [[ The flags that indicate what kind of I/O should be listened for like read, write or error channels. ]]
          }
       }
       @property fd {
diff --git a/src/lib/ecore/efl_model_container.eo b/src/lib/ecore/efl_model_container.eo
index 8f2dc32493..77ce8349a9 100644
--- a/src/lib/ecore/efl_model_container.eo
+++ b/src/lib/ecore/efl_model_container.eo
@@ -19,7 +19,7 @@ class Efl.Model_Container (Efl.Loop_Consumer, Efl.Model)
          params {
             name: string; [[Property name]]
          }
-         return: ptr(const(Eina.Value.Type)); [[Property type]]
+         return: ptr(const(Eina.Value_Type)); [[Property type]]
       }
       child_property_values_get {
          [[Gets the values for the given property.]]
@@ -40,7 +40,7 @@ class Efl.Model_Container (Efl.Loop_Consumer, Efl.Model)
            Value type is required for compatibility with the @Efl.Model API.]]
          params {
             name: string; [[Property name]]
-            @cref type: Eina.Value.Type; [[Property type]]
+            @cref type: Eina.Value_Type; [[Property type]]
             values: iterator<const(void_ptr)> @owned; [[Values to be added]]
          }
          return: bool; [[$true on success, $false otherwise]]
diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo
index 75a20946ee..d0e2f350aa 100644
--- a/src/lib/eio/efl_io_manager.eo
+++ b/src/lib/eio/efl_io_manager.eo
@@ -17,7 +17,7 @@ function EflIoPath {
 function EflIoDirectInfo {
   [[EflIoDirectInfo function]]
   params {
-     @in entries: array<ptr(Eina.File.Direct.Info)>; [[Accessor to an array of info.]]
+     @in entries: array<ptr(Eina.File_Direct_Info)>; [[Accessor to an array of info.]]
   }
 };
 
@@ -42,7 +42,7 @@ class Efl.Io.Manager (Efl.Loop_Consumer)
       params {
         @in path: string;[[Path we want to list entries for]]
         @in recursive: bool; [[If $true, list entries recursively, $false otherwise]]
-	info: EflIoDirectInfo; [[Callback called for each packet of @Eina.File.Direct.Info]]
+	info: EflIoDirectInfo; [[Callback called for each packet of @Eina.File_Direct_Info]]
       }
       return: future<uint64> @owned; [[Amount of files found during the listing of the directory]]
     }
@@ -52,7 +52,7 @@ class Efl.Io.Manager (Efl.Loop_Consumer)
       params {
         @in path: string;[[Path we want to list entries for]]
         @in recursive: bool; [[If $true, list entries recursively, $false otherwise]]
-	info: EflIoDirectInfo; [[Callback called for each packet of @Eina.File.Direct.Info]]
+	info: EflIoDirectInfo; [[Callback called for each packet of @Eina.File_Direct_Info]]
       }
       return: future<uint64> @owned; [[Amount of files found during the listing of the directory]]
     }
diff --git a/src/lib/eio/eio_model.eo b/src/lib/eio/eio_model.eo
index 390c6212e9..6e7837aeb8 100644
--- a/src/lib/eio/eio_model.eo
+++ b/src/lib/eio/eio_model.eo
@@ -4,7 +4,7 @@ function EflIoFilter {
   [[EflIoFilter function]]
   params {
     @in model: Eio.Model;
-    @in entry: ptr(Eina.File.Direct.Info);
+    @in entry: ptr(Eina.File_Direct_Info);
   }
   return: int;
 };
diff --git a/src/lib/elementary/elm_general.eot b/src/lib/elementary/elm_general.eot
index bacb9f2b63..73739538fd 100644
--- a/src/lib/elementary/elm_general.eot
+++ b/src/lib/elementary/elm_general.eot
@@ -34,7 +34,7 @@ enum Elm.Policy
 }
 
 /* FIXME: elm_policy API is not bound to EO */
-enum Elm.Policy.Quit
+enum Elm.Policy_Quit
 {
    [[Possible values for the @Elm.Policy.quit policy]]
    none = 0, [[never quit the application automatically]]
@@ -45,7 +45,7 @@ enum Elm.Policy.Quit
 }
 
 /* FIXME: elm_policy API is not bound to EO */
-enum Elm.Policy.Exit
+enum Elm.Policy_Exit
 {
    [[Possible values for the @Elm.Policy.exit policy.
 
@@ -56,7 +56,7 @@ enum Elm.Policy.Exit
 }
 
 /* FIXME: elm_policy API is not bound to EO */
-enum Elm.Policy.Throttle
+enum Elm.Policy_Throttle
 {
    [[Possible values for the @Elm.Policy.throttle policy.
 
diff --git a/src/lib/elementary/elm_multibuttonentry_item.eo b/src/lib/elementary/elm_multibuttonentry_item.eo
index b8d327edd5..a3dbe7b16c 100644
--- a/src/lib/elementary/elm_multibuttonentry_item.eo
+++ b/src/lib/elementary/elm_multibuttonentry_item.eo
@@ -1,4 +1,4 @@
-class Elm.Multibuttonentry.Item(Elm.Widget.Item,
+class Elm.Multibuttonentry_Item(Elm.Widget.Item,
                                 Efl.Access.Widget.Action,
                                 Efl.Ui.Legacy)
 {
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo
index 233da53149..505c67d8fa 100644
--- a/src/lib/elementary/elm_slider.eo
+++ b/src/lib/elementary/elm_slider.eo
@@ -6,7 +6,7 @@ class Elm.Slider (Efl.Ui.Slider_Interval, Efl.Ui.Legacy,
    eo_prefix: elm_obj_slider;
    legacy_prefix: elm_slider;
    parts {
-      indicator: Elm.Slider.Part_Indicator;
+      indicator: Elm.Slider_Part_Indicator;
           [[A floating indicator above the slider.]]
    }
    implements {
diff --git a/src/lib/elementary/elm_slider_part_indicator.eo b/src/lib/elementary/elm_slider_part_indicator.eo
index 934d80875c..f54777bc1d 100644
--- a/src/lib/elementary/elm_slider_part_indicator.eo
+++ b/src/lib/elementary/elm_slider_part_indicator.eo
@@ -1,6 +1,6 @@
 import efl_ui;
 
-class Elm.Slider.Part_Indicator (Efl.Ui.Layout.Part, Efl.Ui.Format)
+class Elm.Slider_Part_Indicator (Efl.Ui.Layout.Part, Efl.Ui.Format)
 {
    [[Elementary slider internal part class]]
    data: null;
diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot
index 95b4ee611d..d08382c1cd 100644
--- a/src/lib/eo/eina_types.eot
+++ b/src/lib/eo/eina_types.eot
@@ -44,7 +44,7 @@ struct @extern Eina.Matrix3 {
 
 type @extern Eina.Unicode: uint32; [[Eina unicode type]]
 
-struct @extern Eina.File.Direct.Info; [[Eina file direct information data structure]]
+struct @extern Eina.File_Direct_Info; [[Eina file direct information data structure]]
 /*{
    path_lenght:    size_t;              [[Size of the whole path]]
    name_length:    size_t;              [[Size of the filename/basename component]]
@@ -77,7 +77,7 @@ struct @extern Eina.Rw_Slice {
     mem: void_ptr; [[Pointer to memory segment]]
 }
 
-struct @extern Eina.Value.Type; [[Eina value type]]
+struct @extern Eina.Value_Type; [[Eina value type]]
 
 struct @extern Eina.Stat {
     [[The structure to store some file statistics.]]