enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
Mike Blumenkrantz 2019-03-05 17:00:37 -05:00 committed by Cedric BAIL
parent 2f20d97f10
commit 5af04e40e2
12 changed files with 147 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile_Elementary.am
View File

@ -189,7 +189,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 \
@ -325,6 +324,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 \
@ -348,6 +349,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 \

5
src/lib/elementary/efl_ui_image_zoomable.c
View File

@ -3177,8 +3177,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
@ -3431,4 +3432,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"

3
src/lib/elementary/efl_ui_image_zoomable.eo
View File

@ -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.]]

12
src/lib/elementary/efl_ui_image_zoomable_eo.legacy.c Normal file
View File

@ -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);
}

45
src/lib/elementary/efl_ui_image_zoomable_eo.legacy.h Normal file
View File

@ -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

9
src/lib/elementary/efl_ui_image_zoomable_legacy.eo
View File

@ -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;
}
}

35
src/lib/elementary/efl_ui_image_zoomable_legacy_eo.c Normal file
View File

@ -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);

26
src/lib/elementary/efl_ui_image_zoomable_legacy_eo.h Normal file
View File

@ -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

17
src/lib/elementary/efl_ui_image_zoomable_legacy_eo.legacy.h Normal file
View File

@ -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

1
src/lib/elementary/efl_ui_image_zoomable_pan.eo
View File

@ -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;

2
src/lib/elementary/elm_photocam_legacy.h
View File

@ -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"

4
src/lib/elementary/meson.build
View File

@ -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',
@ -706,6 +705,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',