efl: refactor all mixins

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

12 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/ecore/efl_io_closer_fd.eo b/src/lib/ecore/efl_io_closer_fd.eo
index 721e449f1d..e601f582ad 100644
--- a/src/lib/ecore/efl_io_closer_fd.eo
+++ b/src/lib/ecore/efl_io_closer_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Closer_Fd (Efl.Io.Closer, Efl.Object) {
+mixin Efl.Io.Closer_Fd requires Efl.Object extends Efl.Io.Closer {
     [[Close fd using close(2).
 
       @since 1.19
diff --git a/src/lib/ector/ector_renderer_gradient.eo b/src/lib/ector/ector_renderer_gradient.eo
index f19aa83147..43b9c1d435 100644
--- a/src/lib/ector/ector_renderer_gradient.eo
+++ b/src/lib/ector/ector_renderer_gradient.eo
@@ -1,4 +1,4 @@
-mixin Ector.Renderer.Gradient (Efl.Gfx.Gradient, Efl.Object)
+mixin Ector.Renderer.Gradient requires Efl.Object extends Efl.Gfx.Gradient
 {
    [[Ector gradient renderer mixin]]
    eo_prefix: ector_renderer_gradient;
diff --git a/src/lib/ector/ector_renderer_shape.eo b/src/lib/ector/ector_renderer_shape.eo
index 0206b1afcf..683b0072f2 100644
--- a/src/lib/ector/ector_renderer_shape.eo
+++ b/src/lib/ector/ector_renderer_shape.eo
@@ -1,6 +1,6 @@
 import ector_renderer;
 
-mixin Ector.Renderer.Shape (Efl.Gfx.Shape, Efl.Object)
+mixin Ector.Renderer.Shape requires Efl.Object extends Efl.Gfx.Shape
 {
    [[Ector shape renderer mixin]]
    eo_prefix: ector_renderer_shape;
diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index ad82be2357..e20f50dc60 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -239,7 +239,7 @@ struct Efl.Access.Relation
    objects: list<Efl.Object>; [[List with relation objects]]
 }
 
-mixin Efl.Access.Object (Efl.Interface, Efl.Object)
+mixin Efl.Access.Object requires Efl.Object
 {
    [[Accessibility accessible mixin]]
    eo_prefix: efl_access_object;
diff --git a/src/lib/elementary/efl_ui_focus_composition.eo b/src/lib/elementary/efl_ui_focus_composition.eo
index 2befe106b0..120867e53a 100644
--- a/src/lib/elementary/efl_ui_focus_composition.eo
+++ b/src/lib/elementary/efl_ui_focus_composition.eo
@@ -1,4 +1,4 @@
-mixin Efl.Ui.Focus.Composition (Efl.Interface, Efl.Ui.Widget) {
+mixin Efl.Ui.Focus.Composition requires Efl.Ui.Widget {
    [[This defines the inheriting widget as Composition widget.
 
      A composition widget is a widget that's the logical parent of another set of widgets which can be used for interaction.
diff --git a/src/lib/elementary/efl_ui_focus_layer.eo b/src/lib/elementary/efl_ui_focus_layer.eo
index a5a3564168..92145ae29c 100644
--- a/src/lib/elementary/efl_ui_focus_layer.eo
+++ b/src/lib/elementary/efl_ui_focus_layer.eo
@@ -1,4 +1,4 @@
-mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Ui.Widget_Focus_Manager) {
+mixin Efl.Ui.Focus.Layer requires Efl.Ui.Widget extends Efl.Ui.Widget_Focus_Manager {
    [[This defines the inheriting widget as focus layer
 
      A focus layer is the uppermost one which received input and handles all focus related events for as long as it exists and is visible. It's NOT possible to escape this layer with focus movement.
diff --git a/src/lib/elementary/efl_ui_focus_manager_sub.eo b/src/lib/elementary/efl_ui_focus_manager_sub.eo
index 40b81fc630..a2414d43eb 100644
--- a/src/lib/elementary/efl_ui_focus_manager_sub.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_sub.eo
@@ -1,4 +1,4 @@
-mixin Efl.Ui.Focus.Manager_Sub (Efl.Interface, Efl.Ui.Focus.Manager, Efl.Object)
+mixin Efl.Ui.Focus.Manager_Sub requires Efl.Object extends Efl.Ui.Focus.Manager
 {
     [[A class that automatically registers its border elements in the parent manager
 
diff --git a/src/lib/elementary/efl_ui_widget_focus_manager.eo b/src/lib/elementary/efl_ui_widget_focus_manager.eo
index c7c3af9037..2c4fe32244 100644
--- a/src/lib/elementary/efl_ui_widget_focus_manager.eo
+++ b/src/lib/elementary/efl_ui_widget_focus_manager.eo
@@ -1,4 +1,4 @@
-mixin Efl.Ui.Widget_Focus_Manager (Efl.Interface, Efl.Ui.Widget, Efl.Ui.Focus.Manager)
+mixin Efl.Ui.Widget_Focus_Manager requires Efl.Ui.Widget extends Efl.Ui.Focus.Manager
 {
   methods {
       focus_manager_create @protected @pure_virtual {
diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo
index f95ce04806..3d81d15d3f 100644
--- a/src/lib/elementary/elm_interface_scrollable.eo
+++ b/src/lib/elementary/elm_interface_scrollable.eo
@@ -27,7 +27,7 @@ enum Elm.Scroller.Single_Direction
    last  [[Sentinel value to indicate last enum field during iteration]]
 }
 
-mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager_Sub, Efl.Ui.Widget, Efl.Ui.Widget_Focus_Manager)
+mixin Elm.Interface_Scrollable requires Efl.Ui.Widget extends Efl.Ui.Scrollable, Efl.Ui.Focus.Manager_Sub, Efl.Ui.Widget_Focus_Manager
 {
    [[Elm scrollable mixin]]
    eo_prefix: elm_interface_scrollable;
diff --git a/src/lib/evas/canvas/efl_canvas_filter_internal.eo b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
index e25eba1584..c13d8bd5b3 100644
--- a/src/lib/evas/canvas/efl_canvas_filter_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
@@ -41,7 +41,7 @@ struct Efl.Canvas.Filter.State
    pos: double; [[Position]]
 }
 
-mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Efl.Object)
+mixin Efl.Canvas.Filter.Internal requires Efl.Object extends Efl.Gfx.Filter
 {
    [[Evas internal implementation of filters.]]
 
diff --git a/src/lib/evas/canvas/efl_gfx_map.eo b/src/lib/evas/canvas/efl_gfx_map.eo
index c581ba1093..9dc5b3246a 100644
--- a/src/lib/evas/canvas/efl_gfx_map.eo
+++ b/src/lib/evas/canvas/efl_gfx_map.eo
@@ -1,4 +1,4 @@
-mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
+mixin Efl.Gfx.Map requires Efl.Object
 {
    [[Texture UV mapping for all objects (rotation, perspective, 3d, ...).
 
diff --git a/src/lib/evas/canvas/efl_input_event.eo b/src/lib/evas/canvas/efl_input_event.eo
index 48bef437ef..14b9b38e31 100644
--- a/src/lib/evas/canvas/efl_input_event.eo
+++ b/src/lib/evas/canvas/efl_input_event.eo
@@ -1,6 +1,6 @@
 import efl_input_types;
 
-mixin Efl.Input.Event (Efl.Interface, Efl.Object, Efl.Duplicate)
+mixin Efl.Input.Event requires Efl.Object extends Efl.Duplicate
 {
    [[Represents a generic event data.