summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHosang Kim <hosang12.kim@samsung.com>2019-07-12 10:22:16 +0200
committerXavi Artigas <xavierartigas@yahoo.es>2019-07-12 10:32:20 +0200
commit7d33cf977f51192b0e61a7108503c2ec1e74c7a0 (patch)
treecc23dfcdd65fe65c8a9a979cc30ccec701289764
parente24d6aee6905941c3c994e679891c3587e83f7dd (diff)
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
-rw-r--r--src/lib/efl/interfaces/efl_gfx_image_orientable.eo4
-rw-r--r--src/lib/elementary/efl_ui_image.c4
-rw-r--r--src/lib/elementary/efl_ui_image.eo2
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c4
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_image_internal.eo2
-rw-r--r--src/lib/evas/canvas/evas_object_image.c4
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 ad6d05ae5f..5a3003094b 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
28interface Efl.Gfx.Image_Orientable 28interface Efl.Gfx.Image_Orientable
29{ 29{
30 [[Interface for objects which can be oriented.]] 30 [[Interface for objects which can be oriented.]]
31 c_prefix: efl_gfx_image; 31 c_prefix: efl_gfx;
32 methods { 32 methods {
33 @property orientation { 33 @property image_orientation {
34 [[Control the orientation (rotation and flipping) of a visual object. 34 [[Control the orientation (rotation and flipping) of a visual object.
35 35
36 This can be used to set the rotation on an image or a window, for 36 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 8f23228e7d..02dd574378 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1362,7 +1362,7 @@ _efl_ui_image_efl_gfx_image_load_controller_load_size_get(const Eo *obj EINA_UNU
1362} 1362}
1363 1363
1364EOLIAN static void 1364EOLIAN static void
1365_efl_ui_image_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Gfx_Image_Orientation orient) 1365_efl_ui_image_efl_gfx_image_orientable_image_orientation_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Gfx_Image_Orientation orient)
1366{ 1366{
1367 if (sd->edje) return; 1367 if (sd->edje) return;
1368 if (sd->orient == orient) return; 1368 if (sd->orient == orient) return;
@@ -1372,7 +1372,7 @@ _efl_ui_image_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_Image_Dat
1372} 1372}
1373 1373
1374EOLIAN static Efl_Gfx_Image_Orientation 1374EOLIAN static Efl_Gfx_Image_Orientation
1375_efl_ui_image_efl_gfx_image_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) 1375_efl_ui_image_efl_gfx_image_orientable_image_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1376{ 1376{
1377 return sd->orient; 1377 return sd->orient;
1378} 1378}
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 521e99743b..d6db562358 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.
100 Efl.Gfx.Image_Load_Controller.load_size { get; set; } 100 Efl.Gfx.Image_Load_Controller.load_size { get; set; }
101 Efl.Gfx.Image.smooth_scale { get; set; } 101 Efl.Gfx.Image.smooth_scale { get; set; }
102 Efl.Gfx.Image.scale_type { get; set; } 102 Efl.Gfx.Image.scale_type { get; set; }
103 Efl.Gfx.Image_Orientable.orientation { get; set; } 103 Efl.Gfx.Image_Orientable.image_orientation { get; set; }
104 Efl.Player.playable { get; } 104 Efl.Player.playable { get; }
105 Efl.Player.play { get; set; } 105 Efl.Player.play { get; set; }
106 Efl.Layout.Signal.signal_emit; 106 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 68e6e4dafd..9d834afad2 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1331,7 +1331,7 @@ _orient_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
1331} 1331}
1332 1332
1333EOLIAN static void 1333EOLIAN static void
1334_efl_ui_image_zoomable_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, 1334_efl_ui_image_zoomable_efl_gfx_image_orientable_image_orientation_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd,
1335 Efl_Gfx_Image_Orientation orient) 1335 Efl_Gfx_Image_Orientation orient)
1336{ 1336{
1337 if (sd->orient == orient) return; 1337 if (sd->orient == orient) return;
@@ -1341,7 +1341,7 @@ _efl_ui_image_zoomable_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_
1341} 1341}
1342 1342
1343EOLIAN static Efl_Gfx_Image_Orientation 1343EOLIAN static Efl_Gfx_Image_Orientation
1344_efl_ui_image_zoomable_efl_gfx_image_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd) 1344_efl_ui_image_zoomable_efl_gfx_image_orientable_image_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
1345{ 1345{
1346 return sd->orient; 1346 return sd->orient;
1347} 1347}
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 85c553e0b0..6b4dccdaa4 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,
65 Efl.Access.Widget.Action.elm_actions { get; } 65 Efl.Access.Widget.Action.elm_actions { get; }
66 Efl.File.load; 66 Efl.File.load;
67 Efl.File.file { get; set; } 67 Efl.File.file { get; set; }
68 Efl.Gfx.Image_Orientable.orientation { get; set; } 68 Efl.Gfx.Image_Orientable.image_orientation { get; set; }
69 Efl.Layout.Group.group_size_min { get; } 69 Efl.Layout.Group.group_size_min { get; }
70 Efl.Layout.Group.group_size_max { get; } 70 Efl.Layout.Group.group_size_max { get; }
71 Efl.Layout.Signal.signal_callback_add; 71 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 20777020a8..0e42c1c0f9 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
11 Efl.Object.finalize; 11 Efl.Object.finalize;
12 Efl.Object.debug_name_override; 12 Efl.Object.debug_name_override;
13 Efl.File_Save.save; 13 Efl.File_Save.save;
14 Efl.Gfx.Image_Orientable.orientation { get; set; } 14 Efl.Gfx.Image_Orientable.image_orientation { get; set; }
15 Efl.Gfx.Image.smooth_scale { get; set; } 15 Efl.Gfx.Image.smooth_scale { get; set; }
16 Efl.Gfx.Image.ratio { get; } 16 Efl.Gfx.Image.ratio { get; }
17 Efl.Gfx.Image.border { get; set; } 17 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 081c42aabe..f0795fcbc1 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -412,7 +412,7 @@ _evas_image_orientation_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Orient or
412} 412}
413 413
414EOLIAN static void 414EOLIAN static void
415_efl_canvas_image_internal_efl_gfx_image_orientable_orientation_set(Eo *obj, Evas_Image_Data *o, Efl_Gfx_Image_Orientation efl_orient) 415_efl_canvas_image_internal_efl_gfx_image_orientable_image_orientation_set(Eo *obj, Evas_Image_Data *o, Efl_Gfx_Image_Orientation efl_orient)
416{ 416{
417 // This array takes an Efl_Gfx_Image_Orientation and turns it into an Elm_Image_Orient 417 // This array takes an Efl_Gfx_Image_Orientation and turns it into an Elm_Image_Orient
418 static const Evas_Image_Orient evas_orient[16] = { 418 static const Evas_Image_Orient evas_orient[16] = {
@@ -440,7 +440,7 @@ _efl_canvas_image_internal_efl_gfx_image_orientable_orientation_set(Eo *obj, Eva
440} 440}
441 441
442EOLIAN static Efl_Gfx_Image_Orientation 442EOLIAN static Efl_Gfx_Image_Orientation
443_efl_canvas_image_internal_efl_gfx_image_orientable_orientation_get(const Eo *obj EINA_UNUSED, Evas_Image_Data *o) 443_efl_canvas_image_internal_efl_gfx_image_orientable_image_orientation_get(const Eo *obj EINA_UNUSED, Evas_Image_Data *o)
444{ 444{
445 return o->orient_value; 445 return o->orient_value;
446} 446}