[EGIT] [core/efl] master 05/21: elm_photocam: remove linkage with efl_ui_zoom

[Mike Blumenkrantz]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=21b0467e6ff6f8d043cc4b3cf0e8758a162f51f6

commit 21b0467e6ff6f8d043cc4b3cf0e8758a162f51f6
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Wed Mar 6 13:22:05 2019 -0500

    elm_photocam: remove linkage with efl_ui_zoom
    
    this is a legacy class and should not have its enum values defined
    to an interface enum
    
    Reviewed-by: Cedric BAIL <cedric.b...@free.fr>
    Differential Revision: https://phab.enlightenment.org/D8122
---
 src/lib/elementary/efl_ui_image_zoomable.c |  6 +++---
 src/lib/elementary/elm_photocam_legacy.h   | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/lib/elementary/efl_ui_image_zoomable.c 
b/src/lib/elementary/efl_ui_image_zoomable.c
index fd25b6f864..609c85fe9f 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -2648,10 +2648,10 @@ _efl_ui_image_zoomable_efl_ui_zoom_zoom_level_get(const 
Eo *obj EINA_UNUSED, Efl
 }
 
 EOLIAN static void
-_efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_set(Eo *obj, 
Efl_Ui_Image_Zoomable_Data *sd, Elm_Photocam_Zoom_Mode mode)
+_efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_set(Eo *obj, 
Efl_Ui_Image_Zoomable_Data *sd, Efl_Ui_Zoom_Mode mode)
 {
    double tz;
-   if (sd->mode == mode) return;
+   if (sd->mode == (Elm_Photocam_Zoom_Mode)mode) return;
    sd->mode = mode;
 
    tz = sd->zoom;
@@ -2659,7 +2659,7 @@ _efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_set(Eo *obj, 
Efl_Ui_Image_Zoomable_
    elm_photocam_zoom_set(obj, tz);
 }
 
-EOLIAN static Elm_Photocam_Zoom_Mode
+EOLIAN static Efl_Ui_Zoom_Mode
 _efl_ui_image_zoomable_efl_ui_zoom_zoom_mode_get(const Eo *obj EINA_UNUSED, 
Efl_Ui_Image_Zoomable_Data *sd)
 {
    return sd->mode;
diff --git a/src/lib/elementary/elm_photocam_legacy.h 
b/src/lib/elementary/elm_photocam_legacy.h
index b56f8b018b..52a3cbd1d9 100644
--- a/src/lib/elementary/elm_photocam_legacy.h
+++ b/src/lib/elementary/elm_photocam_legacy.h
@@ -1,5 +1,3 @@
-#include "interfaces/efl_ui_zoom.eo.legacy.h"
-
 typedef Eo Elm_Photocam;
 
 /**
@@ -180,13 +178,17 @@ EAPI void             elm_photocam_zoom_set(Evas_Object 
*obj, double zoom);
  */
 EAPI double           elm_photocam_zoom_get(const Evas_Object *obj);
 
-typedef Efl_Ui_Zoom_Mode Elm_Photocam_Zoom_Mode;
 
-#define ELM_PHOTOCAM_ZOOM_MODE_MANUAL           EFL_UI_ZOOM_MODE_MANUAL
-#define ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT         EFL_UI_ZOOM_MODE_AUTO_FIT
-#define ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL        EFL_UI_ZOOM_MODE_AUTO_FILL
-#define ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN      EFL_UI_ZOOM_MODE_AUTO_FIT_IN
-#define ELM_PHOTOCAM_ZOOM_MODE_LAST             EFL_UI_ZOOM_MODE_LAST
+typedef enum
+{
+  ELM_PHOTOCAM_ZOOM_MODE_MANUAL = 0, /**< Zoom controlled normally by 
elm_photocam_zoom_set */
+  ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT, /**< Zoom until photo fits in zoomable 
object */
+  ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL, /**< Zoom until photo fills zoomable 
object */
+  ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN, /**< Zoom in until photo fits in 
zoomable object
+                                 */
+  ELM_PHOTOCAM_ZOOM_MODE_LAST /**< Sentinel value to indicate last enum field 
during
+                         * iteration */
+} Elm_Photocam_Zoom_Mode;
 
 /**
  * @brief Set the zoom mode

--