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

elm_button: 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/D8135
This commit is contained in:
Mike Blumenkrantz 2019-03-05 17:00:37 -05:00 committed by Cedric BAIL
parent 1abf1518fe
commit 6e4f6e68b1
11 changed files with 122 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile_Elementary.am
View File

@ -186,7 +186,6 @@ elm_private_eolian_files = \
# Legacy classes - not part of public EO API
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_video_legacy.eo \
@ -325,6 +324,7 @@ noinst_DATA += $(elm_legacy_eolian_eo_h)
elm_legacy_eo_files = \
lib/elementary/efl_ui_bg_legacy_eo.c \
lib/elementary/efl_ui_button_legacy_eo.c \
lib/elementary/elm_hoversel_eo.c \
lib/elementary/elm_hoversel_eo.legacy.c \
lib/elementary/elm_hoversel_item_eo.c \
@ -334,6 +334,9 @@ 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 \
lib/elementary/efl_ui_button_eo.legacy.h \
lib/elementary/efl_ui_button_legacy_eo.h \
lib/elementary/efl_ui_button_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_button.c
View File

@ -410,7 +410,7 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#include "efl_ui_button.eo.c"
#include "efl_ui_button_legacy.eo.h"
#include "efl_ui_button_legacy_eo.h"
#include "efl_ui_button_legacy_part.eo.h"
EOLIAN static Eo *
@ -507,4 +507,4 @@ elm_button_add(Evas_Object *parent)
return elm_legacy_add(EFL_UI_BUTTON_LEGACY_CLASS, parent);
}
#include "efl_ui_button_legacy.eo.c"
#include "efl_ui_button_legacy_eo.c"

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

@ -7,7 +7,6 @@ class @beta Efl.Ui.Button extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable
Press it and run some function. It can contain a simple label and icon
object and it also has an autorepeat feature.
]]
legacy_prefix: elm_button;
implements {
class.constructor;
Efl.Object.constructor;

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

@ -0,0 +1,17 @@
#ifndef _EFL_UI_BUTTON_EO_LEGACY_H_
#define _EFL_UI_BUTTON_EO_LEGACY_H_
#ifndef _EFL_UI_BUTTON_EO_CLASS_TYPE
#define _EFL_UI_BUTTON_EO_CLASS_TYPE
typedef Eo Efl_Ui_Button;
#endif
#ifndef _EFL_UI_BUTTON_EO_TYPES
#define _EFL_UI_BUTTON_EO_TYPES
#endif
#endif

15
src/lib/elementary/efl_ui_button_legacy.eo
View File

@ -1,15 +0,0 @@
class @beta Efl.Ui.Button_Legacy extends Efl.Ui.Button implements Efl.Ui.Legacy
{
[[Push-button widget
Press it and run some function. It can contain a simple label and icon
object and it also has an autorepeat feature.
]]
data: null;
implements {
Efl.Object.constructor;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Part.part_get;
}
}

47
src/lib/elementary/efl_ui_button_legacy_eo.c Normal file
View File

@ -0,0 +1,47 @@
Efl_Object *_efl_ui_button_legacy_efl_object_constructor(Eo *obj, void *pd);
Eina_Error _efl_ui_button_legacy_efl_ui_widget_theme_apply(Eo *obj, void *pd);
Eina_Bool _efl_ui_button_legacy_efl_ui_widget_widget_sub_object_del(Eo *obj, void *pd, Efl_Canvas_Object *sub_obj);
Efl_Object *_efl_ui_button_legacy_efl_part_part_get(const Eo *obj, void *pd, const char *name);
static Eina_Bool
_efl_ui_button_legacy_class_initializer(Efl_Class *klass)
{
const Efl_Object_Ops *opsp = NULL;
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
#ifndef EFL_UI_BUTTON_LEGACY_EXTRA_OPS
#define EFL_UI_BUTTON_LEGACY_EXTRA_OPS
#endif
EFL_OPS_DEFINE(ops,
EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_button_legacy_efl_object_constructor),
EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _efl_ui_button_legacy_efl_ui_widget_theme_apply),
EFL_OBJECT_OP_FUNC(efl_ui_widget_sub_object_del, _efl_ui_button_legacy_efl_ui_widget_widget_sub_object_del),
EFL_OBJECT_OP_FUNC(efl_part_get, _efl_ui_button_legacy_efl_part_part_get),
EFL_UI_BUTTON_LEGACY_EXTRA_OPS
);
opsp = &ops;
return efl_class_functions_set(klass, opsp, ropsp);
}
static const Efl_Class_Description _efl_ui_button_legacy_class_desc = {
EO_VERSION,
"Efl.Ui.Button_Legacy",
EFL_CLASS_TYPE_REGULAR,
0,
_efl_ui_button_legacy_class_initializer,
NULL,
NULL
};
EFL_DEFINE_CLASS(efl_ui_button_legacy_class_get, &_efl_ui_button_legacy_class_desc, EFL_UI_BUTTON_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

30
src/lib/elementary/efl_ui_button_legacy_eo.h Normal file
View File

@ -0,0 +1,30 @@
#ifndef _EFL_UI_BUTTON_LEGACY_EO_H_
#define _EFL_UI_BUTTON_LEGACY_EO_H_
#ifndef _EFL_UI_BUTTON_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_BUTTON_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Button_Legacy;
#endif
#ifndef _EFL_UI_BUTTON_LEGACY_EO_TYPES
#define _EFL_UI_BUTTON_LEGACY_EO_TYPES
#endif
#ifdef EFL_BETA_API_SUPPORT
/**
* @brief Push-button widget
*
* Press it and run some function. It can contain a simple label and icon
* object and it also has an autorepeat feature.
*
* @ingroup Efl_Ui_Button_Legacy
*/
#define EFL_UI_BUTTON_LEGACY_CLASS efl_ui_button_legacy_class_get()
EWAPI const Efl_Class *efl_ui_button_legacy_class_get(void);
#endif /* EFL_BETA_API_SUPPORT */
#endif

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

@ -0,0 +1,17 @@
#ifndef _EFL_UI_BUTTON_LEGACY_EO_LEGACY_H_
#define _EFL_UI_BUTTON_LEGACY_EO_LEGACY_H_
#ifndef _EFL_UI_BUTTON_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_BUTTON_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Button_Legacy;
#endif
#ifndef _EFL_UI_BUTTON_LEGACY_EO_TYPES
#define _EFL_UI_BUTTON_LEGACY_EO_TYPES
#endif
#endif

2
src/lib/elementary/elc_hoversel.c
View File

@ -13,7 +13,7 @@
#include "elm_hoversel_eo.h"
#include "elm_hoversel_item_eo.h"
#include "elm_widget_hoversel.h"
#include "efl_ui_button_legacy.eo.h"
#include "efl_ui_button_legacy_eo.h"
#define MY_CLASS ELM_HOVERSEL_CLASS

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

@ -110,4 +110,4 @@ EAPI void elm_button_autorepeat_set(Evas_Object *obj, Ein
*/
EAPI Eina_Bool elm_button_autorepeat_get(const Evas_Object *obj);
#include "efl_ui_button.eo.legacy.h"
#include "efl_ui_button_eo.legacy.h"

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

@ -1,5 +1,4 @@
pub_legacy_eo_files = [
'efl_ui_button_legacy.eo',
'efl_ui_check_legacy.eo',
'efl_ui_radio_legacy.eo',
'efl_ui_video_legacy.eo',
@ -697,6 +696,9 @@ elementary_pub_headers = [
'efl_ui_bg_eo.legacy.h',
'efl_ui_bg_legacy_eo.h',
'efl_ui_bg_legacy_eo.legacy.h',
'efl_ui_button_eo.legacy.h',
'efl_ui_button_legacy_eo.h',
'efl_ui_button_legacy_eo.legacy.h',
'elm_hoversel_eo.h',
'elm_hoversel_eo.legacy.h',
'elm_hoversel_item_eo.h',