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

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

4
src/Makefile_Elementary.am
View File

@ -192,7 +192,6 @@ elm_legacy_eolian_files = \
lib/elementary/efl_ui_win_legacy.eo \
lib/elementary/efl_ui_progressbar_legacy.eo \
lib/elementary/efl_ui_clock_legacy.eo \
lib/elementary/efl_ui_layout_legacy.eo \
lib/elementary/elm_code_widget_legacy.eo \
lib/elementary/efl_ui_win_socket_legacy.eo \
lib/elementary/efl_ui_win_inlined_legacy.eo \
@ -326,6 +325,7 @@ 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/efl_ui_layout_legacy_eo.c \
lib/elementary/elm_hoversel_eo.c \
lib/elementary/elm_hoversel_eo.legacy.c \
lib/elementary/elm_hoversel_item_eo.c \
@ -352,6 +352,8 @@ 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/efl_ui_layout_legacy_eo.h \
lib/elementary/efl_ui_layout_legacy_eo.legacy.h \
lib/elementary/elm_hoversel_eo.h \
lib/elementary/elm_hoversel_eo.legacy.h \
lib/elementary/elm_hoversel_item_eo.h \

4
src/lib/elementary/efl_ui_layout.c
View File

@ -2632,7 +2632,7 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#include "efl_ui_layout_base.eo.c"
#include "efl_ui_layout.eo.c"
#include "efl_ui_layout_legacy.eo.h"
#include "efl_ui_layout_legacy_eo.h"
EOLIAN static Eo *
@ -2950,4 +2950,4 @@ elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, con
return (theme_apply_ret != EFL_UI_THEME_APPLY_ERROR_GENERIC);
}
#include "efl_ui_layout_legacy.eo.c"
#include "efl_ui_layout_legacy_eo.c"

8
src/lib/elementary/efl_ui_layout_legacy.eo
View File

@ -1,8 +0,0 @@
class @beta Efl.Ui.Layout_Legacy extends Efl.Ui.Layout implements Efl.Ui.Legacy
{
[[Elementary layout class]]
data: null;
implements {
Efl.Object.constructor;
}
}

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

@ -0,0 +1,35 @@
Efl_Object *_efl_ui_layout_legacy_efl_object_constructor(Eo *obj, void *pd);
static Eina_Bool
_efl_ui_layout_legacy_class_initializer(Efl_Class *klass)
{
const Efl_Object_Ops *opsp = NULL;
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
#ifndef EFL_UI_LAYOUT_LEGACY_EXTRA_OPS
#define EFL_UI_LAYOUT_LEGACY_EXTRA_OPS
#endif
EFL_OPS_DEFINE(ops,
EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_layout_legacy_efl_object_constructor),
EFL_UI_LAYOUT_LEGACY_EXTRA_OPS
);
opsp = &ops;
return efl_class_functions_set(klass, opsp, ropsp);
}
static const Efl_Class_Description _efl_ui_layout_legacy_class_desc = {
EO_VERSION,
"Efl.Ui.Layout_Legacy",
EFL_CLASS_TYPE_REGULAR,
0,
_efl_ui_layout_legacy_class_initializer,
NULL,
NULL
};
EFL_DEFINE_CLASS(efl_ui_layout_legacy_class_get, &_efl_ui_layout_legacy_class_desc, EFL_UI_LAYOUT_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

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

@ -0,0 +1,26 @@
#ifndef _EFL_UI_LAYOUT_LEGACY_EO_H_
#define _EFL_UI_LAYOUT_LEGACY_EO_H_
#ifndef _EFL_UI_LAYOUT_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_LAYOUT_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Layout_Legacy;
#endif
#ifndef _EFL_UI_LAYOUT_LEGACY_EO_TYPES
#define _EFL_UI_LAYOUT_LEGACY_EO_TYPES
#endif
#ifdef EFL_BETA_API_SUPPORT
/** Elementary layout class
*
* @ingroup Efl_Ui_Layout_Legacy
*/
#define EFL_UI_LAYOUT_LEGACY_CLASS efl_ui_layout_legacy_class_get()
EWAPI const Efl_Class *efl_ui_layout_legacy_class_get(void);
#endif /* EFL_BETA_API_SUPPORT */
#endif

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

@ -0,0 +1,17 @@
#ifndef _EFL_UI_LAYOUT_LEGACY_EO_LEGACY_H_
#define _EFL_UI_LAYOUT_LEGACY_EO_LEGACY_H_
#ifndef _EFL_UI_LAYOUT_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_LAYOUT_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Layout_Legacy;
#endif
#ifndef _EFL_UI_LAYOUT_LEGACY_EO_TYPES
#define _EFL_UI_LAYOUT_LEGACY_EO_TYPES
#endif
#endif

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

@ -5,7 +5,6 @@ pub_legacy_eo_files = [
'efl_ui_win_legacy.eo',
'efl_ui_progressbar_legacy.eo',
'efl_ui_clock_legacy.eo',
'efl_ui_layout_legacy.eo',
'elm_code_widget_legacy.eo',
'efl_ui_win_socket_legacy.eo',
'efl_ui_win_inlined_legacy.eo',
@ -708,6 +707,8 @@ elementary_pub_headers = [
'efl_ui_image_zoomable_eo.legacy.h',
'efl_ui_image_zoomable_legacy_eo.h',
'efl_ui_image_zoomable_legacy_eo.legacy.h',
'efl_ui_layout_legacy_eo.h',
'efl_ui_layout_legacy_eo.legacy.h',
'elm_hoversel_eo.h',
'elm_hoversel_eo.legacy.h',
'elm_hoversel_item_eo.h',