efl_ui_radio: 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/D8145
This commit is contained in:
Mike Blumenkrantz 2019-03-05 17:00:37 -05:00 committed by Cedric BAIL
parent fcb580f1ef
commit a56b786ae1
11 changed files with 217 additions and 18 deletions

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_radio_legacy.eo \
lib/elementary/efl_ui_video_legacy.eo \
lib/elementary/efl_ui_win_legacy.eo \
lib/elementary/efl_ui_clock_legacy.eo \
@ -327,6 +326,8 @@ lib/elementary/efl_ui_layout_legacy_eo.c \
lib/elementary/efl_ui_panes_eo.legacy.c \
lib/elementary/efl_ui_panes_legacy_eo.c \
lib/elementary/efl_ui_progressbar_legacy_eo.c \
lib/elementary/efl_ui_radio_eo.legacy.c \
lib/elementary/efl_ui_radio_legacy_eo.c \
lib/elementary/elm_hoversel_eo.c \
lib/elementary/elm_hoversel_eo.legacy.c \
lib/elementary/elm_hoversel_item_eo.c \
@ -360,6 +361,9 @@ lib/elementary/efl_ui_panes_legacy_eo.h \
lib/elementary/efl_ui_panes_legacy_eo.legacy.h \
lib/elementary/efl_ui_progressbar_legacy_eo.h \
lib/elementary/efl_ui_progressbar_legacy_eo.legacy.h \
lib/elementary/efl_ui_radio_eo.legacy.h \
lib/elementary/efl_ui_radio_legacy_eo.h \
lib/elementary/efl_ui_radio_legacy_eo.legacy.h \
lib/elementary/elm_hoversel_eo.h \
lib/elementary/elm_hoversel_eo.legacy.h \
lib/elementary/elm_hoversel_item_eo.h \

View File

@ -373,8 +373,9 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
#include "efl_ui_radio.eo.c"
#include "efl_ui_radio_eo.legacy.c"
#include "efl_ui_radio_legacy.eo.h"
#include "efl_ui_radio_legacy_eo.h"
#include "efl_ui_radio_legacy_part.eo.h"
#define MY_CLASS_NAME_LEGACY "elm_radio"
@ -494,4 +495,4 @@ elm_radio_value_get(const Evas_Object *obj)
return efl_ui_nstate_value_get(obj);
}
#include "efl_ui_radio_legacy.eo.c"
#include "efl_ui_radio_legacy_eo.c"

View File

@ -1,7 +1,6 @@
class @beta Efl.Ui.Radio extends Efl.Ui.Check implements Efl.Access.Widget.Action, Efl.Content
{
[[Elementary radio class]]
legacy_prefix: elm_radio;
methods {
@property state_value {
set {

View File

@ -0,0 +1,30 @@
EAPI void
elm_radio_state_value_set(Efl_Ui_Radio *obj, int value)
{
efl_ui_radio_state_value_set(obj, value);
}
EAPI int
elm_radio_state_value_get(const Efl_Ui_Radio *obj)
{
return efl_ui_radio_state_value_get(obj);
}
EAPI void
elm_radio_value_pointer_set(Efl_Ui_Radio *obj, int *valuep)
{
efl_ui_radio_value_pointer_set(obj, valuep);
}
EAPI Efl_Canvas_Object *
elm_radio_selected_object_get(const Efl_Ui_Radio *obj)
{
return efl_ui_radio_selected_object_get(obj);
}
EAPI void
elm_radio_group_add(Efl_Ui_Radio *obj, Efl_Ui_Radio *group)
{
efl_ui_radio_group_add(obj, group);
}

View File

@ -0,0 +1,85 @@
#ifndef _EFL_UI_RADIO_EO_LEGACY_H_
#define _EFL_UI_RADIO_EO_LEGACY_H_
#ifndef _EFL_UI_RADIO_EO_CLASS_TYPE
#define _EFL_UI_RADIO_EO_CLASS_TYPE
typedef Eo Efl_Ui_Radio;
#endif
#ifndef _EFL_UI_RADIO_EO_TYPES
#define _EFL_UI_RADIO_EO_TYPES
#endif
/**
* @brief Set the integer value that this radio object represents.
*
* This sets the value of the radio.
*
* @param[in] obj The object.
* @param[in] value The value to use if this radio object is selected.
*
* @ingroup Elm_Radio_Group
*/
EAPI void elm_radio_state_value_set(Efl_Ui_Radio *obj, int value);
/**
* @brief Get the integer value that this radio object represents.
*
* This gets the value of the radio.
*
* @param[in] obj The object.
*
* @return The value to use if this radio object is selected.
*
* @ingroup Elm_Radio_Group
*/
EAPI int elm_radio_state_value_get(const Efl_Ui_Radio *obj);
/**
* @brief Set a convenience pointer to an integer, which changes when radio
* group value changes.
*
* This sets a pointer to an integer that in addition to the radio object state
* will also be modified directly. To stop setting the object pointed to,
* simply use NULL as the valuep argument. If valuep is not NULL then when
* called, the radio object state will also be modified to reflect the value of
* the integer valuep points to, just like calling elm_radio_value_set().
*
* @param[in] obj The object.
* @param[in] valuep Pointer to the integer to modify
*
* @ingroup Elm_Radio_Group
*/
EAPI void elm_radio_value_pointer_set(Efl_Ui_Radio *obj, int *valuep);
/**
* @brief Get the selected radio object.
*
* @param[in] obj The object.
*
* @return The selected radio object
*
* @ingroup Elm_Radio_Group
*/
EAPI Efl_Canvas_Object *elm_radio_selected_object_get(const Efl_Ui_Radio *obj);
/**
* @brief Add this radio to a group of other radio objects
*
* Radio objects work in groups. Each member should have a different integer
* value assigned. In order to have them work as a group, they need to know
* about each other. This adds the given radio object to the group of which the
* group object indicated is a member.
*
* @param[in] obj The object.
* @param[in] group Any radio object whose group the obj is to join.
*
* @ingroup Elm_Radio_Group
*/
EAPI void elm_radio_group_add(Efl_Ui_Radio *obj, Efl_Ui_Radio *group);
#endif

View File

@ -1,12 +0,0 @@
class @beta Efl.Ui.Radio_Legacy extends Efl.Ui.Radio implements Efl.Ui.Legacy
{
[[Elementary radio class]]
data: null;
implements {
class.constructor;
Efl.Object.constructor;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Part.part_get;
}
}

View File

@ -0,0 +1,47 @@
Efl_Object *_efl_ui_radio_legacy_efl_object_constructor(Eo *obj, void *pd);
Eina_Error _efl_ui_radio_legacy_efl_ui_widget_theme_apply(Eo *obj, void *pd);
Eina_Bool _efl_ui_radio_legacy_efl_ui_widget_widget_sub_object_del(Eo *obj, void *pd, Efl_Canvas_Object *sub_obj);
Efl_Object *_efl_ui_radio_legacy_efl_part_part_get(const Eo *obj, void *pd, const char *name);
static Eina_Bool
_efl_ui_radio_legacy_class_initializer(Efl_Class *klass)
{
const Efl_Object_Ops *opsp = NULL;
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
#ifndef EFL_UI_RADIO_LEGACY_EXTRA_OPS
#define EFL_UI_RADIO_LEGACY_EXTRA_OPS
#endif
EFL_OPS_DEFINE(ops,
EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_radio_legacy_efl_object_constructor),
EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _efl_ui_radio_legacy_efl_ui_widget_theme_apply),
EFL_OBJECT_OP_FUNC(efl_ui_widget_sub_object_del, _efl_ui_radio_legacy_efl_ui_widget_widget_sub_object_del),
EFL_OBJECT_OP_FUNC(efl_part_get, _efl_ui_radio_legacy_efl_part_part_get),
EFL_UI_RADIO_LEGACY_EXTRA_OPS
);
opsp = &ops;
return efl_class_functions_set(klass, opsp, ropsp);
}
static const Efl_Class_Description _efl_ui_radio_legacy_class_desc = {
EO_VERSION,
"Efl.Ui.Radio_Legacy",
EFL_CLASS_TYPE_REGULAR,
0,
_efl_ui_radio_legacy_class_initializer,
_efl_ui_radio_legacy_class_constructor,
NULL
};
EFL_DEFINE_CLASS(efl_ui_radio_legacy_class_get, &_efl_ui_radio_legacy_class_desc, EFL_UI_RADIO_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

View File

@ -0,0 +1,26 @@
#ifndef _EFL_UI_RADIO_LEGACY_EO_H_
#define _EFL_UI_RADIO_LEGACY_EO_H_
#ifndef _EFL_UI_RADIO_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_RADIO_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Radio_Legacy;
#endif
#ifndef _EFL_UI_RADIO_LEGACY_EO_TYPES
#define _EFL_UI_RADIO_LEGACY_EO_TYPES
#endif
#ifdef EFL_BETA_API_SUPPORT
/** Elementary radio class
*
* @ingroup Efl_Ui_Radio_Legacy
*/
#define EFL_UI_RADIO_LEGACY_CLASS efl_ui_radio_legacy_class_get()
EWAPI const Efl_Class *efl_ui_radio_legacy_class_get(void);
#endif /* EFL_BETA_API_SUPPORT */
#endif

View File

@ -0,0 +1,17 @@
#ifndef _EFL_UI_RADIO_LEGACY_EO_LEGACY_H_
#define _EFL_UI_RADIO_LEGACY_EO_LEGACY_H_
#ifndef _EFL_UI_RADIO_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_RADIO_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Radio_Legacy;
#endif
#ifndef _EFL_UI_RADIO_LEGACY_EO_TYPES
#define _EFL_UI_RADIO_LEGACY_EO_TYPES
#endif
#endif

View File

@ -31,4 +31,4 @@ EAPI void elm_radio_value_set(Evas_Object *obj, int value)
*/
EAPI int elm_radio_value_get(const Evas_Object *obj);
#include "efl_ui_radio.eo.legacy.h"
#include "efl_ui_radio_eo.legacy.h"

View File

@ -1,5 +1,4 @@
pub_legacy_eo_files = [
'efl_ui_radio_legacy.eo',
'efl_ui_video_legacy.eo',
'efl_ui_win_legacy.eo',
'efl_ui_clock_legacy.eo',
@ -712,6 +711,9 @@ elementary_pub_headers = [
'efl_ui_panes_legacy_eo.legacy.h',
'efl_ui_progressbar_legacy_eo.h',
'efl_ui_progressbar_legacy_eo.legacy.h',
'efl_ui_radio_eo.legacy.h',
'efl_ui_radio_legacy_eo.h',
'efl_ui_radio_legacy_eo.legacy.h',
'elm_hoversel_eo.h',
'elm_hoversel_eo.legacy.h',
'elm_hoversel_item_eo.h',