efl_ui_image_zoomable: remove all legacy usage from eo files

this takes the current generated output from eolian for legacy code in
efl and adds it to the tree, then removes legacy references from the
corresponding eo files. in the case where the entire eo file was for
a legacy object, that eo file has been removed from the tree

ref T7724

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D8141

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index a8cccc55c71e1a7c8d0e950bd3c74ae4e3a590ad..008f5f561c6feecce2705f32e1e9f35a8b01be0f 100644 (file)
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -200,7 +200,6 @@ elm_legacy_eolian_files = \
        lib/elementary/efl_ui_radio_legacy.eo \
        lib/elementary/efl_ui_video_legacy.eo \
        lib/elementary/efl_ui_panes_legacy.eo \
-       lib/elementary/efl_ui_image_zoomable_legacy.eo \
        lib/elementary/efl_ui_win_legacy.eo \
        lib/elementary/efl_ui_progressbar_legacy.eo \
        lib/elementary/efl_ui_clock_legacy.eo \
@@ -337,6 +336,8 @@ lib/elementary/efl_ui_check_legacy_eo.c \
 lib/elementary/efl_ui_flip_legacy_eo.c \
 lib/elementary/efl_ui_frame_legacy_eo.c \
 lib/elementary/efl_ui_image_legacy_eo.c \
+lib/elementary/efl_ui_image_zoomable_eo.legacy.c \
+lib/elementary/efl_ui_image_zoomable_legacy_eo.c \
 lib/elementary/elm_hoversel_eo.c \
 lib/elementary/elm_hoversel_eo.legacy.c \
 lib/elementary/elm_hoversel_item_eo.c \
@@ -360,6 +361,9 @@ lib/elementary/efl_ui_frame_legacy_eo.h \
 lib/elementary/efl_ui_frame_legacy_eo.legacy.h \
 lib/elementary/efl_ui_image_legacy_eo.h \
 lib/elementary/efl_ui_image_legacy_eo.legacy.h \
+lib/elementary/efl_ui_image_zoomable_eo.legacy.h \
+lib/elementary/efl_ui_image_zoomable_legacy_eo.h \
+lib/elementary/efl_ui_image_zoomable_legacy_eo.legacy.h \
 lib/elementary/elm_hoversel_eo.h \
 lib/elementary/elm_hoversel_eo.legacy.h \
 lib/elementary/elm_hoversel_item_eo.h \

diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index a82bd68670c20f2c75fd07f70fa1e83ca7af81ce..0947ad8bded21b4acfaf05c2889dfdf4e02bcd82 100644 (file)
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -3190,8 +3190,9 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_image_zoomable, Efl_Ui_Image_Zoomab
    EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_image_zoomable)
 
 #include "efl_ui_image_zoomable.eo.c"
+#include "efl_ui_image_zoomable_eo.legacy.c"
 
-#include "efl_ui_image_zoomable_legacy.eo.h"
+#include "efl_ui_image_zoomable_legacy_eo.h"
 #define MY_CLASS_NAME_LEGACY "elm_photocam"
 
 static void
@@ -3445,4 +3446,4 @@ elm_photocam_image_region_get(const Efl_Ui_Image_Zoomable *obj, int *x, int *y,
    if (h) *h = r.h;
 }
 
-#include "efl_ui_image_zoomable_legacy.eo.c"
+#include "efl_ui_image_zoomable_legacy_eo.c"

diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index ab3a5a811136b79c4562dd8683aae4f37477a60f..374c82fc216398dc386099b38f58796d56492628 100644 (file)
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -7,7 +7,6 @@ class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom,
                              Efl.Ui.Scrollbar
 {
    [[Elementary Image Zoomable class]]
-   legacy_prefix: elm_photocam;
    methods {
       @property gesture_enabled {
          set {
@@ -33,7 +32,6 @@ class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom,
 
               See also @.image_region.set.
             ]]
-            legacy: null;
          }
          set {
             [[Set the viewed region of the image
@@ -41,7 +39,6 @@ class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom,
               This shows the region of the image without using animation.
               @since 1.20
             ]]
-            legacy: null;
          }
          values {
             region: Eina.Rect; [[The region in the original image pixels.]]

diff --git a/src/lib/elementary/efl_ui_image_zoomable_eo.legacy.c b/src/lib/elementary/efl_ui_image_zoomable_eo.legacy.c
new file mode 100644 (file)
index 0000000..61dd750
--- /dev/null
+++ b/src/lib/elementary/efl_ui_image_zoomable_eo.legacy.c
@@ -0,0 +1,12 @@
+
+EAPI void
+elm_photocam_gesture_enabled_set(Efl_Ui_Image_Zoomable *obj, Eina_Bool gesture)
+{
+   efl_ui_image_zoomable_gesture_enabled_set(obj, gesture);
+}
+
+EAPI Eina_Bool
+elm_photocam_gesture_enabled_get(const Efl_Ui_Image_Zoomable *obj)
+{
+   return efl_ui_image_zoomable_gesture_enabled_get(obj);
+}

diff --git a/src/lib/elementary/efl_ui_image_zoomable_eo.legacy.h b/src/lib/elementary/efl_ui_image_zoomable_eo.legacy.h
new file mode 100644 (file)
index 0000000..7fa5aab
--- /dev/null
+++ b/src/lib/elementary/efl_ui_image_zoomable_eo.legacy.h
@@ -0,0 +1,45 @@
+#ifndef _EFL_UI_IMAGE_ZOOMABLE_EO_LEGACY_H_
+#define _EFL_UI_IMAGE_ZOOMABLE_EO_LEGACY_H_
+
+#ifndef _EFL_UI_IMAGE_ZOOMABLE_EO_CLASS_TYPE
+#define _EFL_UI_IMAGE_ZOOMABLE_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Image_Zoomable;
+
+#endif
+
+#ifndef _EFL_UI_IMAGE_ZOOMABLE_EO_TYPES
+#define _EFL_UI_IMAGE_ZOOMABLE_EO_TYPES
+
+
+#endif
+
+/**
+ * @brief Set the gesture state for photocam.
+ *
+ * This sets the gesture state to on or off for photocam. The default is off.
+ * This will start multi touch zooming.
+ *
+ * @param[in] obj The object.
+ * @param[in] gesture The gesture state.
+ *
+ * @ingroup Elm_Photocam_Group
+ */
+EAPI void elm_photocam_gesture_enabled_set(Efl_Ui_Image_Zoomable *obj, Eina_Bool gesture);
+
+/**
+ * @brief Get the gesture state for photocam.
+ *
+ * This gets the current gesture state for the photocam object.
+ *
+ * @param[in] obj The object.
+ *
+ * @return The gesture state.
+ *
+ * @ingroup Elm_Photocam_Group
+ */
+EAPI Eina_Bool elm_photocam_gesture_enabled_get(const Efl_Ui_Image_Zoomable *obj);
+
+
+
+#endif

diff --git a/src/lib/elementary/efl_ui_image_zoomable_legacy.eo b/src/lib/elementary/efl_ui_image_zoomable_legacy.eo
deleted file mode 100644 (file)
index b1a4197..0000000
--- a/src/lib/elementary/efl_ui_image_zoomable_legacy.eo
+++ /dev/null
@@ -1,9 +0,0 @@
-class @beta Efl.Ui.Image_Zoomable_Legacy extends Efl.Ui.Image_Zoomable implements Efl.Ui.Legacy
-{
-   [[Elementary Image Zoomable class]]
-   data: null;
-   implements {
-      class.constructor;
-      Efl.Object.constructor;
-   }
-}

diff --git a/src/lib/elementary/efl_ui_image_zoomable_legacy_eo.c b/src/lib/elementary/efl_ui_image_zoomable_legacy_eo.c
new file mode 100644 (file)
index 0000000..22ac25b
--- /dev/null
+++ b/src/lib/elementary/efl_ui_image_zoomable_legacy_eo.c
@@ -0,0 +1,35 @@
+
+Efl_Object *_efl_ui_image_zoomable_legacy_efl_object_constructor(Eo *obj, void *pd);
+
+
+static Eina_Bool
+_efl_ui_image_zoomable_legacy_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef EFL_UI_IMAGE_ZOOMABLE_LEGACY_EXTRA_OPS
+#define EFL_UI_IMAGE_ZOOMABLE_LEGACY_EXTRA_OPS
+#endif
+
+   EFL_OPS_DEFINE(ops,
+      EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_image_zoomable_legacy_efl_object_constructor),
+      EFL_UI_IMAGE_ZOOMABLE_LEGACY_EXTRA_OPS
+   );
+   opsp = &ops;
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _efl_ui_image_zoomable_legacy_class_desc = {
+   EO_VERSION,
+   "Efl.Ui.Image_Zoomable_Legacy",
+   EFL_CLASS_TYPE_REGULAR,
+   0,
+   _efl_ui_image_zoomable_legacy_class_initializer,
+   _efl_ui_image_zoomable_legacy_class_constructor,
+   NULL
+};
+
+EFL_DEFINE_CLASS(efl_ui_image_zoomable_legacy_class_get, &_efl_ui_image_zoomable_legacy_class_desc, EFL_UI_IMAGE_ZOOMABLE_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

diff --git a/src/lib/elementary/efl_ui_image_zoomable_legacy_eo.h b/src/lib/elementary/efl_ui_image_zoomable_legacy_eo.h
new file mode 100644 (file)
index 0000000..e18960f
--- /dev/null
+++ b/src/lib/elementary/efl_ui_image_zoomable_legacy_eo.h
@@ -0,0 +1,26 @@
+#ifndef _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_H_
+#define _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_H_
+
+#ifndef _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Image_Zoomable_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_TYPES
+#define _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_TYPES
+
+
+#endif
+#ifdef EFL_BETA_API_SUPPORT
+/** Elementary Image Zoomable class
+ *
+ * @ingroup Efl_Ui_Image_Zoomable_Legacy
+ */
+#define EFL_UI_IMAGE_ZOOMABLE_LEGACY_CLASS efl_ui_image_zoomable_legacy_class_get()
+
+EWAPI const Efl_Class *efl_ui_image_zoomable_legacy_class_get(void);
+#endif /* EFL_BETA_API_SUPPORT */
+
+#endif

diff --git a/src/lib/elementary/efl_ui_image_zoomable_legacy_eo.legacy.h b/src/lib/elementary/efl_ui_image_zoomable_legacy_eo.legacy.h
new file mode 100644 (file)
index 0000000..0ed427d
--- /dev/null
+++ b/src/lib/elementary/efl_ui_image_zoomable_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
+#ifndef _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_LEGACY_H_
+#define _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_LEGACY_H_
+
+#ifndef _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Image_Zoomable_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_TYPES
+#define _EFL_UI_IMAGE_ZOOMABLE_LEGACY_EO_TYPES
+
+
+#endif
+
+#endif

diff --git a/src/lib/elementary/efl_ui_image_zoomable_pan.eo b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
index 792f1a9a2f65e0004c44a6c7513cec038ee1e9e8..b1b5c0d4b3e9fc4a57799b94b0a2d359d441ee38 100644 (file)
--- a/src/lib/elementary/efl_ui_image_zoomable_pan.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
@@ -1,7 +1,6 @@
 class @beta Efl.Ui.Image_Zoomable_Pan extends Efl.Ui.Pan
 {
    [[Elementary photocom pan class]]
-   legacy_prefix: elm_photocam_pan;
    implements {
       class.constructor;
       Efl.Object.destructor;

diff --git a/src/lib/elementary/elm_photocam_legacy.h b/src/lib/elementary/elm_photocam_legacy.h
index 52a3cbd1d954fb8f7998692c439b9f84ee8554f4..f80d8ac49b49053dfa79d02f95f1771000d6b1fb 100644 (file)
--- a/src/lib/elementary/elm_photocam_legacy.h
+++ b/src/lib/elementary/elm_photocam_legacy.h
@@ -234,4 +234,4 @@ EAPI Elm_Photocam_Zoom_Mode elm_photocam_zoom_mode_get(const Evas_Object *obj);
  */
 EAPI void elm_photocam_image_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h);
 
-#include "efl_ui_image_zoomable.eo.legacy.h"
+#include "efl_ui_image_zoomable_eo.legacy.h"

diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index eb7fcf4786cbabbbca4eecefc2da3905babaa580..c2352ccbc60cee8549988fe6f41ed9925da758cf 100644 (file)
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -2,7 +2,6 @@ pub_legacy_eo_files = [
   'efl_ui_radio_legacy.eo',
   'efl_ui_video_legacy.eo',
   'efl_ui_panes_legacy.eo',
-  'efl_ui_image_zoomable_legacy.eo',
   'efl_ui_win_legacy.eo',
   'efl_ui_progressbar_legacy.eo',
   'efl_ui_clock_legacy.eo',
@@ -826,6 +825,9 @@ elementary_pub_headers = [
   'efl_ui_frame_legacy_eo.legacy.h',
   'efl_ui_image_legacy_eo.h',
   'efl_ui_image_legacy_eo.legacy.h',
+  'efl_ui_image_zoomable_eo.legacy.h',
+  'efl_ui_image_zoomable_legacy_eo.h',
+  'efl_ui_image_zoomable_legacy_eo.legacy.h',
   'elm_hoversel_eo.h',
   'elm_hoversel_eo.legacy.h',
   'elm_hoversel_item_eo.h',