From c7ee93eebb5675e8b883cb4f484a5c45193a2fb6 Mon Sep 17 00:00:00 2001 From: Yeongjong Lee Date: Thu, 22 Nov 2018 17:22:04 +0900 Subject: 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 --- src/lib/evas/canvas/efl_canvas_image.eo | 2 +- src/lib/evas/canvas/efl_canvas_proxy.eo | 2 +- src/lib/evas/canvas/efl_canvas_scene3d.eo | 2 +- src/lib/evas/canvas/evas_text.eo | 2 +- src/lib/evas/canvas/evas_textgrid.eo | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/lib/evas') diff --git a/src/lib/evas/canvas/efl_canvas_image.eo b/src/lib/evas/canvas/efl_canvas_image.eo index 7edcb0bc13..4ada80bc2c 100644 --- a/src/lib/evas/canvas/efl_canvas_image.eo +++ b/src/lib/evas/canvas/efl_canvas_image.eo @@ -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) { diff --git a/src/lib/evas/canvas/efl_canvas_proxy.eo b/src/lib/evas/canvas/efl_canvas_proxy.eo index 3814dcebeb..62fcc0db02 100644 --- a/src/lib/evas/canvas/efl_canvas_proxy.eo +++ b/src/lib/evas/canvas/efl_canvas_proxy.eo @@ -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. diff --git a/src/lib/evas/canvas/efl_canvas_scene3d.eo b/src/lib/evas/canvas/efl_canvas_scene3d.eo index ea875c3df0..7ad87e87fc 100644 --- a/src/lib/evas/canvas/efl_canvas_scene3d.eo +++ b/src/lib/evas/canvas/efl_canvas_scene3d.eo @@ -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; diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo index 617c9dedae..54dc89e263 100644 --- a/src/lib/evas/canvas/evas_text.eo +++ b/src/lib/evas/canvas/evas_text.eo @@ -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; diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo index 53e4d017e1..ebd482ec19 100644 --- a/src/lib/evas/canvas/evas_textgrid.eo +++ b/src/lib/evas/canvas/evas_textgrid.eo @@ -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; -- cgit v1.2.1