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

elm_atspi_app_object: 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
This commit is contained in:
Jaehyun Cho 2019-03-21 21:06:09 +09:00
parent bb81ccdac1
commit 0225db71c0
9 changed files with 105 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile_Elementary.am
View File

@ -144,7 +144,6 @@ elm_public_eolian_files += \
lib/elementary/elm_multibuttonentry_part.eo \
lib/elementary/elm_interface_scrollable.eo \
lib/elementary/elm_atspi_bridge.eo \
lib/elementary/elm_atspi_app_object.eo \
lib/elementary/efl_ui_image_zoomable_pan.eo \
$(NULL)
@ -256,6 +255,7 @@ lib/elementary/elm_access_eo.c \
lib/elementary/elm_access_eo.legacy.c \
lib/elementary/elm_actionslider_eo.c \
lib/elementary/elm_actionslider_eo.legacy.c \
lib/elementary/elm_atspi_app_object_eo.c \
lib/elementary/elm_box_eo.c \
lib/elementary/elm_box_eo.legacy.c \
lib/elementary/elm_bubble_eo.c \
@ -434,6 +434,7 @@ lib/elementary/efl_ui_win_legacy_eo.legacy.h \
lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h \
lib/elementary/elm_access_eo.legacy.h \
lib/elementary/elm_actionslider_eo.legacy.h \
lib/elementary/elm_atspi_app_object_eo.legacy.h \
lib/elementary/elm_box_eo.legacy.h \
lib/elementary/elm_bubble_eo.legacy.h \
lib/elementary/elm_calendar_eo.legacy.h \
@ -541,6 +542,7 @@ lib/elementary/efl_ui_win_legacy_eo.h \
lib/elementary/efl_ui_win_socket_legacy_eo.h \
lib/elementary/elm_access_eo.h \
lib/elementary/elm_actionslider_eo.h \
lib/elementary/elm_atspi_app_object_eo.h \
lib/elementary/elm_box_eo.h \
lib/elementary/elm_bubble_eo.h \
lib/elementary/elm_calendar_eo.h \

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

@ -70,4 +70,4 @@ _elm_atspi_app_object_efl_access_object_role_get(const Eo *obj EINA_UNUSED, Elm_
return EFL_ACCESS_ROLE_APPLICATION;
}
#include "elm_atspi_app_object.eo.c"
#include "elm_atspi_app_object_eo.c"

12
src/lib/elementary/elm_atspi_app_object.eo
View File

@ -1,12 +0,0 @@
class Elm.Atspi.App.Object extends Efl.Object implements Efl.Access.Object
{
[[AT-SPI application object class]]
data: Elm_Atspi_App_Object_Data;
implements {
Efl.Object.destructor;
Efl.Access.Object.i18n_name { get; }
Efl.Access.Object.description { get; set; }
Efl.Access.Object.role { get; }
Efl.Access.Object.access_children { get; }
}
}

4
src/lib/elementary/elm_atspi_app_object.h
View File

@ -1 +1,3 @@
#include "elm_atspi_app_object.eo.h"
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_atspi_app_object_eo.legacy.h"
#endif

55
src/lib/elementary/elm_atspi_app_object_eo.c Normal file
View File

@ -0,0 +1,55 @@
void _elm_atspi_app_object_efl_object_destructor(Eo *obj, Elm_Atspi_App_Object_Data *pd);
const char *_elm_atspi_app_object_efl_access_object_i18n_name_get(const Eo *obj, Elm_Atspi_App_Object_Data *pd);
void _elm_atspi_app_object_efl_access_object_description_set(Eo *obj, Elm_Atspi_App_Object_Data *pd, const char *description);
const char *_elm_atspi_app_object_efl_access_object_description_get(const Eo *obj, Elm_Atspi_App_Object_Data *pd);
Efl_Access_Role _elm_atspi_app_object_efl_access_object_role_get(const Eo *obj, Elm_Atspi_App_Object_Data *pd);
Eina_List *_elm_atspi_app_object_efl_access_object_access_children_get(const Eo *obj, Elm_Atspi_App_Object_Data *pd);
static Eina_Bool
_elm_atspi_app_object_class_initializer(Efl_Class *klass)
{
const Efl_Object_Ops *opsp = NULL;
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
#ifndef ELM_ATSPI_APP_OBJECT_EXTRA_OPS
#define ELM_ATSPI_APP_OBJECT_EXTRA_OPS
#endif
EFL_OPS_DEFINE(ops,
EFL_OBJECT_OP_FUNC(efl_destructor, _elm_atspi_app_object_efl_object_destructor),
EFL_OBJECT_OP_FUNC(efl_access_object_i18n_name_get, _elm_atspi_app_object_efl_access_object_i18n_name_get),
EFL_OBJECT_OP_FUNC(efl_access_object_description_set, _elm_atspi_app_object_efl_access_object_description_set),
EFL_OBJECT_OP_FUNC(efl_access_object_description_get, _elm_atspi_app_object_efl_access_object_description_get),
EFL_OBJECT_OP_FUNC(efl_access_object_role_get, _elm_atspi_app_object_efl_access_object_role_get),
EFL_OBJECT_OP_FUNC(efl_access_object_access_children_get, _elm_atspi_app_object_efl_access_object_access_children_get),
ELM_ATSPI_APP_OBJECT_EXTRA_OPS
);
opsp = &ops;
return efl_class_functions_set(klass, opsp, ropsp);
}
static const Efl_Class_Description _elm_atspi_app_object_class_desc = {
EO_VERSION,
"Elm.Atspi.App.Object",
EFL_CLASS_TYPE_REGULAR,
sizeof(Elm_Atspi_App_Object_Data),
_elm_atspi_app_object_class_initializer,
NULL,
NULL
};
EFL_DEFINE_CLASS(elm_atspi_app_object_class_get, &_elm_atspi_app_object_class_desc, EFL_OBJECT_CLASS, EFL_ACCESS_OBJECT_MIXIN, NULL);

24
src/lib/elementary/elm_atspi_app_object_eo.h Normal file
View File

@ -0,0 +1,24 @@
#ifndef _ELM_ATSPI_APP_OBJECT_EO_H_
#define _ELM_ATSPI_APP_OBJECT_EO_H_
#ifndef _ELM_ATSPI_APP_OBJECT_EO_CLASS_TYPE
#define _ELM_ATSPI_APP_OBJECT_EO_CLASS_TYPE
typedef Eo Elm_Atspi_App_Object;
#endif
#ifndef _ELM_ATSPI_APP_OBJECT_EO_TYPES
#define _ELM_ATSPI_APP_OBJECT_EO_TYPES
#endif
/** AT-SPI application object class
*
* @ingroup Elm_Atspi_App_Object
*/
#define ELM_ATSPI_APP_OBJECT_CLASS elm_atspi_app_object_class_get()
EWAPI const Efl_Class *elm_atspi_app_object_class_get(void);
#endif

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

@ -0,0 +1,17 @@
#ifndef _ELM_ATSPI_APP_OBJECT_EO_LEGACY_H_
#define _ELM_ATSPI_APP_OBJECT_EO_LEGACY_H_
#ifndef _ELM_ATSPI_APP_OBJECT_EO_CLASS_TYPE
#define _ELM_ATSPI_APP_OBJECT_EO_CLASS_TYPE
typedef Eo Elm_Atspi_App_Object;
#endif
#ifndef _ELM_ATSPI_APP_OBJECT_EO_TYPES
#define _ELM_ATSPI_APP_OBJECT_EO_TYPES
#endif
#endif

1
src/lib/elementary/elm_priv.h
View File

@ -67,6 +67,7 @@
# include "elm_code_private.h"
#include "elm_access_eo.h"
#include "elm_actionslider_eo.h"
#include "elm_atspi_app_object_eo.h"
#include "elm_box_eo.h"
#include "elm_bubble_eo.h"
#include "elm_calendar_eo.h"

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

@ -172,7 +172,6 @@ pub_eo_files = [
'elm_multibuttonentry_part.eo',
'elm_interface_scrollable.eo',
'elm_atspi_bridge.eo',
'elm_atspi_app_object.eo',
'efl_ui_image_zoomable_pan.eo',
'efl_ui_text_part.eo',
'efl_ui_caching_factory.eo',
@ -413,6 +412,7 @@ elementary_pub_headers = [
'elm_actionslider_legacy.h',
'elm_app.h',
'elm_atspi_app_object.h',
'elm_atspi_app_object_eo.legacy.h',
'elm_authors.h',
'elm_bg.h',
'elm_bg_legacy.h',