enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Remove duplicated interface inheritance in eo 

Summary:
Delete unnecessary interface inheritance

Efl.Ui.Base ==> Efl.Ui.Widget - Efl.Canvas.Group - Efl.Canvas.Object - Efl.Ui.Base
Efl.Text_Cursor ==> Efl.Text_Markup - Efl.Text_Cursor
Efl.Pack_Layout ==> Efl.Ui.Box - Efl.Pack_Layout
Efl.Ui.Translatable ==> Efl.Ui.Layout - Efl.Ui.Widget - Efl.Ui.Translatable
Efl.Part ==> Efl.Ui.Widget - Efl.Part
Efl.Ui.View ==> Efl.Ui.Layout.Object - Efl.Ui.View
Efl.Access.Value ==> Efl.Ui.Spin - Efl.Access.Value
Efl.Gfx.Buffer ==> Efl.Canvas.Image_Internal - Efl.Gfx.Buffer
Efl.Canvas.Pointer ==>  Efl.Ui.Widget - Efl.Canvas.Group - Efl.Canvas.Object - Efl.Canvas.Pointer
Efl.Gfx.Size_Hint ==> Efl.Ui.Widget - Efl.Canvas.Group - Efl.Canvas.Object - Efl.Gfx.Size_Hint

Test Plan: make check

Reviewers: Jaehyun_Cho, Hermet, woohyun, segfaultxavi

Reviewed By: Jaehyun_Cho, segfaultxavi

Subscribers: segfaultxavi, cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D7241
This commit is contained in:
Yeongjong Lee 2018-11-22 17:22:04 +09:00 committed by Jaehyun Cho
parent 9c814cb652
commit c7ee93eebb
24 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/edje/efl_canvas_layout.eo
View File

@ -1,7 +1,7 @@
// FIXME: This EO doc needs a direct link to the "edcref" doc
class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
Efl.Observer, Efl.Ui.Base, Efl.Layout.Calc,
Efl.Observer, Efl.Layout.Calc,
Efl.Layout.Signal, Efl.Layout.Group,
Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
Efl.Gfx.Size_Class)

2
src/lib/edje/efl_canvas_layout_part_invalid.eo
View File

@ -1,7 +1,7 @@
class Efl.Canvas.Layout_Part_Invalid (Efl.Canvas.Layout_Part, Efl.Content,
Efl.Pack_Linear, Efl.Ui.Direction,
Efl.Pack_Table, Efl.Text,
Efl.Text_Markup, Efl.Text_Cursor)
Efl.Text_Markup)
{
[[Common class for part proxy objects for @Efl.Canvas.Layout.

3
src/lib/edje/efl_canvas_layout_part_text.eo
View File

@ -11,8 +11,7 @@ enum Efl.Canvas.Layout_Part_Text_Expand
}
class Efl.Canvas.Layout_Part_Text (Efl.Canvas.Layout_Part, Efl.Text,
Efl.Text_Markup, Efl.Text_Cursor, Efl.Text_Format, Efl.Text_Font,
Efl.Text_Style)
Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style)
{
[[Represents a TEXT part of a layout

2
src/lib/elementary/efl_ui_box_flow.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Box_Flow (Efl.Ui.Box, Efl.Pack_Layout)
class Efl.Ui.Box_Flow (Efl.Ui.Box)
{
[[A custom layout engine for @Efl.Ui.Box.]]
methods {

2
src/lib/elementary/efl_ui_box_stack.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Box_Stack (Efl.Ui.Box, Efl.Pack_Layout)
class Efl.Ui.Box_Stack (Efl.Ui.Box)
{
[[A custom layout engine for @Efl.Ui.Box that stacks items.

2
src/lib/elementary/efl_ui_button.eo
View File

@ -1,6 +1,6 @@
class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat,
Efl.Text, Efl.Content,
Efl.Access.Widget.Action, Efl.Ui.Translatable)
Efl.Access.Widget.Action)
{
[[Push-button widget

2
src/lib/elementary/efl_ui_flip.eo
View File

@ -28,7 +28,7 @@ enum Efl.Ui.Flip_Interaction
page [[Page interaction]]
}
class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack_Linear, Efl.Part)
class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack_Linear)
{
[[Efl UI flip class]]
legacy_prefix: elm_flip;

2
src/lib/elementary/efl_ui_frame.eo
View File

@ -1,5 +1,5 @@
class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
Efl.Ui.Translatable, Efl.Content)
Efl.Content)
{
[[Frame widget

2
src/lib/elementary/efl_ui_layout.eo
View File

@ -1,6 +1,6 @@
import efl_ui;
class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File,
class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Container, Efl.File,
Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Factory,
Efl.Layout.Calc, Efl.Layout.Signal,
Efl.Layout.Group)

1
src/lib/elementary/efl_ui_list_default_item.eo
View File

@ -2,7 +2,6 @@
class Efl.Ui.List_Default_Item (Efl.Ui.List_Item,
Efl.Text,
Efl.Text_Markup,
Efl.Ui.Translatable,
Efl.Content)
{
[[List Default Item class.

2
src/lib/elementary/efl_ui_list_view.eo
View File

@ -6,7 +6,7 @@ struct Efl.Ui.List_View_Item_Event
child: Efl.Model;
index: int;
}
class Efl.Ui.List_View (Efl.Ui.Layout, Efl.Ui.View, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
class Efl.Ui.List_View (Efl.Ui.Layout, 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)
{

2
src/lib/elementary/efl_ui_navigation_bar.eo
View File

@ -1,4 +1,4 @@
class Efl.Ui.Navigation_Bar (Efl.Ui.Layout, Efl.Content, Efl.Text, Efl.Ui.Translatable)
class Efl.Ui.Navigation_Bar (Efl.Ui.Layout, Efl.Content, Efl.Text)
{
[[Navigation_Bar widget.

2
src/lib/elementary/efl_ui_progressbar.eo
View File

@ -1,5 +1,5 @@
class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
Efl.Ui.Direction, Efl.Access.Value, Efl.Ui.Translatable,
Efl.Ui.Direction, Efl.Access.Value,
Efl.Text, Efl.Content, Efl.Text_Markup)
{
[[Elementary progressbar class]]

2
src/lib/elementary/efl_ui_spin_button.eo
View File

@ -1,5 +1,5 @@
class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition, Efl.Ui.Direction,
Efl.Access.Value, Efl.Access.Widget.Action)
Efl.Access.Widget.Action)
{
[[A Button Spin.

2
src/lib/elementary/efl_ui_widget.eo
View File

@ -15,7 +15,7 @@ struct Efl.Ui.Widget_Focus_State {
abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object,
Efl.Ui.Base, Efl.Ui.Cursor, Efl.Ui.Translatable,
Efl.Ui.Cursor, Efl.Ui.Translatable,
Efl.Selection, Efl.Ui.Dnd)
{
[[Efl UI widget abstract class]]

4
src/lib/elementary/efl_ui_win.eo
View File

@ -154,10 +154,10 @@ enum Efl.Ui.Win_Move_Resize_Mode
right = (1 << 4) [[Start resizing window to the right]]
}
class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Access.Window,
class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Access.Window,
Efl.Access.Component, Efl.Access.Widget.Action,
Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
Efl.Gfx.Size_Hint, Efl.Text, Efl.Config, Efl.Part,
Efl.Text, Efl.Config,
Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root)
{
[[Efl UI window class]]

2
src/lib/elementary/elm_mapbuf.eo
View File

@ -1,4 +1,4 @@
class Elm.Mapbuf (Efl.Ui.Widget, Efl.Content, Efl.Part, Efl.Ui.Legacy)
class Elm.Mapbuf (Efl.Ui.Widget, Efl.Content, Efl.Ui.Legacy)
{
[[Elementary mapbuf class]]
legacy_prefix: elm_mapbuf;

2
src/lib/elementary/elm_notify.eo
View File

@ -1,4 +1,4 @@
class Elm.Notify (Efl.Ui.Widget, Efl.Ui.Focus.Layer, Efl.Content, Efl.Part, Efl.Ui.Legacy)
class Elm.Notify (Efl.Ui.Widget, Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy)
{
[[Elementary notification class]]
legacy_prefix: elm_notify;

3
src/lib/elementary/elm_slider.eo
View File

@ -1,6 +1,5 @@
class Elm.Slider (Efl.Ui.Slider_Interval, Efl.Ui.Legacy,
Efl.Text, Efl.Text_Markup, Efl.Ui.Format,
Efl.Ui.Translatable)
Efl.Text, Efl.Text_Markup, Efl.Ui.Format)
{
[[Elementary slider class]]
eo_prefix: elm_obj_slider;

2
src/lib/evas/canvas/efl_canvas_image.eo
View File

@ -1,4 +1,4 @@
class Efl.Canvas.Image (Efl.Canvas.Image_Internal, Efl.Gfx.Buffer,
class Efl.Canvas.Image (Efl.Canvas.Image_Internal,
Efl.Gfx.Image_Load_Controller, Efl.Gfx.Image_Animation_Controller,
Efl.File)
{

2
src/lib/evas/canvas/efl_canvas_proxy.eo
View File

@ -1,4 +1,4 @@
class Efl.Canvas.Proxy (Efl.Canvas.Image_Internal, Efl.Gfx.Buffer)
class Efl.Canvas.Proxy (Efl.Canvas.Image_Internal)
{
[[Low-level proxy image object.

2
src/lib/evas/canvas/efl_canvas_scene3d.eo
View File

@ -1,4 +1,4 @@
class Efl.Canvas.Scene3d (Efl.Canvas.Image_Internal, Efl.Gfx.Buffer)
class Efl.Canvas.Scene3d (Efl.Canvas.Image_Internal)
{
[[A UI view for EFL Canvas 3D.]]
data: null;

2
src/lib/evas/canvas/evas_text.eo
View File

@ -1,7 +1,7 @@
type @extern Evas.Text_Style_Type : __undefined_type; [[External text style type]]
class Evas.Text (Efl.Canvas.Object, Efl.Text,
Efl.Text_Font, Efl.Canvas.Filter.Internal, Efl.Ui.Base)
Efl.Text_Font, Efl.Canvas.Filter.Internal)
{
[[Evas text class]]
legacy_prefix: evas_object_text;

3
src/lib/evas/canvas/evas_textgrid.eo
View File

@ -20,8 +20,7 @@ enum Evas.Textgrid.Font_Style {
/* XXX: Actual definition is in C. */
struct Evas.Textgrid.Cell; [[Evas textgrid cell data structure]]
class Evas.Textgrid (Efl.Canvas.Object, Efl.Text_Font,
Efl.Ui.Base)
class Evas.Textgrid (Efl.Canvas.Object, Efl.Text_Font)
{
[[Evas textgrid class]]
legacy_prefix: evas_object_textgrid;