efl_ui_image: 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/D8140
This commit is contained in:
Mike Blumenkrantz 2019-03-05 17:00:37 -05:00 committed by Cedric BAIL
parent d90c60ea54
commit 2f20d97f10
7 changed files with 85 additions and 13 deletions

View File

@ -191,7 +191,6 @@ elm_legacy_eolian_files = \
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_image_legacy.eo \
lib/elementary/efl_ui_progressbar_legacy.eo \
lib/elementary/efl_ui_clock_legacy.eo \
lib/elementary/efl_ui_layout_legacy.eo \
@ -325,6 +324,7 @@ lib/elementary/efl_ui_button_legacy_eo.c \
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/elm_hoversel_eo.c \
lib/elementary/elm_hoversel_eo.legacy.c \
lib/elementary/elm_hoversel_item_eo.c \
@ -346,6 +346,8 @@ lib/elementary/efl_ui_flip_legacy_eo.legacy.h \
lib/elementary/efl_ui_frame_eo.legacy.h \
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/elm_hoversel_eo.h \
lib/elementary/elm_hoversel_eo.legacy.h \
lib/elementary/elm_hoversel_item_eo.h \

View File

@ -2285,7 +2285,7 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_image, Efl_Ui_Image_Data)
#include "efl_ui_image.eo.c"
#include "efl_ui_image_legacy.eo.h"
#include "efl_ui_image_legacy_eo.h"
#define MY_CLASS_NAME_LEGACY "elm_image"
@ -2315,4 +2315,4 @@ elm_image_add(Evas_Object *parent)
return obj;
}
#include "efl_ui_image_legacy.eo.c"
#include "efl_ui_image_legacy_eo.c"

View File

@ -1,9 +0,0 @@
class @beta Efl.Ui.Image_Legacy extends Efl.Ui.Image implements Efl.Ui.Legacy
{
[[ Efl UI image class]]
data: null;
implements {
class.constructor;
Efl.Object.constructor;
}
}

View File

@ -0,0 +1,35 @@
Efl_Object *_efl_ui_image_legacy_efl_object_constructor(Eo *obj, void *pd);
static Eina_Bool
_efl_ui_image_legacy_class_initializer(Efl_Class *klass)
{
const Efl_Object_Ops *opsp = NULL;
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
#ifndef EFL_UI_IMAGE_LEGACY_EXTRA_OPS
#define EFL_UI_IMAGE_LEGACY_EXTRA_OPS
#endif
EFL_OPS_DEFINE(ops,
EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_image_legacy_efl_object_constructor),
EFL_UI_IMAGE_LEGACY_EXTRA_OPS
);
opsp = &ops;
return efl_class_functions_set(klass, opsp, ropsp);
}
static const Efl_Class_Description _efl_ui_image_legacy_class_desc = {
EO_VERSION,
"Efl.Ui.Image_Legacy",
EFL_CLASS_TYPE_REGULAR,
0,
_efl_ui_image_legacy_class_initializer,
_efl_ui_image_legacy_class_constructor,
NULL
};
EFL_DEFINE_CLASS(efl_ui_image_legacy_class_get, &_efl_ui_image_legacy_class_desc, EFL_UI_IMAGE_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

View File

@ -0,0 +1,26 @@
#ifndef _EFL_UI_IMAGE_LEGACY_EO_H_
#define _EFL_UI_IMAGE_LEGACY_EO_H_
#ifndef _EFL_UI_IMAGE_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_IMAGE_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Image_Legacy;
#endif
#ifndef _EFL_UI_IMAGE_LEGACY_EO_TYPES
#define _EFL_UI_IMAGE_LEGACY_EO_TYPES
#endif
#ifdef EFL_BETA_API_SUPPORT
/** Efl UI image class
*
* @ingroup Efl_Ui_Image_Legacy
*/
#define EFL_UI_IMAGE_LEGACY_CLASS efl_ui_image_legacy_class_get()
EWAPI const Efl_Class *efl_ui_image_legacy_class_get(void);
#endif /* EFL_BETA_API_SUPPORT */
#endif

View File

@ -0,0 +1,17 @@
#ifndef _EFL_UI_IMAGE_LEGACY_EO_LEGACY_H_
#define _EFL_UI_IMAGE_LEGACY_EO_LEGACY_H_
#ifndef _EFL_UI_IMAGE_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_IMAGE_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Image_Legacy;
#endif
#ifndef _EFL_UI_IMAGE_LEGACY_EO_TYPES
#define _EFL_UI_IMAGE_LEGACY_EO_TYPES
#endif
#endif

View File

@ -4,7 +4,6 @@ pub_legacy_eo_files = [
'efl_ui_panes_legacy.eo',
'efl_ui_image_zoomable_legacy.eo',
'efl_ui_win_legacy.eo',
'efl_ui_image_legacy.eo',
'efl_ui_progressbar_legacy.eo',
'efl_ui_clock_legacy.eo',
'efl_ui_layout_legacy.eo',
@ -705,6 +704,8 @@ elementary_pub_headers = [
'efl_ui_frame_eo.legacy.h',
'efl_ui_frame_legacy_eo.h',
'efl_ui_frame_legacy_eo.legacy.h',
'efl_ui_image_legacy_eo.h',
'efl_ui_image_legacy_eo.legacy.h',
'elm_hoversel_eo.h',
'elm_hoversel_eo.legacy.h',
'elm_hoversel_item_eo.h',