From 5e1711aac1c751570fc263cbdc3b97dc000002cd Mon Sep 17 00:00:00 2001 From: Amitesh Singh Date: Thu, 18 May 2017 14:55:31 +0900 Subject: [PATCH] rename Efl.Ui.Zoomable to Efl.Ui.Zoom Signed-off-by: Amitesh Singh --- src/Makefile_Evas.am | 2 +- src/lib/elementary/elm_photocam.c | 12 ++++++------ src/lib/elementary/elm_photocam.eo | 8 ++++---- src/lib/evas/Evas_Eo.h | 2 +- src/lib/evas/canvas/common_interfaces.c | 2 +- src/lib/evas/canvas/{efl_ui_zoomable.eo => efl_ui_zoom.eo} | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) rename src/lib/evas/canvas/{efl_ui_zoomable.eo => efl_ui_zoom.eo} (96%) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 75b1595..baa767a 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -14,7 +14,7 @@ evas_eolian_pub_files = \ lib/evas/canvas/efl_ui_clickable.eo \ lib/evas/canvas/efl_ui_scrollable.eo \ lib/evas/canvas/efl_ui_selectable.eo \ - lib/evas/canvas/efl_ui_zoomable.eo \ + lib/evas/canvas/efl_ui_zoom.eo \ lib/evas/canvas/evas_canvas3d_camera.eo\ lib/evas/canvas/evas_canvas3d_texture.eo\ lib/evas/canvas/evas_canvas3d_material.eo\ diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c index 5438a30..aba5192 100644 --- a/src/lib/elementary/elm_photocam.c +++ b/src/lib/elementary/elm_photocam.c @@ -1877,7 +1877,7 @@ elm_photocam_file_get(const Elm_Photocam *obj) } EOLIAN static void -_elm_photocam_efl_ui_zoomable_zoom_set(Eo *obj, Elm_Photocam_Data *sd, double zoom) +_elm_photocam_efl_ui_zoom_zoom_set(Eo *obj, Elm_Photocam_Data *sd, double zoom) { double z; Eina_List *l; @@ -2104,13 +2104,13 @@ done: } EOLIAN static double -_elm_photocam_efl_ui_zoomable_zoom_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) +_elm_photocam_efl_ui_zoom_zoom_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) { return sd->zoom; } EOLIAN static void -_elm_photocam_efl_ui_zoomable_zoom_mode_set(Eo *obj, Elm_Photocam_Data *sd, Elm_Photocam_Zoom_Mode mode) +_elm_photocam_efl_ui_zoom_zoom_mode_set(Eo *obj, Elm_Photocam_Data *sd, Elm_Photocam_Zoom_Mode mode) { double tz; if (sd->mode == mode) return; @@ -2122,7 +2122,7 @@ _elm_photocam_efl_ui_zoomable_zoom_mode_set(Eo *obj, Elm_Photocam_Data *sd, Elm_ } EOLIAN static Elm_Photocam_Zoom_Mode -_elm_photocam_efl_ui_zoomable_zoom_mode_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) +_elm_photocam_efl_ui_zoom_zoom_mode_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) { return sd->mode; } @@ -2245,7 +2245,7 @@ _elm_photocam_elm_interface_scrollable_region_bring_in(Eo *obj, Elm_Photocam_Dat } EOLIAN static void -_elm_photocam_efl_ui_zoomable_zoom_animation_set(Eo *obj, Elm_Photocam_Data *sd, Eina_Bool paused) +_elm_photocam_efl_ui_zoom_zoom_animation_set(Eo *obj, Elm_Photocam_Data *sd, Eina_Bool paused) { paused = !!paused; @@ -2258,7 +2258,7 @@ _elm_photocam_efl_ui_zoomable_zoom_animation_set(Eo *obj, Elm_Photocam_Data *sd, } EOLIAN static Eina_Bool -_elm_photocam_efl_ui_zoomable_zoom_animation_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) +_elm_photocam_efl_ui_zoom_zoom_animation_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) { return sd->paused; } diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo index 9349d79..610bee9 100644 --- a/src/lib/elementary/elm_photocam.eo +++ b/src/lib/elementary/elm_photocam.eo @@ -1,7 +1,7 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, Elm.Interface.Atspi_Widget_Action, Efl.File, Efl.Ui.Clickable, Efl.Ui.Scrollable, Efl.Gfx.View, - Efl.Ui.Zoomable, Efl.Orientation, Efl.Flipable) + Efl.Ui.Zoom, Efl.Orientation, Efl.Flipable) { [[Elementary photocam class]] legacy_prefix: elm_photocam; @@ -53,9 +53,9 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, Efl.Gfx.position { set; } Efl.Gfx.size { set; } Efl.Gfx.View.view_size { get; } - Efl.Ui.Zoomable.zoom_animation { set; get; } - Efl.Ui.Zoomable.zoom { set; get; } - Efl.Ui.Zoomable.zoom_mode { set; get; } + Efl.Ui.Zoom.zoom_animation { set; get; } + Efl.Ui.Zoom.zoom { set; get; } + Efl.Ui.Zoom.zoom_mode { set; get; } Efl.Canvas.Group.group_add; Efl.Canvas.Group.group_del; Efl.Canvas.Group.group_member_add; diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 6306849..38d1e3a 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -7,7 +7,7 @@ #include "canvas/efl_ui_clickable.eo.h" #include "canvas/efl_ui_scrollable.eo.h" #include "canvas/efl_ui_selectable.eo.h" -#include "canvas/efl_ui_zoomable.eo.h" +#include "canvas/efl_ui_zoom.eo.h" #include "canvas/evas_canvas.eo.h" diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c index f2ffc24..e177ed5 100644 --- a/src/lib/evas/canvas/common_interfaces.c +++ b/src/lib/evas/canvas/common_interfaces.c @@ -5,4 +5,4 @@ #include "canvas/efl_ui_clickable.eo.c" #include "canvas/efl_ui_scrollable.eo.c" #include "canvas/efl_ui_selectable.eo.c" -#include "canvas/efl_ui_zoomable.eo.c" +#include "canvas/efl_ui_zoom.eo.c" diff --git a/src/lib/evas/canvas/efl_ui_zoomable.eo b/src/lib/evas/canvas/efl_ui_zoom.eo similarity index 96% rename from src/lib/evas/canvas/efl_ui_zoomable.eo rename to src/lib/evas/canvas/efl_ui_zoom.eo index 474340d..7785467 100644 --- a/src/lib/evas/canvas/efl_ui_zoomable.eo +++ b/src/lib/evas/canvas/efl_ui_zoom.eo @@ -1,4 +1,4 @@ -enum Efl.Ui.Zoom_Mode +enum Efl.Ui.Zoom.Mode { [[Types of zoom available.]] manual = 0, [[Zoom controlled normally by efl_ui_zoom_set]] @@ -8,9 +8,9 @@ enum Efl.Ui.Zoom_Mode last [[Sentinel value to indicate last enum field during iteration]] } -interface Efl.Ui.Zoomable () +interface Efl.Ui.Zoom () { - [[Efl UI zoomable interface]] + [[Efl UI zoom interface]] event_prefix: efl_ui; eo_prefix: efl_ui; @@ -87,7 +87,7 @@ interface Efl.Ui.Zoomable () ]] } values { - mode: Efl.Ui.Zoom_Mode; [[The zoom mode.]] + mode: Efl.Ui.Zoom.Mode; [[The zoom mode.]] } } } -- 2.7.4