summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-16 11:06:04 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-16 13:10:34 +0900
commit74e1c9bb7591228d988b189812b206dc5575ac9c (patch)
treebd56c1312e3956873e467a65c4a3e734dfd8507f
parentd97c07d6750e88e9804845d555c150ef3a70651a (diff)
downloadefl-74e1c9bb7591228d988b189812b206dc5575ac9c.tar.gz
Evas: Stop using Evas.Image in public inheritance
So, it seems my previous commit 79abba52c50840c043e4b was a job half done, as I forgot to remove Evas.Image from the inheritance tree of all new evas image classes.
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.eo4
-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
5 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_image.eo b/src/lib/evas/canvas/efl_canvas_image.eo
index d1cfd226c0..cb34c03032 100644
--- a/src/lib/evas/canvas/efl_canvas_image.eo
+++ b/src/lib/evas/canvas/efl_canvas_image.eo
@@ -1,4 +1,6 @@
-class Efl.Canvas.Image (Evas.Image, Efl.Gfx.Buffer, Efl.Image.Load, Efl.Image.Animated)
+class Efl.Canvas.Image (Efl.Canvas.Image.Internal, Efl.Gfx.Buffer,
+ Efl.Image.Load, Efl.Image.Animated,
+ Efl.File)
{
[[Low-level Image object.
diff --git a/src/lib/evas/canvas/efl_canvas_proxy.eo b/src/lib/evas/canvas/efl_canvas_proxy.eo
index aff0e8b0a3..45a283a0c9 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.Buffer)
+class Efl.Canvas.Proxy (Efl.Canvas.Image.Internal, Efl.Gfx.Buffer)
{
[[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 4df223992f..ee5df99db4 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.Buffer)
+class Efl.Canvas.Scene3d (Efl.Canvas.Image.Internal, Efl.Gfx.Buffer)
{
[[A UI view for EFL Canvas 3D.]]
data: null;
diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.eo b/src/lib/evas/canvas/efl_canvas_snapshot.eo
index b2234ec8ad..b9f5c104e0 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)
+class Efl.Canvas.Snapshot (Efl.Canvas.Image.Internal)
{
[[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 b393296c9c..b973c048c0 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 (Eo.Interface, Evas.Image)
+mixin Efl.Canvas.Surface (Eo.Interface, Efl.Canvas.Image.Internal)
{
[[Native surfaces usually bound to an externally-managed buffer.