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

efl_ui_video: 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/D8147
This commit is contained in:
Mike Blumenkrantz 2019-03-05 17:00:37 -05:00 committed by Cedric BAIL
parent 054a4d4b17
commit 9ebef14473
11 changed files with 184 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile_Elementary.am
View File

@ -185,7 +185,6 @@ elm_private_eolian_files = \
# Legacy classes - not part of public EO API
elm_legacy_eolian_files = \
lib/elementary/efl_ui_video_legacy.eo \
lib/elementary/efl_ui_win_legacy.eo \
lib/elementary/efl_ui_clock_legacy.eo \
lib/elementary/elm_code_widget_legacy.eo \
@ -329,6 +328,8 @@ lib/elementary/efl_ui_radio_eo.legacy.c \
lib/elementary/efl_ui_radio_legacy_eo.c \
lib/elementary/efl_ui_textpath_eo.legacy.c \
lib/elementary/efl_ui_textpath_legacy_eo.c \
lib/elementary/efl_ui_video_eo.legacy.c \
lib/elementary/efl_ui_video_legacy_eo.c \
lib/elementary/elm_hoversel_eo.c \
lib/elementary/elm_hoversel_eo.legacy.c \
lib/elementary/elm_hoversel_item_eo.c \
@ -368,6 +369,9 @@ lib/elementary/efl_ui_radio_legacy_eo.legacy.h \
lib/elementary/efl_ui_textpath_eo.legacy.h \
lib/elementary/efl_ui_textpath_legacy_eo.h \
lib/elementary/efl_ui_textpath_legacy_eo.legacy.h \
lib/elementary/efl_ui_video_eo.legacy.h \
lib/elementary/efl_ui_video_legacy_eo.h \
lib/elementary/efl_ui_video_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
src/lib/elementary/efl_ui_video.c
View File

@ -421,8 +421,9 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_video, Efl_Ui_Video_Data)
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_video)
#include "efl_ui_video.eo.c"
#include "efl_ui_video_eo.legacy.c"
#include "efl_ui_video_legacy.eo.h"
#include "efl_ui_video_legacy_eo.h"
#define MY_CLASS_NAME_LEGACY "elm_video"
@ -533,4 +534,4 @@ elm_video_pause(Evas_Object *obj)
efl_player_play_set(obj, EINA_FALSE);
}
#include "efl_ui_video_legacy.eo.c"
#include "efl_ui_video_legacy_eo.c"

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

@ -1,7 +1,6 @@
class @beta Efl.Ui.Video extends Efl.Ui.Layout_Base implements Efl.File, Efl.Player, Efl.Access.Widget.Action
{
[[Efl UI video class]]
legacy_prefix: elm_video;
methods {
@property remember_position {
set {

24
src/lib/elementary/efl_ui_video_eo.legacy.c Normal file
View File

@ -0,0 +1,24 @@
EAPI void
elm_video_remember_position_set(Efl_Ui_Video *obj, Eina_Bool remember)
{
efl_ui_video_remember_position_set(obj, remember);
}
EAPI Eina_Bool
elm_video_remember_position_get(const Efl_Ui_Video *obj)
{
return efl_ui_video_remember_position_get(obj);
}
EAPI Efl_Canvas_Object *
elm_video_emotion_get(const Efl_Ui_Video *obj)
{
return efl_ui_video_emotion_get(obj);
}
EAPI const char *
elm_video_title_get(const Efl_Ui_Video *obj)
{
return efl_ui_video_title_get(obj);
}

70
src/lib/elementary/efl_ui_video_eo.legacy.h Normal file
View File

@ -0,0 +1,70 @@
#ifndef _EFL_UI_VIDEO_EO_LEGACY_H_
#define _EFL_UI_VIDEO_EO_LEGACY_H_
#ifndef _EFL_UI_VIDEO_EO_CLASS_TYPE
#define _EFL_UI_VIDEO_EO_CLASS_TYPE
typedef Eo Efl_Ui_Video;
#endif
#ifndef _EFL_UI_VIDEO_EO_TYPES
#define _EFL_UI_VIDEO_EO_TYPES
#endif
/**
* @brief Set whether the object can remember the last played position.
*
* @note This API only serves as indication. System support is required.
*
* @param[in] obj The object.
* @param[in] remember @c true when the object can remember the last position,
* @c false otherwise
*
* @ingroup Elm_Video_Group
*/
EAPI void elm_video_remember_position_set(Efl_Ui_Video *obj, Eina_Bool remember);
/**
* @brief Set whether the object can remember the last played position.
*
* @note This API only serves as indication. System support is required.
*
* @param[in] obj The object.
*
* @return @c true when the object can remember the last position, @c false
* otherwise
*
* @ingroup Elm_Video_Group
*/
EAPI Eina_Bool elm_video_remember_position_get(const Efl_Ui_Video *obj);
/**
* @brief Get the underlying Emotion object.
*
* @param[in] obj The object.
*
* @return The underlying Emotion object.
*
* @ingroup Elm_Video_Group
*/
EAPI Efl_Canvas_Object *elm_video_emotion_get(const Efl_Ui_Video *obj);
/**
* @brief Get the title (for instance DVD title) from this emotion object.
*
* This function is only useful when playing a DVD.
*
* @note Don't change or free the string returned by this function.
*
* @param[in] obj The object.
*
* @return A string containing the title.
*
* @ingroup Elm_Video_Group
*/
EAPI const char *elm_video_title_get(const Efl_Ui_Video *obj);
#endif

9
src/lib/elementary/efl_ui_video_legacy.eo
View File

@ -1,9 +0,0 @@
class @beta Efl.Ui.Video_Legacy extends Efl.Ui.Video implements Efl.Ui.Legacy
{
[[Efl UI video class]]
data: null;
implements {
class.constructor;
Efl.Object.constructor;
}
}

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

@ -169,4 +169,4 @@ EAPI void elm_video_stop(Evas_Object *obj);
*/
EAPI void elm_video_pause(Evas_Object *obj);
#include "efl_ui_video.eo.legacy.h"
#include "efl_ui_video_eo.legacy.h"

35
src/lib/elementary/efl_ui_video_legacy_eo.c Normal file
View File

@ -0,0 +1,35 @@
Efl_Object *_efl_ui_video_legacy_efl_object_constructor(Eo *obj, void *pd);
static Eina_Bool
_efl_ui_video_legacy_class_initializer(Efl_Class *klass)
{
const Efl_Object_Ops *opsp = NULL;
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
#ifndef EFL_UI_VIDEO_LEGACY_EXTRA_OPS
#define EFL_UI_VIDEO_LEGACY_EXTRA_OPS
#endif
EFL_OPS_DEFINE(ops,
EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_video_legacy_efl_object_constructor),
EFL_UI_VIDEO_LEGACY_EXTRA_OPS
);
opsp = &ops;
return efl_class_functions_set(klass, opsp, ropsp);
}
static const Efl_Class_Description _efl_ui_video_legacy_class_desc = {
EO_VERSION,
"Efl.Ui.Video_Legacy",
EFL_CLASS_TYPE_REGULAR,
0,
_efl_ui_video_legacy_class_initializer,
_efl_ui_video_legacy_class_constructor,
NULL
};
EFL_DEFINE_CLASS(efl_ui_video_legacy_class_get, &_efl_ui_video_legacy_class_desc, EFL_UI_VIDEO_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

26
src/lib/elementary/efl_ui_video_legacy_eo.h Normal file
View File

@ -0,0 +1,26 @@
#ifndef _EFL_UI_VIDEO_LEGACY_EO_H_
#define _EFL_UI_VIDEO_LEGACY_EO_H_
#ifndef _EFL_UI_VIDEO_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_VIDEO_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Video_Legacy;
#endif
#ifndef _EFL_UI_VIDEO_LEGACY_EO_TYPES
#define _EFL_UI_VIDEO_LEGACY_EO_TYPES
#endif
#ifdef EFL_BETA_API_SUPPORT
/** Efl UI video class
*
* @ingroup Efl_Ui_Video_Legacy
*/
#define EFL_UI_VIDEO_LEGACY_CLASS efl_ui_video_legacy_class_get()
EWAPI const Efl_Class *efl_ui_video_legacy_class_get(void);
#endif /* EFL_BETA_API_SUPPORT */
#endif

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

@ -0,0 +1,17 @@
#ifndef _EFL_UI_VIDEO_LEGACY_EO_LEGACY_H_
#define _EFL_UI_VIDEO_LEGACY_EO_LEGACY_H_
#ifndef _EFL_UI_VIDEO_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_VIDEO_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Video_Legacy;
#endif
#ifndef _EFL_UI_VIDEO_LEGACY_EO_TYPES
#define _EFL_UI_VIDEO_LEGACY_EO_TYPES
#endif
#endif

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

@ -1,5 +1,4 @@
pub_legacy_eo_files = [
'efl_ui_video_legacy.eo',
'efl_ui_win_legacy.eo',
'efl_ui_clock_legacy.eo',
'elm_code_widget_legacy.eo',
@ -716,6 +715,9 @@ elementary_pub_headers = [
'efl_ui_textpath_eo.legacy.h',
'efl_ui_textpath_legacy_eo.h',
'efl_ui_textpath_legacy_eo.legacy.h',
'efl_ui_video_eo.legacy.h',
'efl_ui_video_legacy_eo.h',
'efl_ui_video_legacy_eo.legacy.h',
'elm_hoversel_eo.h',
'elm_hoversel_eo.legacy.h',
'elm_hoversel_item_eo.h',