elm_box: remove all legacy usage from eo files

this takes the current generated output from eolian for legacy code in
evas 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/D8133
This commit is contained in:
Mike Blumenkrantz 2019-03-05 17:00:37 -05:00 committed by Cedric BAIL
parent b7aff699c1
commit 1cef796c51
10 changed files with 119 additions and 22 deletions

View File

@ -189,7 +189,6 @@ elm_legacy_eolian_files = \
lib/elementary/efl_ui_button_legacy.eo \
lib/elementary/efl_ui_check_legacy.eo \
lib/elementary/efl_ui_radio_legacy.eo \
lib/elementary/efl_ui_bg_legacy.eo \
lib/elementary/efl_ui_video_legacy.eo \
lib/elementary/efl_ui_frame_legacy.eo \
lib/elementary/efl_ui_panes_legacy.eo \
@ -326,14 +325,24 @@ elementaryeolianfiles_DATA = $(elm_public_eolian_files) $(elm_eolian_type_files)
noinst_DATA += $(elm_legacy_eolian_eo_h)
EXTRA_DIST2 += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files) $(elm_private_eolian_files)
elm_legacy_eo_files = \
lib/elementary/efl_ui_bg_legacy_eo.c
elm_legacy_eo_headers = \
lib/elementary/efl_ui_bg_eo.legacy.h \
lib/elementary/efl_ui_bg_legacy_eo.h \
lib/elementary/efl_ui_bg_legacy_eo.legacy.h
EXTRA_DIST2 += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files) $(elm_private_eolian_files) $(elm_legacy_eo_files)
lib_LTLIBRARIES += lib/elementary/libelementary.la
includes_HEADERS = \
lib/elementary/Elementary.h \
lib/elementary/Elementary_Options.h \
lib/elementary/Elementary_Cursor.h
lib/elementary/Elementary_Cursor.h \
$(elm_legacy_eo_headers)
includesdir = $(includedir)/elementary-@VMAJ@
includesunstable_HEADERS = \

View File

@ -292,7 +292,7 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#include "efl_ui_bg.eo.c"
#include "efl_ui_bg_legacy.eo.h"
#include "efl_ui_bg_legacy_eo.h"
#define MY_CLASS_NAME_LEGACY "elm_bg"
@ -320,4 +320,4 @@ elm_bg_add(Evas_Object *parent)
return elm_legacy_add(EFL_UI_BG_LEGACY_CLASS, parent);
}
#include "efl_ui_bg_legacy.eo.c"
#include "efl_ui_bg_legacy_eo.c"

View File

@ -5,7 +5,6 @@ class @beta Efl.Ui.Bg extends Efl.Ui.Layout_Base implements Efl.File, Efl.Gfx.Co
works just like an image, but has some properties useful for backgrounds, such as
setting it to tiled, centered, scaled or stretched.
]]
legacy_prefix: elm_bg;
implements {
Efl.Object.constructor;
Efl.Object.destructor;

View File

@ -0,0 +1,17 @@
#ifndef _EFL_UI_BG_EO_LEGACY_H_
#define _EFL_UI_BG_EO_LEGACY_H_
#ifndef _EFL_UI_BG_EO_CLASS_TYPE
#define _EFL_UI_BG_EO_CLASS_TYPE
typedef Eo Efl_Ui_Bg;
#endif
#ifndef _EFL_UI_BG_EO_TYPES
#define _EFL_UI_BG_EO_TYPES
#endif
#endif

View File

@ -1,14 +0,0 @@
class @beta Efl.Ui.Bg_Legacy extends Efl.Ui.Bg implements Efl.Ui.Legacy
{
[[The bg (background) widget is used for setting (solid) background decorations
for a window (unless it has transparency enabled) or for any container object. It
works just like an image, but has some properties useful for backgrounds, such as
setting it to tiled, centered, scaled or stretched.
]]
data: null;
implements {
class.constructor;
Efl.Object.constructor;
}
}

View File

@ -0,0 +1,35 @@
Efl_Object *_efl_ui_bg_legacy_efl_object_constructor(Eo *obj, void *pd);
static Eina_Bool
_efl_ui_bg_legacy_class_initializer(Efl_Class *klass)
{
const Efl_Object_Ops *opsp = NULL;
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
#ifndef EFL_UI_BG_LEGACY_EXTRA_OPS
#define EFL_UI_BG_LEGACY_EXTRA_OPS
#endif
EFL_OPS_DEFINE(ops,
EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_bg_legacy_efl_object_constructor),
EFL_UI_BG_LEGACY_EXTRA_OPS
);
opsp = &ops;
return efl_class_functions_set(klass, opsp, ropsp);
}
static const Efl_Class_Description _efl_ui_bg_legacy_class_desc = {
EO_VERSION,
"Efl.Ui.Bg_Legacy",
EFL_CLASS_TYPE_REGULAR,
0,
_efl_ui_bg_legacy_class_initializer,
_efl_ui_bg_legacy_class_constructor,
NULL
};
EFL_DEFINE_CLASS(efl_ui_bg_legacy_class_get, &_efl_ui_bg_legacy_class_desc, EFL_UI_BG_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

View File

@ -0,0 +1,32 @@
#ifndef _EFL_UI_BG_LEGACY_EO_H_
#define _EFL_UI_BG_LEGACY_EO_H_
#ifndef _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Bg_Legacy;
#endif
#ifndef _EFL_UI_BG_LEGACY_EO_TYPES
#define _EFL_UI_BG_LEGACY_EO_TYPES
#endif
#ifdef EFL_BETA_API_SUPPORT
/**
* @brief The bg (background) widget is used for setting (solid) background
* decorations
*
* for a window (unless it has transparency enabled) or for any container
* object. It works just like an image, but has some properties useful for
* backgrounds, such as setting it to tiled, centered, scaled or stretched.
*
* @ingroup Efl_Ui_Bg_Legacy
*/
#define EFL_UI_BG_LEGACY_CLASS efl_ui_bg_legacy_class_get()
EWAPI const Efl_Class *efl_ui_bg_legacy_class_get(void);
#endif /* EFL_BETA_API_SUPPORT */
#endif

View File

@ -0,0 +1,17 @@
#ifndef _EFL_UI_BG_LEGACY_EO_LEGACY_H_
#define _EFL_UI_BG_LEGACY_EO_LEGACY_H_
#ifndef _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Bg_Legacy;
#endif
#ifndef _EFL_UI_BG_LEGACY_EO_TYPES
#define _EFL_UI_BG_LEGACY_EO_TYPES
#endif
#endif

View File

@ -165,4 +165,4 @@ EAPI Elm_Bg_Option elm_bg_option_get(const Evas_Object *obj);
*/
EAPI void elm_bg_load_size_set(Evas_Object *obj, int w, int h);
#include "efl_ui_bg.eo.legacy.h"
#include "efl_ui_bg_eo.legacy.h"

View File

@ -2,7 +2,6 @@ pub_legacy_eo_files = [
'efl_ui_button_legacy.eo',
'efl_ui_check_legacy.eo',
'efl_ui_radio_legacy.eo',
'efl_ui_bg_legacy.eo',
'efl_ui_video_legacy.eo',
'efl_ui_frame_legacy.eo',
'efl_ui_panes_legacy.eo',
@ -697,6 +696,9 @@ elementary_pub_headers = [
'elm_win_legacy.h',
'elm_helper.h',
'elm_part_helper.h',
'efl_ui_bg_eo.legacy.h',
'efl_ui_bg_legacy_eo.h',
'efl_ui_bg_legacy_eo.legacy.h',
]
elementary_header_src = [