tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5defd35cef7f7dce58ab4bf90e661377e47f7d1d
commit 5defd35cef7f7dce58ab4bf90e661377e47f7d1d
Author: Tom Hacohen <t...@stosb.com>
Date: Thu May 12 11:35:21 2016 +0100
Efl image: Fix namespacing to use . and not _.
---
src/lib/efl/interfaces/efl_image_animated.eo | 12 ++++----
src/lib/efl/interfaces/efl_image_load.eo | 16 +++++-----
src/lib/elementary/elm_image.eo | 6 ++--
src/lib/emotion/emotion_object.eo | 4 +--
src/lib/evas/canvas/efl_canvas_image.eo | 44 ++++++++++++++--------------
5 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_image_animated.eo
b/src/lib/efl/interfaces/efl_image_animated.eo
index 0ffcc82..5404207 100644
--- a/src/lib/efl/interfaces/efl_image_animated.eo
+++ b/src/lib/efl/interfaces/efl_image_animated.eo
@@ -1,7 +1,7 @@
/* FIXME: invalid type from evas/emile! */
/* type @extern Evas.Animated_Loop_Hint: int; */
-enum Efl.Image_Animated.Loop_Hint {
+enum Efl.Image.Animated.Loop_Hint {
none = 0, [[No looping order specified.]]
loop = 1, [[Standard loop: 1->2->3->1->2->3->1]]
pingpong = 2 [[Ping-pong bouncing loop: 1->2->3->2->1->2->3->1]]
@@ -9,7 +9,7 @@ enum Efl.Image_Animated.Loop_Hint {
/* FIXME: rename to Efl.Image.Animated when eo/eolian are fixed */
-interface Efl.Image_Animated ()
+interface Efl.Image.Animated ()
{
legacy_prefix: null;
eo_prefix: efl_image;
@@ -64,18 +64,18 @@ interface Efl.Image_Animated ()
This returns the kind of looping the image object wants to do.
- If it returns @Efl.Image_Animated.Loop_Hint.loop, you should
+ If it returns @Efl.Image.Animated.Loop_Hint.loop, you should
display frames in a sequence like: 1->2->3->1->2->3->1...
- If it returns @Efl.Image_Animated.Loop_Hint.pingpong, it is
+ If it returns @Efl.Image.Animated.Loop_Hint.pingpong, it is
better to display frames in a sequence like:
1->2->3->2->1->2->3->1...
- The default type is @Efl.Image_Animated.Loop_Hint.loop.
+ The default type is @Efl.Image.Animated.Loop_Hint.loop.
@since 1.1
]]
- return: Efl.Image_Animated.Loop_Hint; [[Loop type of the image
object.]]
+ return: Efl.Image.Animated.Loop_Hint; [[Loop type of the image
object.]]
}
}
@property animated_loop_count {
diff --git a/src/lib/efl/interfaces/efl_image_load.eo
b/src/lib/efl/interfaces/efl_image_load.eo
index 4a6bd4e..6b9c71c 100644
--- a/src/lib/efl/interfaces/efl_image_load.eo
+++ b/src/lib/efl/interfaces/efl_image_load.eo
@@ -1,5 +1,5 @@
/* FIXME: maybe add error code for "currently running" or "pending" ? */
-enum Efl.Image_Load.Error
+enum Efl.Image.Load.Error
{
none = 0, [[No error on load]]
generic = 1, [[A non-specific error occurred]]
@@ -11,18 +11,18 @@ enum Efl.Image_Load.Error
}
/* FIXME: state or status??? */
-enum Efl.Image_Load.State
+enum Efl.Image.Load.State
{
none = 0, [[Not loading any image.]]
loaded = 1, [[Image data is loaded, nothing is pending.]]
pending = 2, [[The image has been queued for load, but actual loading may
not have started yet.]]
loading = 3, [[The image is currently loading.]]
- error = 4, [[Image load has failed. Call @Efl.Image_Load.load_error.get
to know why.]]
+ error = 4, [[Image load has failed. Call @Efl.Image.Load.load_error.get
to know why.]]
cancelled = 5 [[Image load has been cancelled.]]
}
/* FIXME: Efl.Image.Load */
-interface Efl.Image_Load ()
+interface Efl.Image.Load ()
{
[[Common APIs for all loadable 2D images.]]
legacy_prefix: null;
@@ -53,7 +53,7 @@ interface Efl.Image_Load ()
]]
}
values {
- state: Efl.Image_Load.State;
+ state: Efl.Image.Load.State;
}
}
@property load_size {
@@ -187,9 +187,9 @@ interface Efl.Image_Load ()
[[Retrieves a number representing any error that occurred during
the last loading of the given image object's source image.
]]
- return: Efl.Image_Load.Error @warn_unused; [[
+ return: Efl.Image.Load.Error @warn_unused; [[
A value giving the last error that occurred, one of
- @Efl.Image_Load.Error values. @Efl.Image_Load.Error.none is
+ @Efl.Image.Load.Error values. @Efl.Image.Load.Error.none is
returned if there was no error.
]]
}
@@ -197,7 +197,7 @@ interface Efl.Image_Load ()
}
events {
load,done;
- load,error: Efl.Image_Load.Error;
+ load,error: Efl.Image.Load.Error;
load,cancelled;
}
}
diff --git a/src/lib/elementary/elm_image.eo b/src/lib/elementary/elm_image.eo
index db35665..41fc327 100644
--- a/src/lib/elementary/elm_image.eo
+++ b/src/lib/elementary/elm_image.eo
@@ -42,7 +42,7 @@ struct Elm.Image.Error
}
class Elm.Image (Elm.Widget, Evas.Clickable_Interface,
Evas.Draggable_Interface,
- Efl.File, Efl.Image, Efl.Image_Load, Efl.Player,
Efl.Gfx.View, Efl.Player,
+ Efl.File, Efl.Image, Efl.Image.Load, Efl.Player,
Efl.Gfx.View, Efl.Player,
Elm.Interface_Atspi_Image, Elm.Interface_Atspi_Widget_Action,
Edje.Object, Efl.Orientation, Efl.Flipable)
{
@@ -123,8 +123,8 @@ class Elm.Image (Elm.Widget, Evas.Clickable_Interface,
Evas.Draggable_Interface,
Efl.File.async.get;
Efl.File.async_wait;
Efl.Gfx.View.view_size.get;
- Efl.Image_Load.load_size.set;
- Efl.Image_Load.load_size.get;
+ Efl.Image.Load.load_size.set;
+ Efl.Image.Load.load_size.get;
Efl.Image.smooth_scale.set;
Efl.Image.smooth_scale.get;
Efl.Orientation.orientation.set;
diff --git a/src/lib/emotion/emotion_object.eo
b/src/lib/emotion/emotion_object.eo
index 88bf5c3..1267417 100644
--- a/src/lib/emotion/emotion_object.eo
+++ b/src/lib/emotion/emotion_object.eo
@@ -1,4 +1,4 @@
-class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image,
Efl.Image_Load) {
+class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image,
Efl.Image.Load) {
eo_prefix: emotion_obj;
methods {
@property option {
@@ -74,7 +74,7 @@ class Emotion.Object (Evas.Object.Smart, Efl.File,
Efl.Player, Efl.Image, Efl.Im
Efl.Player.audio_mute.get;
Efl.Player.length.get;
Efl.Player.seekable.get;
- Efl.Image_Load.load_size.get;
+ Efl.Image.Load.load_size.get;
Efl.Image.ratio.get;
Efl.Image.smooth_scale.set;
Efl.Image.smooth_scale.get;
diff --git a/src/lib/evas/canvas/efl_canvas_image.eo
b/src/lib/evas/canvas/efl_canvas_image.eo
index 9f205ef..d1cfd22 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 (Evas.Image, Efl.Gfx.Buffer, Efl.Image_Load,
Efl.Image_Animated)
+class Efl.Canvas.Image (Evas.Image, Efl.Gfx.Buffer, Efl.Image.Load,
Efl.Image.Animated)
{
[[Low-level Image object.
@@ -18,26 +18,26 @@ class Efl.Canvas.Image (Evas.Image, Efl.Gfx.Buffer,
Efl.Image_Load, Efl.Image_An
Efl.File.file.get;
Efl.File.mmap.set;
Efl.File.mmap.get;
- Efl.Image_Animated.animated.get;
- Efl.Image_Animated.animated_frame.get;
- Efl.Image_Animated.animated_frame.set;
- Efl.Image_Animated.animated_frame_count.get;
- Efl.Image_Animated.animated_loop_type.get;
- Efl.Image_Animated.animated_loop_count.get;
- Efl.Image_Animated.animated_frame_duration.get;
- Efl.Image_Load.load_error.get;
- Efl.Image_Load.load_async_start;
- Efl.Image_Load.load_async_cancel;
- Efl.Image_Load.load_dpi.get;
- Efl.Image_Load.load_dpi.set;
- Efl.Image_Load.load_size.set;
- Efl.Image_Load.load_size.get;
- Efl.Image_Load.load_orientation.get;
- Efl.Image_Load.load_orientation.set;
- Efl.Image_Load.load_scale_down.get;
- Efl.Image_Load.load_scale_down.set;
- Efl.Image_Load.load_region.get;
- Efl.Image_Load.load_region.set;
- Efl.Image_Load.load_region_support.get;
+ Efl.Image.Animated.animated.get;
+ Efl.Image.Animated.animated_frame.get;
+ Efl.Image.Animated.animated_frame.set;
+ Efl.Image.Animated.animated_frame_count.get;
+ Efl.Image.Animated.animated_loop_type.get;
+ Efl.Image.Animated.animated_loop_count.get;
+ Efl.Image.Animated.animated_frame_duration.get;
+ Efl.Image.Load.load_error.get;
+ Efl.Image.Load.load_async_start;
+ Efl.Image.Load.load_async_cancel;
+ Efl.Image.Load.load_dpi.get;
+ Efl.Image.Load.load_dpi.set;
+ Efl.Image.Load.load_size.set;
+ Efl.Image.Load.load_size.get;
+ Efl.Image.Load.load_orientation.get;
+ Efl.Image.Load.load_orientation.set;
+ Efl.Image.Load.load_scale_down.get;
+ Efl.Image.Load.load_scale_down.set;
+ Efl.Image.Load.load_region.get;
+ Efl.Image.Load.load_region.set;
+ Efl.Image.Load.load_region_support.get;
}
}
--
