elm_code_widget_legacy: 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/D8159
This commit is contained in:
parent
ca9daf94c6
commit
a5b5d6d277
|
@ -186,7 +186,6 @@ elm_private_eolian_files = \
|
|||
# Legacy classes - not part of public EO API
|
||||
elm_legacy_eolian_files = \
|
||||
lib/elementary/efl_ui_clock_legacy.eo \
|
||||
lib/elementary/elm_code_widget_legacy.eo \
|
||||
lib/elementary/elm_interface_fileselector.eo \
|
||||
lib/elementary/elm_colorselector.eo \
|
||||
lib/elementary/elm_conformant.eo \
|
||||
|
@ -338,6 +337,7 @@ lib/elementary/elm_calendar_item_eo.c \
|
|||
lib/elementary/elm_clock_eo.c \
|
||||
lib/elementary/elm_clock_eo.legacy.c \
|
||||
lib/elementary/elm_code_widget_eo.legacy.c \
|
||||
lib/elementary/elm_code_widget_legacy_eo.c \
|
||||
lib/elementary/elm_hoversel_eo.c \
|
||||
lib/elementary/elm_hoversel_item_eo.c \
|
||||
lib/elementary/elm_hoversel_item_eo.legacy.c
|
||||
|
@ -401,6 +401,8 @@ lib/elementary/elm_calendar_item_eo.legacy.h \
|
|||
lib/elementary/elm_clock_eo.h \
|
||||
lib/elementary/elm_clock_eo.legacy.h \
|
||||
lib/elementary/elm_code_widget_eo.legacy.h \
|
||||
lib/elementary/elm_code_widget_legacy_eo.h \
|
||||
lib/elementary/elm_code_widget_legacy_eo.legacy.h \
|
||||
lib/elementary/elm_hoversel_eo.h \
|
||||
lib/elementary/elm_hoversel_eo.legacy.h \
|
||||
lib/elementary/elm_hoversel_item_eo.h \
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include "Elementary.h"
|
||||
|
||||
#include "elm_code_private.h"
|
||||
#include "elm_code_widget_legacy.eo.h"
|
||||
#include "elm_code_widget_legacy_eo.h"
|
||||
|
||||
#define _ELM_CODE_DIFF_WIDGET_LEFT "diffwidgetleft"
|
||||
#define _ELM_CODE_DIFF_WIDGET_RIGHT "diffwidgetright"
|
||||
|
|
|
@ -58,7 +58,7 @@ static Eina_Unicode status_icons[] = {
|
|||
|
||||
static void _elm_code_widget_resize(Elm_Code_Widget *widget, Elm_Code_Line *newline);
|
||||
|
||||
#include "elm_code_widget_legacy.eo.h"
|
||||
#include "elm_code_widget_legacy_eo.h"
|
||||
|
||||
EAPI Evas_Object *
|
||||
elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
|
||||
|
@ -68,7 +68,7 @@ elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
|
|||
efl_ui_code_widget_code_set(efl_added, code));
|
||||
}
|
||||
|
||||
#include "elm_code_widget_legacy.eo.c"
|
||||
#include "elm_code_widget_legacy_eo.c"
|
||||
|
||||
EOLIAN static Eo *
|
||||
_elm_code_widget_efl_object_constructor(Eo *obj, Elm_Code_Widget_Data *pd)
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
class Elm.Code_Widget_Legacy extends Elm.Code_Widget implements Efl.Ui.Legacy
|
||||
{
|
||||
[[Elementary code widget]]
|
||||
data: null;
|
||||
}
|
|
@ -0,0 +1,27 @@
|
|||
|
||||
static Eina_Bool
|
||||
_elm_code_widget_legacy_class_initializer(Efl_Class *klass)
|
||||
{
|
||||
const Efl_Object_Ops *opsp = NULL;
|
||||
|
||||
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
|
||||
|
||||
#ifdef ELM_CODE_WIDGET_LEGACY_EXTRA_OPS
|
||||
EFL_OPS_DEFINE(ops, ELM_CODE_WIDGET_LEGACY_EXTRA_OPS);
|
||||
opsp = &ops;
|
||||
#endif
|
||||
|
||||
return efl_class_functions_set(klass, opsp, ropsp);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description _elm_code_widget_legacy_class_desc = {
|
||||
EO_VERSION,
|
||||
"Elm.Code_Widget_Legacy",
|
||||
EFL_CLASS_TYPE_REGULAR,
|
||||
0,
|
||||
_elm_code_widget_legacy_class_initializer,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
|
||||
EFL_DEFINE_CLASS(elm_code_widget_legacy_class_get, &_elm_code_widget_legacy_class_desc, ELM_CODE_WIDGET_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
|
|
@ -0,0 +1,24 @@
|
|||
#ifndef _ELM_CODE_WIDGET_LEGACY_EO_H_
|
||||
#define _ELM_CODE_WIDGET_LEGACY_EO_H_
|
||||
|
||||
#ifndef _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
|
||||
#define _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
|
||||
|
||||
typedef Eo Elm_Code_Widget_Legacy;
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _ELM_CODE_WIDGET_LEGACY_EO_TYPES
|
||||
#define _ELM_CODE_WIDGET_LEGACY_EO_TYPES
|
||||
|
||||
|
||||
#endif
|
||||
/** Elementary code widget
|
||||
*
|
||||
* @ingroup Elm_Code_Widget_Legacy
|
||||
*/
|
||||
#define ELM_CODE_WIDGET_LEGACY_CLASS elm_code_widget_legacy_class_get()
|
||||
|
||||
EWAPI const Efl_Class *elm_code_widget_legacy_class_get(void);
|
||||
|
||||
#endif
|
|
@ -0,0 +1,17 @@
|
|||
#ifndef _ELM_CODE_WIDGET_LEGACY_EO_LEGACY_H_
|
||||
#define _ELM_CODE_WIDGET_LEGACY_EO_LEGACY_H_
|
||||
|
||||
#ifndef _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
|
||||
#define _ELM_CODE_WIDGET_LEGACY_EO_CLASS_TYPE
|
||||
|
||||
typedef Eo Elm_Code_Widget_Legacy;
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _ELM_CODE_WIDGET_LEGACY_EO_TYPES
|
||||
#define _ELM_CODE_WIDGET_LEGACY_EO_TYPES
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
|
@ -1,6 +1,5 @@
|
|||
pub_legacy_eo_files = [
|
||||
'efl_ui_clock_legacy.eo',
|
||||
'elm_code_widget_legacy.eo',
|
||||
'elm_interface_fileselector.eo',
|
||||
'elm_colorselector.eo',
|
||||
'elm_conformant.eo',
|
||||
|
@ -730,6 +729,8 @@ elementary_pub_headers = [
|
|||
'elm_clock_eo.h',
|
||||
'elm_clock_eo.legacy.h',
|
||||
'elm_code_widget_eo.legacy.h',
|
||||
'elm_code_widget_legacy_eo.h',
|
||||
'elm_code_widget_legacy_eo.legacy.h',
|
||||
'elm_hoversel_eo.h',
|
||||
'elm_hoversel_eo.legacy.h',
|
||||
'elm_hoversel_item_eo.h',
|
||||
|
|
Loading…
Reference in New Issue