aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-03-16 20:53:34 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-03-17 13:10:35 +0900
commit8c398c365c44435db657ca104f04128e88e8edbe (patch)
treebe207b481fdae0f9c2c6b9627f04fd8f341c1cd4
parentEvas.Image: Create Efl.Canvas.Image for file & data images (diff)
downloadefl-8c398c365c44435db657ca104f04128e88e8edbe.tar.gz
Evas.Image: Simplify inheritance tree of image classes
This is a bit artificial, as all image objects are still based on the Evas.Image main class. The inheritance tree alone does not give much information on what features are supported by which class (eg. only Efl.Canvas.Image supports the file interface for file_set).
-rw-r--r--src/lib/evas/canvas/efl_canvas_proxy.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_scene3d.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_snapshot.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface.eo2
-rw-r--r--src/lib/evas/canvas/evas_image.eo5
5 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_proxy.eo b/src/lib/evas/canvas/efl_canvas_proxy.eo
index 19b16eeed5..2c6f6b3d8a 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 (Evas.Image, Efl.Gfx.Base, Efl.Image, Efl.Gfx.Buffer, Efl.Gfx.Fill, Efl.Gfx.View, Efl.Gfx.Filter)
+class Efl.Canvas.Proxy (Evas.Image)
{
[[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 685e42296a..0cca69f68c 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 (Evas.Image, Efl.Gfx.Base, Efl.Image, Efl.Gfx.Buffer, Efl.Gfx.Fill, Efl.Gfx.View, Efl.Gfx.Filter)
+class Efl.Canvas.Scene3d (Evas.Image)
{
[[A UI view for EFL Canvas 3D.]]
legacy_prefix: null;
diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.eo b/src/lib/evas/canvas/efl_canvas_snapshot.eo
index 527583e1e3..fafaada44b 100644
--- a/src/lib/evas/canvas/efl_canvas_snapshot.eo
+++ b/src/lib/evas/canvas/efl_canvas_snapshot.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Snapshot (Evas.Image, Efl.Gfx.Base, Efl.Image, Efl.Gfx.Buffer, Efl.Gfx.Fill, Efl.Gfx.View, Efl.Gfx.Filter)
+class Efl.Canvas.Snapshot (Evas.Image)
{
[[Low-level snapshot image object.
diff --git a/src/lib/evas/canvas/efl_canvas_surface.eo b/src/lib/evas/canvas/efl_canvas_surface.eo
index cc4b8d729d..722f54f8db 100644
--- a/src/lib/evas/canvas/efl_canvas_surface.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface.eo
@@ -1,4 +1,4 @@
-mixin Efl.Canvas.Surface (Evas.Image, Efl.Gfx.Buffer, Efl.Gfx.View)
+mixin Efl.Canvas.Surface (Evas.Image)
{
[[Native surfaces usually bound to an externally-managed buffer.
diff --git a/src/lib/evas/canvas/evas_image.eo b/src/lib/evas/canvas/evas_image.eo
index 576138459d..3bbc26ee0c 100644
--- a/src/lib/evas/canvas/evas_image.eo
+++ b/src/lib/evas/canvas/evas_image.eo
@@ -1,8 +1,7 @@
type @extern Evas_Object_Image_Pixels_Get_Cb: __undefined_type; /* FIXME: func pointers are not supported. */
-class Evas.Image (Evas.Object, Efl.File, Efl.Image, Efl.Image_Load,
- Efl.Image_Animated, Efl.Gfx.Buffer, Efl.Gfx.Fill,
- Efl.Gfx.View, Evas.Filter)
+class Evas.Image (Evas.Object, Evas.Filter,
+ Efl.Image, Efl.Gfx.Buffer, Efl.Gfx.Fill, Efl.Gfx.View, Efl.File)
{
/* Legacy is implement inside Efl.Canvas.Image */
legacy_prefix: evas_object_image;