From 6797beb174b2d580e7d22d9684c7b60d42773b0e Mon Sep 17 00:00:00 2001 From: Hosang Kim Date: Fri, 12 Jul 2019 10:22:16 +0200 Subject: [PATCH] Rename orientation -> image_orientation. Summary: Efl.Gfx.Image_Orientable and Efl.Ui.Layout_Orientable have same property name. So when class extends both interfaces, it makes conflict. Relates to T7924 Reviewers: woohyun, segfaultxavi Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9299 --- src/lib/efl/interfaces/efl_gfx_image_orientable.eo | 4 ++-- src/lib/elementary/efl_ui_image.c | 4 ++-- src/lib/elementary/efl_ui_image.eo | 2 +- src/lib/elementary/efl_ui_image_zoomable.c | 4 ++-- src/lib/elementary/efl_ui_image_zoomable.eo | 2 +- src/lib/evas/canvas/efl_canvas_image_internal.eo | 2 +- src/lib/evas/canvas/evas_object_image.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/efl/interfaces/efl_gfx_image_orientable.eo b/src/lib/efl/interfaces/efl_gfx_image_orientable.eo index ad6d05a..5a30030 100644 --- a/src/lib/efl/interfaces/efl_gfx_image_orientable.eo +++ b/src/lib/efl/interfaces/efl_gfx_image_orientable.eo @@ -28,9 +28,9 @@ enum Efl.Gfx.Image_Orientation interface Efl.Gfx.Image_Orientable { [[Interface for objects which can be oriented.]] - c_prefix: efl_gfx_image; + c_prefix: efl_gfx; methods { - @property orientation { + @property image_orientation { [[Control the orientation (rotation and flipping) of a visual object. This can be used to set the rotation on an image or a window, for diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index b4abeec..92fbb45 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -1378,7 +1378,7 @@ _efl_ui_image_efl_gfx_image_load_controller_load_size_get(const Eo *obj EINA_UNU } EOLIAN static void -_efl_ui_image_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Gfx_Image_Orientation orient) +_efl_ui_image_efl_gfx_image_orientable_image_orientation_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Gfx_Image_Orientation orient) { if (sd->edje) return; if (sd->orient == orient) return; @@ -1388,7 +1388,7 @@ _efl_ui_image_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_Image_Dat } EOLIAN static Efl_Gfx_Image_Orientation -_efl_ui_image_efl_gfx_image_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) +_efl_ui_image_efl_gfx_image_orientable_image_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) { return sd->orient; } diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo index 521e997..d6db562 100644 --- a/src/lib/elementary/efl_ui_image.eo +++ b/src/lib/elementary/efl_ui_image.eo @@ -100,7 +100,7 @@ class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl. Efl.Gfx.Image_Load_Controller.load_size { get; set; } Efl.Gfx.Image.smooth_scale { get; set; } Efl.Gfx.Image.scale_type { get; set; } - Efl.Gfx.Image_Orientable.orientation { get; set; } + Efl.Gfx.Image_Orientable.image_orientation { get; set; } Efl.Player.playable { get; } Efl.Player.play { get; set; } Efl.Layout.Signal.signal_emit; diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index d50d5f8..ee35746 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -1344,7 +1344,7 @@ _orient_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd) } EOLIAN static void -_efl_ui_image_zoomable_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, +_efl_ui_image_zoomable_efl_gfx_image_orientable_image_orientation_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, Efl_Gfx_Image_Orientation orient) { if (sd->orient == orient) return; @@ -1354,7 +1354,7 @@ _efl_ui_image_zoomable_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_ } EOLIAN static Efl_Gfx_Image_Orientation -_efl_ui_image_zoomable_efl_gfx_image_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd) +_efl_ui_image_zoomable_efl_gfx_image_orientable_image_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd) { return sd->orient; } diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo index 85c553e..6b4dccd 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.eo +++ b/src/lib/elementary/efl_ui_image_zoomable.eo @@ -65,7 +65,7 @@ class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom, Efl.Access.Widget.Action.elm_actions { get; } Efl.File.load; Efl.File.file { get; set; } - Efl.Gfx.Image_Orientable.orientation { get; set; } + Efl.Gfx.Image_Orientable.image_orientation { get; set; } Efl.Layout.Group.group_size_min { get; } Efl.Layout.Group.group_size_max { get; } Efl.Layout.Signal.signal_callback_add; diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo b/src/lib/evas/canvas/efl_canvas_image_internal.eo index 2077702..0e42c1c 100644 --- a/src/lib/evas/canvas/efl_canvas_image_internal.eo +++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo @@ -11,7 +11,7 @@ abstract @beta Efl.Canvas.Image_Internal extends Efl.Canvas.Object implements Ef Efl.Object.finalize; Efl.Object.debug_name_override; Efl.File_Save.save; - Efl.Gfx.Image_Orientable.orientation { get; set; } + Efl.Gfx.Image_Orientable.image_orientation { get; set; } Efl.Gfx.Image.smooth_scale { get; set; } Efl.Gfx.Image.ratio { get; } Efl.Gfx.Image.border { get; set; } diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 9362ef1..991adbb 100755 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -426,7 +426,7 @@ _evas_image_orientation_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Orient or } EOLIAN static void -_efl_canvas_image_internal_efl_gfx_image_orientable_orientation_set(Eo *obj, Evas_Image_Data *o, Efl_Gfx_Image_Orientation efl_orient) +_efl_canvas_image_internal_efl_gfx_image_orientable_image_orientation_set(Eo *obj, Evas_Image_Data *o, Efl_Gfx_Image_Orientation efl_orient) { // This array takes an Efl_Gfx_Image_Orientation and turns it into an Elm_Image_Orient static const Evas_Image_Orient evas_orient[16] = { @@ -454,7 +454,7 @@ _efl_canvas_image_internal_efl_gfx_image_orientable_orientation_set(Eo *obj, Eva } EOLIAN static Efl_Gfx_Image_Orientation -_efl_canvas_image_internal_efl_gfx_image_orientable_orientation_get(const Eo *obj EINA_UNUSED, Evas_Image_Data *o) +_efl_canvas_image_internal_efl_gfx_image_orientable_image_orientation_get(const Eo *obj EINA_UNUSED, Evas_Image_Data *o) { return o->orient_value; } -- 2.7.4