From d2e6d33485202b1a7d0f0b81354f060bc265d87f Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@samsung.com>
Date: Thu, 28 Feb 2019 16:23:11 +0100
Subject: [PATCH] interfaces: don't inherit efl.ui.layout anymore

Summary: this removes efl.file from the class hierarchy

Reviewers: segfaultxavi

Reviewed By: segfaultxavi

Subscribers: segfaultxavi, cedric, #reviewers, #committers

Tags: #efl_api

Differential Revision: https://phab.enlightenment.org/D8042
---
 src/lib/elementary/efl_ui_button.eo            | 2 +-
 src/lib/elementary/efl_ui_calendar.eo          | 2 +-
 src/lib/elementary/efl_ui_clock.eo             | 2 +-
 src/lib/elementary/efl_ui_datepicker.eo        | 2 +-
 src/lib/elementary/efl_ui_frame.eo             | 2 +-
 src/lib/elementary/efl_ui_grid.eo              | 2 +-
 src/lib/elementary/efl_ui_item.eo              | 2 +-
 src/lib/elementary/efl_ui_list.eo              | 2 +-
 src/lib/elementary/efl_ui_list_view.eo         | 2 +-
 src/lib/elementary/efl_ui_navigation_bar.eo    | 2 +-
 src/lib/elementary/efl_ui_navigation_layout.eo | 2 +-
 src/lib/elementary/efl_ui_pager.eo             | 2 +-
 src/lib/elementary/efl_ui_panel.eo             | 2 +-
 src/lib/elementary/efl_ui_panes.eo             | 2 +-
 src/lib/elementary/efl_ui_popup.eo             | 2 +-
 src/lib/elementary/efl_ui_progressbar.eo       | 2 +-
 src/lib/elementary/efl_ui_scroller.eo          | 2 +-
 src/lib/elementary/efl_ui_slider.eo            | 2 +-
 src/lib/elementary/efl_ui_spin.eo              | 2 +-
 src/lib/elementary/efl_ui_stack.eo             | 2 +-
 src/lib/elementary/efl_ui_tab_bar.eo           | 2 +-
 src/lib/elementary/efl_ui_tab_page.eo          | 2 +-
 src/lib/elementary/efl_ui_tags.eo              | 2 +-
 src/lib/elementary/efl_ui_textpath.eo          | 2 +-
 src/lib/elementary/efl_ui_timepicker.eo        | 2 +-
 src/lib/elementary/elm_actionslider.eo         | 2 +-
 src/lib/elementary/elm_bubble.eo               | 2 +-
 src/lib/elementary/elm_calendar.eo             | 2 +-
 src/lib/elementary/elm_clock.eo                | 2 +-
 src/lib/elementary/elm_code_widget.eo          | 2 +-
 src/lib/elementary/elm_colorselector.eo        | 2 +-
 src/lib/elementary/elm_conformant.eo           | 2 +-
 src/lib/elementary/elm_ctxpopup.eo             | 2 +-
 src/lib/elementary/elm_dayselector.eo          | 2 +-
 src/lib/elementary/elm_fileselector.eo         | 2 +-
 src/lib/elementary/elm_fileselector_entry.eo   | 2 +-
 src/lib/elementary/elm_flipselector.eo         | 2 +-
 src/lib/elementary/elm_gengrid.eo              | 2 +-
 src/lib/elementary/elm_genlist.eo              | 2 +-
 src/lib/elementary/elm_hover.eo                | 2 +-
 src/lib/elementary/elm_index.eo                | 2 +-
 src/lib/elementary/elm_inwin.eo                | 2 +-
 src/lib/elementary/elm_label.eo                | 2 +-
 src/lib/elementary/elm_list.eo                 | 2 +-
 src/lib/elementary/elm_multibuttonentry.eo     | 2 +-
 src/lib/elementary/elm_naviframe.eo            | 2 +-
 src/lib/elementary/elm_panel.eo                | 2 +-
 src/lib/elementary/elm_player.eo               | 2 +-
 src/lib/elementary/elm_popup.eo                | 2 +-
 src/lib/elementary/elm_scroller.eo             | 2 +-
 src/lib/elementary/elm_segment_control.eo      | 2 +-
 src/lib/elementary/elm_separator.eo            | 2 +-
 src/lib/elementary/elm_slideshow.eo            | 2 +-
 src/lib/elementary/elm_spinner.eo              | 2 +-
 54 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index ff79209e27..a2367b0312 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Button extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Ui.Autorepeat,
+class @beta Efl.Ui.Button extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, Efl.Ui.Autorepeat,
                      Efl.Text, Efl.Content,
                      Efl.Access.Widget.Action
 {
diff --git a/src/lib/elementary/efl_ui_calendar.eo b/src/lib/elementary/efl_ui_calendar.eo
index 33547507da..6a5878594d 100644
--- a/src/lib/elementary/efl_ui_calendar.eo
+++ b/src/lib/elementary/efl_ui_calendar.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Calendar_Weekday
    last  [[Sentinel value to indicate last enum field during iteration]]
 }
 
-class @beta Efl.Ui.Calendar extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format
+class @beta Efl.Ui.Calendar extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format
 {
    [[Calendar widget
 
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index 1d74ce4915..7f8486684a 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Clock_Type
    ampm    = 7, [[Indicates AM/PM field .]]
 }
 
-class @beta Efl.Ui.Clock extends Efl.Ui.Layout
+class @beta Efl.Ui.Clock extends Efl.Ui.Layout_Base
 {
    [[Efl UI clock class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_datepicker.eo b/src/lib/elementary/efl_ui_datepicker.eo
index 4225c28e75..93e7632023 100644
--- a/src/lib/elementary/efl_ui_datepicker.eo
+++ b/src/lib/elementary/efl_ui_datepicker.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Datepicker extends Efl.Ui.Layout
+class @beta Efl.Ui.Datepicker extends Efl.Ui.Layout_Base
 {
    [[Datepicker widget
 
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index 853c7a72c2..fd072a4343 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Frame extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
+class @beta Efl.Ui.Frame extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
                     Efl.Content
 {
    [[Frame widget
diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo
index 4b61a52e13..6c70f36c39 100644
--- a/src/lib/elementary/efl_ui_grid.eo
+++ b/src/lib/elementary/efl_ui_grid.eo
@@ -1,6 +1,6 @@
 import efl_ui_grid_item;
 
-class @beta Efl.Ui.Grid extends Efl.Ui.Layout implements
+class @beta Efl.Ui.Grid extends Efl.Ui.Layout_Base implements
                    Efl.Ui.Scrollable_Interactive,
                    Efl.Ui.Scrollbar,
                    Efl.Pack_Linear, Efl.Pack_Layout,
diff --git a/src/lib/elementary/efl_ui_item.eo b/src/lib/elementary/efl_ui_item.eo
index f2a85b6aeb..50e1e1c739 100644
--- a/src/lib/elementary/efl_ui_item.eo
+++ b/src/lib/elementary/efl_ui_item.eo
@@ -1,4 +1,4 @@
-abstract @beta Efl.Ui.Item extends Efl.Ui.Layout implements Efl.Ui.Selectable, Efl.Ui.Clickable
+abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base implements Efl.Ui.Selectable, Efl.Ui.Clickable
 {
    [[Item abstract class for pack widget. All item have to be inherited from this class.]]
    methods {
diff --git a/src/lib/elementary/efl_ui_list.eo b/src/lib/elementary/efl_ui_list.eo
index 7dcf29931a..988c78c5cc 100644
--- a/src/lib/elementary/efl_ui_list.eo
+++ b/src/lib/elementary/efl_ui_list.eo
@@ -1,6 +1,6 @@
 import efl_ui_list_item;
 
-class @beta Efl.Ui.List extends Efl.Ui.Layout implements
+class @beta Efl.Ui.List extends Efl.Ui.Layout_Base implements
                    Efl.Ui.Scrollable_Interactive,
                    Efl.Ui.Scrollbar,
                    Efl.Pack_Linear, Efl.Pack_Layout,
diff --git a/src/lib/elementary/efl_ui_list_view.eo b/src/lib/elementary/efl_ui_list_view.eo
index b6a2bf8016..0a135e9cce 100644
--- a/src/lib/elementary/efl_ui_list_view.eo
+++ b/src/lib/elementary/efl_ui_list_view.eo
@@ -6,7 +6,7 @@ struct Efl.Ui.List_View_Item_Event
    child: Efl.Model;
    index: int;
 }
-class @beta Efl.Ui.List_View extends Efl.Ui.Layout implements Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
+class @beta Efl.Ui.List_View extends Efl.Ui.Layout_Base implements Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
                 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
                 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager
 {
diff --git a/src/lib/elementary/efl_ui_navigation_bar.eo b/src/lib/elementary/efl_ui_navigation_bar.eo
index 77f1e5abdc..318b307ca2 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Navigation_Bar extends Efl.Ui.Layout implements Efl.Content, Efl.Text
+class @beta Efl.Ui.Navigation_Bar extends Efl.Ui.Layout_Base implements Efl.Content, Efl.Text
 {
    [[Navigation_Bar widget.
 
diff --git a/src/lib/elementary/efl_ui_navigation_layout.eo b/src/lib/elementary/efl_ui_navigation_layout.eo
index 373d711839..e766fc0da7 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.eo
+++ b/src/lib/elementary/efl_ui_navigation_layout.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Navigation_Layout extends Efl.Ui.Layout implements Efl.Content
+class @beta Efl.Ui.Navigation_Layout extends Efl.Ui.Layout_Base implements Efl.Content
 {
    [[Navigation_Layout widget.
 
diff --git a/src/lib/elementary/efl_ui_pager.eo b/src/lib/elementary/efl_ui_pager.eo
index 50bcecb78b..a183ba3a92 100644
--- a/src/lib/elementary/efl_ui_pager.eo
+++ b/src/lib/elementary/efl_ui_pager.eo
@@ -5,7 +5,7 @@ enum Efl.Ui.Pager_Loop
    enabled
 }
 
-class @beta Efl.Ui.Pager extends Efl.Ui.Layout implements Efl.Pack_Linear
+class @beta Efl.Ui.Pager extends Efl.Ui.Layout_Base implements Efl.Pack_Linear
 {
    [[Pager widget
 
diff --git a/src/lib/elementary/efl_ui_panel.eo b/src/lib/elementary/efl_ui_panel.eo
index f1dadaa4b5..0be2923638 100644
--- a/src/lib/elementary/efl_ui_panel.eo
+++ b/src/lib/elementary/efl_ui_panel.eo
@@ -15,7 +15,7 @@ struct Efl.Ui.Panel_Scroll_Info
    rel_y: double; [[content scrolled position (0.0 ~ 1.0) in the panel]]
 }
 
-class @beta Efl.Ui.Panel extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, Efl.Content,
+class @beta Efl.Ui.Panel extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, Efl.Content,
                     Efl.Access.Widget.Action
 {
    [[Elementary panel class]]
diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo
index a7e15570ad..110d299b15 100644
--- a/src/lib/elementary/efl_ui_panes.eo
+++ b/src/lib/elementary/efl_ui_panes.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Panes extends Efl.Ui.Layout implements Efl.Ui.Direction,
+class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Direction,
                     Efl.Ui.Clickable
 {
    [[Elementary panes class]]
diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo
index 31b7b531f2..edc408120a 100644
--- a/src/lib/elementary/efl_ui_popup.eo
+++ b/src/lib/elementary/efl_ui_popup.eo
@@ -8,7 +8,7 @@ enum Efl.Ui.Popup_Align {
     bottom    [[Popup aligned to bottom]]
 }
 
-class @beta Efl.Ui.Popup extends Efl.Ui.Layout implements Efl.Content, Efl.Ui.Focus.Layer
+class @beta Efl.Ui.Popup extends Efl.Ui.Layout_Base implements Efl.Content, Efl.Ui.Focus.Layer
 {
    [[EFL UI popup class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo
index 9b291707f6..846bd8e7cb 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Progressbar extends Efl.Ui.Layout implements Efl.Ui.Range_Display, Efl.Ui.Format,
+class @beta Efl.Ui.Progressbar extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Display, Efl.Ui.Format,
                           Efl.Ui.Direction, Efl.Access.Value,
                           Efl.Text, Efl.Content, Efl.Text_Markup
 {
diff --git a/src/lib/elementary/efl_ui_scroller.eo b/src/lib/elementary/efl_ui_scroller.eo
index 76447ab7d5..1135242b69 100644
--- a/src/lib/elementary/efl_ui_scroller.eo
+++ b/src/lib/elementary/efl_ui_scroller.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Scroller extends Efl.Ui.Layout implements
+class @beta Efl.Ui.Scroller extends Efl.Ui.Layout_Base implements
                        Efl.Ui.Scrollable_Interactive,
                        Efl.Ui.Scrollbar,
                        Efl.Ui.Focus.Manager_Sub,
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 1b7ada655f..7db6036ba3 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Slider extends Efl.Ui.Layout implements Efl.Ui.Range_Interactive, Efl.Ui.Direction,
+class @beta Efl.Ui.Slider extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Interactive, Efl.Ui.Direction,
                      Efl.Access.Value,
                      Efl.Access.Widget.Action
 {
diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo
index bf705171e2..ee6fd693ad 100644
--- a/src/lib/elementary/efl_ui_spin.eo
+++ b/src/lib/elementary/efl_ui_spin.eo
@@ -5,7 +5,7 @@ struct Efl.Ui.Spin_Special_Value
    label: string; [[String to replace]]
 }
 
-class @beta Efl.Ui.Spin extends Efl.Ui.Layout implements Efl.Ui.Range_Interactive, Efl.Ui.Format,
+class @beta Efl.Ui.Spin extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Interactive, Efl.Ui.Format,
                    Efl.Access.Value, Efl.Access.Widget.Action
 {
    [[A Spin.
diff --git a/src/lib/elementary/efl_ui_stack.eo b/src/lib/elementary/efl_ui_stack.eo
index 115547a124..2351a3869b 100644
--- a/src/lib/elementary/efl_ui_stack.eo
+++ b/src/lib/elementary/efl_ui_stack.eo
@@ -18,7 +18,7 @@ struct Efl.Ui.Stack_Event_Deactivated {
    content: Efl.Canvas.Object; [[Deactivated content.]]
 }
 
-class @beta Efl.Ui.Stack extends Efl.Ui.Layout
+class @beta Efl.Ui.Stack extends Efl.Ui.Layout_Base
 {
    [[Stack widget.
 
diff --git a/src/lib/elementary/efl_ui_tab_bar.eo b/src/lib/elementary/efl_ui_tab_bar.eo
index a2c135980c..be34ec0b90 100644
--- a/src/lib/elementary/efl_ui_tab_bar.eo
+++ b/src/lib/elementary/efl_ui_tab_bar.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Tab_Bar extends Efl.Ui.Layout implements Efl.Ui.Clickable
+class @beta Efl.Ui.Tab_Bar extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable
 {
    [[Tab Bar class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_tab_page.eo b/src/lib/elementary/efl_ui_tab_page.eo
index 74a2d7f787..e20a7e6870 100644
--- a/src/lib/elementary/efl_ui_tab_page.eo
+++ b/src/lib/elementary/efl_ui_tab_page.eo
@@ -8,7 +8,7 @@ struct Efl.Ui.Tab_Page_Tab_Changed_Event {
    changed_info: Efl.Ui.Tab_Page_Tab_Changed;
 }
 
-class @beta Efl.Ui.Tab_Page extends Efl.Ui.Layout implements Efl.Content
+class @beta Efl.Ui.Tab_Page extends Efl.Ui.Layout_Base implements Efl.Content
 {
    [[Tab Page class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_tags.eo b/src/lib/elementary/efl_ui_tags.eo
index 267c7ed429..82849011ec 100644
--- a/src/lib/elementary/efl_ui_tags.eo
+++ b/src/lib/elementary/efl_ui_tags.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Tags extends Efl.Ui.Layout implements Efl.Text, Efl.Ui.Format
+class @beta Efl.Ui.Tags extends Efl.Ui.Layout_Base implements Efl.Text, Efl.Ui.Format
 {
    [[A widget displaying a list of tags. The user can remove tags by clicking
      on each tag "close" button and add new tags by typing text in the text
diff --git a/src/lib/elementary/efl_ui_textpath.eo b/src/lib/elementary/efl_ui_textpath.eo
index 7fa97539f2..d61bf187d3 100644
--- a/src/lib/elementary/efl_ui_textpath.eo
+++ b/src/lib/elementary/efl_ui_textpath.eo
@@ -4,7 +4,7 @@ enum Efl.Ui.Textpath_Direction {
     ccw [[Counter-clockwise]]
 }
 
-class @beta Efl.Ui.Textpath extends Efl.Ui.Layout implements Efl.Text, Efl.Gfx.Path
+class @beta Efl.Ui.Textpath extends Efl.Ui.Layout_Base implements Efl.Text, Efl.Gfx.Path
 {
    [[Efl Ui Textpath class]]
    legacy_prefix: elm_textpath;
diff --git a/src/lib/elementary/efl_ui_timepicker.eo b/src/lib/elementary/efl_ui_timepicker.eo
index 1943aa3d7f..7e2d48cced 100644
--- a/src/lib/elementary/efl_ui_timepicker.eo
+++ b/src/lib/elementary/efl_ui_timepicker.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Timepicker extends Efl.Ui.Layout
+class @beta Efl.Ui.Timepicker extends Efl.Ui.Layout_Base
 {
    [[Timepicker widget
 
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index 260e699420..a4f78157a2 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -10,7 +10,7 @@ enum Elm.Actionslider.Pos
    all = (1 << 3) - 1 [[All positions for left/center/right.]]
 }
 
-class Elm.Actionslider extends Efl.Ui.Layout implements Efl.Ui.Selectable, Efl.Ui.Legacy
+class Elm.Actionslider extends Efl.Ui.Layout_Base implements Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[An actionslider is a switcher for 2 or 3 labels
 
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 4d249d210e..f5c2e06081 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -12,7 +12,7 @@ enum Elm.Bubble.Pos
   bottom_right [[The arrow of the bubble points to the bottom right corner.]]
 }
 
-class Elm.Bubble extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Ui.Legacy
+class Elm.Bubble extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, Efl.Ui.Legacy
 {
    [[Speech bubble widget used in messaging applications]]
 
diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index 4eb1d3fdb5..fa4e3aae02 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -72,7 +72,7 @@ struct Elm.Calendar.Mark; [[Item handle for a calendar mark.
                             with @Elm.Calendar.mark_del.
                           ]]
 
-class Elm.Calendar extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Efl.Access.Widget.Action,
+class Elm.Calendar extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Composition, Efl.Access.Widget.Action,
                     Efl.Ui.Legacy
 {
    [[Calendar widget
diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo
index 65813b717b..9535c5c415 100644
--- a/src/lib/elementary/elm_clock.eo
+++ b/src/lib/elementary/elm_clock.eo
@@ -18,7 +18,7 @@ enum Elm.Clock.Edit_Mode
    all = (1 << 6) - 1 [[All digits should be editable.]]
 }
 
-class Elm.Clock extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Efl.Ui.Legacy
+class Elm.Clock extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Composition, Efl.Ui.Legacy
 {
    [[Digital clock widget
 
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index 6e395df742..bd7cac6060 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -4,7 +4,7 @@ import elm_interface_scrollable;
 struct @extern Elm.Code; [[Elementary code main data structure]] /* The main interface currently defined in code */
 struct @extern Elm.Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */
 
-class Elm.Code_Widget extends Efl.Ui.Layout
+class Elm.Code_Widget extends Efl.Ui.Layout_Base
 {
    [[Elementary code widget]]
    eo_prefix: elm_obj_code_widget;
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index 0d57a6f9f0..fc0604965f 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -12,7 +12,7 @@ enum Elm.Colorselector.Mode
    all [[All possible color selector is displayed.]]
 }
 
-class Elm.Colorselector extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition,
+class Elm.Colorselector extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Composition,
                          Efl.Access.Widget.Action, Efl.Ui.Clickable, Efl.Ui.Legacy
 {
    [[Elementary colorselector class]]
diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo
index 1baafd3c7f..92560a91a4 100644
--- a/src/lib/elementary/elm_conformant.eo
+++ b/src/lib/elementary/elm_conformant.eo
@@ -1,4 +1,4 @@
-class Elm.Conformant extends Efl.Ui.Layout implements Efl.Ui.Legacy
+class Elm.Conformant extends Efl.Ui.Layout_Base implements Efl.Ui.Legacy
 {
    [[Elementary conformant class]]
    legacy_prefix: elm_conformant;
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index 36bdd20732..d4153476f8 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -8,7 +8,7 @@ enum Elm.Ctxpopup.Direction
    unknown [[Ctxpopup does not determine it's direction yet.]]
 }
 
-class Elm.Ctxpopup extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Legacy, Elm.Widget_Item_Container
+class Elm.Ctxpopup extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Legacy, Elm.Widget_Item_Container
 {
    [[Elementary context popup class]]
    legacy_prefix: elm_ctxpopup;
diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo
index 183e582447..12a054677b 100644
--- a/src/lib/elementary/elm_dayselector.eo
+++ b/src/lib/elementary/elm_dayselector.eo
@@ -17,7 +17,7 @@ enum Elm.Dayselector.Day
    max     [[Sentinel value to indicate last enum field during iteration]]
 }
 
-class Elm.Dayselector extends Efl.Ui.Layout implements Efl.Ui.Legacy
+class Elm.Dayselector extends Efl.Ui.Layout_Base implements Efl.Ui.Legacy
 {
    [[Elementary dayselector class]]
    legacy_prefix: elm_dayselector;
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index eac99d9065..2a15abe31d 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -1,4 +1,4 @@
-class Elm.Fileselector extends Efl.Ui.Layout implements Elm.Interface.Fileselector,
+class Elm.Fileselector extends Efl.Ui.Layout_Base implements Elm.Interface.Fileselector,
                         Efl.Access.Widget.Action, Efl.Ui.Focus.Composition,
                         Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy
 {
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index 28484ca1cc..5a01b8d594 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -1,4 +1,4 @@
-class Elm.Fileselector_Entry extends Efl.Ui.Layout implements Elm.Interface.Fileselector,
+class Elm.Fileselector_Entry extends Efl.Ui.Layout_Base implements Elm.Interface.Fileselector,
                               Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[Elementary fileselector entry class]]
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index f54857447d..2e2f29c1b5 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -1,4 +1,4 @@
-class Elm.Flipselector extends Efl.Ui.Layout implements Efl.Ui.Range_Interactive,
+class Elm.Flipselector extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Interactive,
                         Efl.Access.Widget.Action,
                         Efl.Ui.Selectable, Efl.Ui.Legacy
 {
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index 83d9916c7d..59f7221daf 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -9,7 +9,7 @@ enum Elm.Gengrid.Reorder_Type
    swap    [[Swap reorder type]]
 }
 
-class Elm.Gengrid extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Elm.Interface_Scrollable,
+class Elm.Gengrid extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Composition, Elm.Interface_Scrollable,
                    Efl.Ui.Clickable, Efl.Access.Widget.Action,
                    Efl.Access.Selection, Efl.Ui.Legacy, Elm.Widget_Item_Container
 {
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index 40a599fc51..9e3ef8c839 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-class Elm.Genlist extends Efl.Ui.Layout implements Elm.Interface_Scrollable, Efl.Ui.Clickable,
+class Elm.Genlist extends Efl.Ui.Layout_Base implements Elm.Interface_Scrollable, Efl.Ui.Clickable,
                    Efl.Access.Widget.Action, Efl.Access.Selection,
                    Efl.Ui.Selectable, Efl.Ui.Legacy, Elm.Widget_Item_Container
 {
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 69acfb9b3f..75b62d0f1f 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -7,7 +7,7 @@ enum Elm.Hover.Axis
    both [[ELM_HOVER_AXIS_BOTH -- both.]]
 }
 
-class Elm.Hover extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Efl.Ui.Clickable,
+class Elm.Hover extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Layer, Efl.Ui.Clickable,
                  Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary hover class]]
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index adc7b6e6a6..b24f5dde48 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -1,4 +1,4 @@
-class Elm.Index extends Efl.Ui.Layout implements Efl.Ui.Direction,
+class Elm.Index extends Efl.Ui.Layout_Base implements Efl.Ui.Direction,
                  Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[elementary index class]]
diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo
index 594d1e5e7f..ec8208a762 100644
--- a/src/lib/elementary/elm_inwin.eo
+++ b/src/lib/elementary/elm_inwin.eo
@@ -1,4 +1,4 @@
-class Elm.Inwin extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy
+class Elm.Inwin extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy
 {
    [[Elementary inwin class]]
    legacy_prefix: elm_inwin;
diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo
index f9e147db76..ab96ef44e9 100644
--- a/src/lib/elementary/elm_label.eo
+++ b/src/lib/elementary/elm_label.eo
@@ -8,7 +8,7 @@ enum Elm.Label.Slide_Mode
    always [[Slide always.]]
 }
 
-class Elm.Label extends Efl.Ui.Layout implements Efl.Ui.Legacy
+class Elm.Label extends Efl.Ui.Layout_Base implements Efl.Ui.Legacy
 {
    [[Elementary label class]]
    legacy_prefix: elm_label;
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 6db5de2423..8aec807742 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-class Elm.List extends Efl.Ui.Layout implements Elm.Interface_Scrollable,
+class Elm.List extends Efl.Ui.Layout_Base implements Elm.Interface_Scrollable,
                 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access.Object,
                 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy, Elm.Widget_Item_Container
 {
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 8754d0846a..12b0be5d67 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -1,7 +1,7 @@
 type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]]
 type Elm_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]]
 
-class Elm.Multibuttonentry extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Ui.Legacy
+class Elm.Multibuttonentry extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, Efl.Ui.Legacy
 {
    [[Elementary multibuttonentry class]]
    legacy_prefix: elm_multibuttonentry;
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index 97b5d35641..fc8253fc2d 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -1,4 +1,4 @@
-class Elm.Naviframe extends Efl.Ui.Layout implements Efl.Access.Widget.Action, Efl.Ui.Legacy
+class Elm.Naviframe extends Efl.Ui.Layout_Base implements Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary naviframe class]]
    legacy_prefix: elm_naviframe;
diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index f689607290..47f075e2f3 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -8,7 +8,7 @@ enum Elm.Panel.Orient
    right [[Panel (dis)appears from the right]]
 }
 
-class Elm.Panel extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Elm.Interface_Scrollable,
+class Elm.Panel extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Layer, Elm.Interface_Scrollable,
                  Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary panel class]]
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
index 7876d2329f..698ff45c35 100644
--- a/src/lib/elementary/elm_player.eo
+++ b/src/lib/elementary/elm_player.eo
@@ -1,4 +1,4 @@
-class Elm.Player extends Efl.Ui.Layout implements Efl.Access.Widget.Action, Efl.Ui.Legacy
+class Elm.Player extends Efl.Ui.Layout_Base implements Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary player class]]
    legacy_prefix: elm_player;
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index eab93055c8..19c95487cd 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -23,7 +23,7 @@ enum Elm.Popup.Orient
 }
 
 
-class Elm.Popup extends Efl.Ui.Layout implements Efl.Access.Widget.Action, Efl.Ui.Legacy
+class Elm.Popup extends Efl.Ui.Layout_Base implements Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary popup class]]
    legacy_prefix: elm_popup;
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index 843386f85d..1fe81c0788 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -1,4 +1,4 @@
-class Elm.Scroller extends Efl.Ui.Layout implements Elm.Interface_Scrollable,
+class Elm.Scroller extends Efl.Ui.Layout_Base implements Elm.Interface_Scrollable,
                     Efl.Access.Widget.Action,
                     Efl.Ui.Scrollable, Efl.Content, Efl.Ui.Legacy
 {
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index 50f6a1ec6a..74b65b411c 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -1,4 +1,4 @@
-class Elm.Segment_Control extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Efl.Ui.Legacy
+class Elm.Segment_Control extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Composition, Efl.Ui.Legacy
 {
    [[Elementary segment control class]]
    legacy_prefix: elm_segment_control;
diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo
index 56f024dea2..8356248c90 100644
--- a/src/lib/elementary/elm_separator.eo
+++ b/src/lib/elementary/elm_separator.eo
@@ -1,4 +1,4 @@
-class Elm.Separator extends Efl.Ui.Layout implements Efl.Ui.Legacy
+class Elm.Separator extends Efl.Ui.Layout_Base implements Efl.Ui.Legacy
 {
    [[Elementary separator class]]
    legacy_prefix: elm_separator;
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index 97cf3cf99c..7ad0fdf226 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -1,6 +1,6 @@
 type Elm_Slideshow_Item_Class: __undefined_type; [[Elementary slideshow item class type]]
 
-class Elm.Slideshow extends Efl.Ui.Layout implements Efl.Access.Widget.Action, Efl.Ui.Legacy
+class Elm.Slideshow extends Efl.Ui.Layout_Base implements Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary slideshow class]]
    eo_prefix: elm_obj_slideshow;
diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index a1fcde539b..d5d28519c5 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -1,4 +1,4 @@
-class Elm.Spinner extends Efl.Ui.Layout implements Efl.Ui.Range_Interactive, Efl.Ui.Focus.Composition,
+class Elm.Spinner extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Interactive, Efl.Ui.Focus.Composition,
                    Efl.Access.Value, Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary spinner class]]