forked from enlightenment/efl
efl_canvas_layout: 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/D8129
This commit is contained in:
parent
dd0890a0d7
commit
1b8487bc99
|
@ -67,9 +67,11 @@ lib/edje/Edje_Common.h \
|
|||
lib/edje/Edje_Eo.h \
|
||||
lib/edje/Edje_Legacy.h \
|
||||
lib/edje/Edje_Edit.h \
|
||||
lib/edje/efl_canvas_layout_eo.legacy.h \
|
||||
lib/edje/efl_layout_group_eo.legacy.h
|
||||
|
||||
EXTRA_DIST2 += \
|
||||
lib/edje/efl_canvas_layout_eo.legacy.c \
|
||||
lib/edje/efl_layout_group_eo.legacy.c
|
||||
|
||||
nodist_installed_edjemainheaders_DATA = \
|
||||
|
|
|
@ -3174,6 +3174,6 @@ typedef Efl_Canvas_Layout_Part_Type Edje_Part_Type;
|
|||
/**
|
||||
* @}
|
||||
*/
|
||||
#include "efl_canvas_layout.eo.legacy.h"
|
||||
#include "efl_canvas_layout_eo.legacy.h"
|
||||
#include "edje_edit.eo.legacy.h"
|
||||
#include "efl_layout_group_eo.legacy.h"
|
||||
|
|
|
@ -587,6 +587,7 @@ _efl_canvas_layout_efl_player_play_speed_get(const Eo *obj EINA_UNUSED, Edje *pd
|
|||
EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_layout_efl_object_dbg_info_get)
|
||||
|
||||
#include "efl_canvas_layout.eo.c"
|
||||
#include "efl_canvas_layout_eo.legacy.c"
|
||||
#include "edje_global.eo.c"
|
||||
#include "efl_layout_calc.eo.c"
|
||||
#include "efl_layout_signal.eo.c"
|
||||
|
|
|
@ -7,7 +7,6 @@ class @beta Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.
|
|||
Efl.Gfx.Size_Class
|
||||
{
|
||||
[[Edje object class]]
|
||||
legacy_prefix: edje_object;
|
||||
event_prefix: efl_layout;
|
||||
data: Edje;
|
||||
methods {
|
||||
|
@ -35,7 +34,6 @@ class @beta Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.
|
|||
|
||||
access_part_iterate @beta {
|
||||
[[Iterates over all accessibility-enabled part names.]]
|
||||
legacy: null;
|
||||
return: iterator<string> @owned; [[Part name iterator]]
|
||||
}
|
||||
@property seat {
|
||||
|
|
|
@ -0,0 +1,36 @@
|
|||
|
||||
EAPI void
|
||||
edje_object_animation_set(Efl_Canvas_Layout *obj, Eina_Bool on)
|
||||
{
|
||||
efl_canvas_layout_animation_set(obj, on);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
edje_object_animation_get(const Efl_Canvas_Layout *obj)
|
||||
{
|
||||
return efl_canvas_layout_animation_get(obj);
|
||||
}
|
||||
|
||||
EAPI Efl_Input_Device *
|
||||
edje_object_seat_get(const Efl_Canvas_Layout *obj, Eina_Stringshare *name)
|
||||
{
|
||||
return efl_canvas_layout_seat_get(obj, name);
|
||||
}
|
||||
|
||||
EAPI Eina_Stringshare *
|
||||
edje_object_seat_name_get(const Efl_Canvas_Layout *obj, Efl_Input_Device *device)
|
||||
{
|
||||
return efl_canvas_layout_seat_name_get(obj, device);
|
||||
}
|
||||
|
||||
EAPI Eina_Error
|
||||
edje_object_layout_load_error_get(const Efl_Canvas_Layout *obj)
|
||||
{
|
||||
return efl_canvas_layout_load_error_get(obj);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
edje_object_content_remove(Efl_Canvas_Layout *obj, Efl_Gfx_Entity *content)
|
||||
{
|
||||
return efl_canvas_layout_content_remove(obj, content);
|
||||
}
|
|
@ -0,0 +1,115 @@
|
|||
#ifndef _EFL_CANVAS_LAYOUT_EO_LEGACY_H_
|
||||
#define _EFL_CANVAS_LAYOUT_EO_LEGACY_H_
|
||||
|
||||
#ifndef _EFL_CANVAS_LAYOUT_EO_CLASS_TYPE
|
||||
#define _EFL_CANVAS_LAYOUT_EO_CLASS_TYPE
|
||||
|
||||
typedef Eo Efl_Canvas_Layout;
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _EFL_CANVAS_LAYOUT_EO_TYPES
|
||||
#define _EFL_CANVAS_LAYOUT_EO_TYPES
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @brief Whether this object is animating or not.
|
||||
*
|
||||
* This property indicates whether animations are stopped or not. Animations
|
||||
* here refer to transitions between states.
|
||||
*
|
||||
* If animations are disabled, transitions between states (as defined in EDC)
|
||||
* are then instantaneous. This is conceptually similar to setting the
|
||||
* @ref Efl.Player.play_speed to an infinitely high value.
|
||||
*
|
||||
* Start or stop animating this object.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] on The animation state, @c true by default.
|
||||
*
|
||||
* @ingroup Edje_Object_Group
|
||||
*/
|
||||
EAPI void edje_object_animation_set(Efl_Canvas_Layout *obj, Eina_Bool on);
|
||||
|
||||
/**
|
||||
* @brief Whether this object is animating or not.
|
||||
*
|
||||
* This property indicates whether animations are stopped or not. Animations
|
||||
* here refer to transitions between states.
|
||||
*
|
||||
* If animations are disabled, transitions between states (as defined in EDC)
|
||||
* are then instantaneous. This is conceptually similar to setting the
|
||||
* @ref Efl.Player.play_speed to an infinitely high value.
|
||||
*
|
||||
* Get the current state of animation, @c true by default.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
*
|
||||
* @return The animation state, @c true by default.
|
||||
*
|
||||
* @ingroup Edje_Object_Group
|
||||
*/
|
||||
EAPI Eina_Bool edje_object_animation_get(const Efl_Canvas_Layout *obj);
|
||||
|
||||
/**
|
||||
* @brief Returns the seat device given its Edje's name.
|
||||
*
|
||||
* Edje references seats by a name that differs from Evas. Edje naming follows
|
||||
* a incrementional convention: first registered name is "seat1", second is
|
||||
* "seat2", differently from Evas.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] name The name's character string.
|
||||
*
|
||||
* @return The seat device or @c null if not found.
|
||||
*
|
||||
* @since 1.19
|
||||
*
|
||||
* @ingroup Edje_Object_Group
|
||||
*/
|
||||
EAPI Efl_Input_Device *edje_object_seat_get(const Efl_Canvas_Layout *obj, Eina_Stringshare *name);
|
||||
|
||||
/**
|
||||
* @brief Gets the name given to a set by Edje.
|
||||
*
|
||||
* Edje references seats by a name that differs from Evas. Edje naming follows
|
||||
* a incrementional convention: first registered name is "seat1", second is
|
||||
* "seat2", differently from Evas.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] device The seat device
|
||||
*
|
||||
* @return The name's character string or @c null if not found.
|
||||
*
|
||||
* @since 1.19
|
||||
*
|
||||
* @ingroup Edje_Object_Group
|
||||
*/
|
||||
EAPI Eina_Stringshare *edje_object_seat_name_get(const Efl_Canvas_Layout *obj, Efl_Input_Device *device);
|
||||
|
||||
/**
|
||||
* @brief Gets the (last) file loading error for a given object.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
*
|
||||
* @return The load error code.
|
||||
*
|
||||
* @ingroup Edje_Object_Group
|
||||
*/
|
||||
EAPI Eina_Error edje_object_layout_load_error_get(const Efl_Canvas_Layout *obj);
|
||||
|
||||
/**
|
||||
* @brief Unswallow an object from this Edje.
|
||||
*
|
||||
* @param[in] obj The object.
|
||||
* @param[in] content To be removed content.
|
||||
*
|
||||
* @return @c false if @c content was not a child or can not be removed.
|
||||
*
|
||||
* @ingroup Edje_Object_Group
|
||||
*/
|
||||
EAPI Eina_Bool edje_object_content_remove(Efl_Canvas_Layout *obj, Efl_Gfx_Entity *content);
|
||||
|
||||
#endif
|
|
@ -106,6 +106,7 @@ edje_header_src = [
|
|||
'Edje_Legacy.h',
|
||||
'Edje_Edit.h',
|
||||
'efl_layout_group_eo.legacy.h',
|
||||
'efl_canvas_layout_eo.legacy.h',
|
||||
]
|
||||
|
||||
edje_src = [
|
||||
|
|
Loading…
Reference in New Issue