dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efl_ui_win variants: 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/D8149
This commit is contained in:
Mike Blumenkrantz 2019-03-05 17:00:37 -05:00 committed by Cedric BAIL
parent c881b1497f
commit 76c67957b0
17 changed files with 256 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile_Elementary.am
View File

@ -185,11 +185,8 @@ elm_private_eolian_files = \
# Legacy classes - not part of public EO API
elm_legacy_eolian_files = \
lib/elementary/efl_ui_win_legacy.eo \
lib/elementary/efl_ui_clock_legacy.eo \
lib/elementary/elm_code_widget_legacy.eo \
lib/elementary/efl_ui_win_socket_legacy.eo \
lib/elementary/efl_ui_win_inlined_legacy.eo \
lib/elementary/elm_interface_fileselector.eo \
lib/elementary/elm_calendar.eo \
lib/elementary/elm_calendar_item.eo \
@ -331,6 +328,9 @@ 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/efl_ui_widget_eo.legacy.c \
lib/elementary/efl_ui_win_inlined_legacy_eo.c \
lib/elementary/efl_ui_win_legacy_eo.c \
lib/elementary/efl_ui_win_socket_legacy_eo.c \
lib/elementary/elm_hoversel_eo.c \
lib/elementary/elm_hoversel_eo.legacy.c \
lib/elementary/elm_hoversel_item_eo.c \
@ -374,6 +374,12 @@ 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/efl_ui_widget_eo.legacy.h \
lib/elementary/efl_ui_win_inlined_legacy_eo.h \
lib/elementary/efl_ui_win_inlined_legacy_eo.legacy.h \
lib/elementary/efl_ui_win_legacy_eo.h \
lib/elementary/efl_ui_win_legacy_eo.legacy.h \
lib/elementary/efl_ui_win_socket_legacy_eo.h \
lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h \
lib/elementary/elm_hoversel_eo.h \
lib/elementary/elm_hoversel_eo.legacy.h \
lib/elementary/elm_hoversel_item_eo.h \

6
src/lib/elementary/efl_ui_win.c
View File

@ -32,9 +32,9 @@
#include "elm_part_helper.h"
#include "efl_ui_win_part.eo.h"
#include "elm_plug.eo.h"
#include "efl_ui_win_legacy.eo.h"
#include "efl_ui_win_socket_legacy.eo.h"
#include "efl_ui_win_inlined_legacy.eo.h"
#include "efl_ui_win_legacy_eo.h"
#include "efl_ui_win_socket_legacy_eo.h"
#include "efl_ui_win_inlined_legacy_eo.h"
#include "efl_ui_widget_common.h"
#define MY_CLASS EFL_UI_WIN_CLASS

4
src/lib/elementary/efl_ui_win_inlined.c
View File

@ -8,7 +8,7 @@
#include <Elementary.h>
#include "elm_priv.h"
#include "efl_ui_win_inlined_legacy.eo.h"
#include "efl_ui_win_inlined_legacy_eo.h"
#define MY_CLASS EFL_UI_WIN_INLINED_CLASS
#define MY_CLASS_NAME "Efl.Ui.Win_Inlined"
@ -58,4 +58,4 @@ _efl_ui_win_inlined_legacy_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
return obj;
}
#include "efl_ui_win_inlined_legacy.eo.c"
#include "efl_ui_win_inlined_legacy_eo.c"

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

@ -1,9 +0,0 @@
class @beta Efl.Ui.Win_Inlined_Legacy extends Efl.Ui.Win_Inlined implements Efl.Ui.Legacy
{
[[Elementary window inlined class]]
data: null;
implements {
class.constructor;
Efl.Object.finalize;
}
}

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

@ -0,0 +1,35 @@
Efl_Object *_efl_ui_win_inlined_legacy_efl_object_finalize(Eo *obj, void *pd);
static Eina_Bool
_efl_ui_win_inlined_legacy_class_initializer(Efl_Class *klass)
{
const Efl_Object_Ops *opsp = NULL;
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
#ifndef EFL_UI_WIN_INLINED_LEGACY_EXTRA_OPS
#define EFL_UI_WIN_INLINED_LEGACY_EXTRA_OPS
#endif
EFL_OPS_DEFINE(ops,
EFL_OBJECT_OP_FUNC(efl_finalize, _efl_ui_win_inlined_legacy_efl_object_finalize),
EFL_UI_WIN_INLINED_LEGACY_EXTRA_OPS
);
opsp = &ops;
return efl_class_functions_set(klass, opsp, ropsp);
}
static const Efl_Class_Description _efl_ui_win_inlined_legacy_class_desc = {
EO_VERSION,
"Efl.Ui.Win_Inlined_Legacy",
EFL_CLASS_TYPE_REGULAR,
0,
_efl_ui_win_inlined_legacy_class_initializer,
_efl_ui_win_inlined_legacy_class_constructor,
NULL
};
EFL_DEFINE_CLASS(efl_ui_win_inlined_legacy_class_get, &_efl_ui_win_inlined_legacy_class_desc, EFL_UI_WIN_INLINED_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

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

@ -0,0 +1,26 @@
#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_H_
#define _EFL_UI_WIN_INLINED_LEGACY_EO_H_
#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_WIN_INLINED_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Win_Inlined_Legacy;
#endif
#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_TYPES
#define _EFL_UI_WIN_INLINED_LEGACY_EO_TYPES
#endif
#ifdef EFL_BETA_API_SUPPORT
/** Elementary window inlined class
*
* @ingroup Efl_Ui_Win_Inlined_Legacy
*/
#define EFL_UI_WIN_INLINED_LEGACY_CLASS efl_ui_win_inlined_legacy_class_get()
EWAPI const Efl_Class *efl_ui_win_inlined_legacy_class_get(void);
#endif /* EFL_BETA_API_SUPPORT */
#endif

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

@ -0,0 +1,17 @@
#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_LEGACY_H_
#define _EFL_UI_WIN_INLINED_LEGACY_EO_LEGACY_H_
#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_WIN_INLINED_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Win_Inlined_Legacy;
#endif
#ifndef _EFL_UI_WIN_INLINED_LEGACY_EO_TYPES
#define _EFL_UI_WIN_INLINED_LEGACY_EO_TYPES
#endif
#endif

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

@ -1,9 +0,0 @@
class @beta Efl.Ui.Win_Legacy extends Efl.Ui.Win implements Efl.Ui.Legacy
{
[[Efl UI window class]]
data: null;
implements {
class.constructor;
Efl.Object.finalize;
}
}

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

@ -0,0 +1,35 @@
Efl_Object *_efl_ui_win_legacy_efl_object_finalize(Eo *obj, void *pd);
static Eina_Bool
_efl_ui_win_legacy_class_initializer(Efl_Class *klass)
{
const Efl_Object_Ops *opsp = NULL;
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
#ifndef EFL_UI_WIN_LEGACY_EXTRA_OPS
#define EFL_UI_WIN_LEGACY_EXTRA_OPS
#endif
EFL_OPS_DEFINE(ops,
EFL_OBJECT_OP_FUNC(efl_finalize, _efl_ui_win_legacy_efl_object_finalize),
EFL_UI_WIN_LEGACY_EXTRA_OPS
);
opsp = &ops;
return efl_class_functions_set(klass, opsp, ropsp);
}
static const Efl_Class_Description _efl_ui_win_legacy_class_desc = {
EO_VERSION,
"Efl.Ui.Win_Legacy",
EFL_CLASS_TYPE_REGULAR,
0,
_efl_ui_win_legacy_class_initializer,
_efl_ui_win_legacy_class_constructor,
NULL
};
EFL_DEFINE_CLASS(efl_ui_win_legacy_class_get, &_efl_ui_win_legacy_class_desc, EFL_UI_WIN_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

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

@ -0,0 +1,26 @@
#ifndef _EFL_UI_WIN_LEGACY_EO_H_
#define _EFL_UI_WIN_LEGACY_EO_H_
#ifndef _EFL_UI_WIN_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_WIN_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Win_Legacy;
#endif
#ifndef _EFL_UI_WIN_LEGACY_EO_TYPES
#define _EFL_UI_WIN_LEGACY_EO_TYPES
#endif
#ifdef EFL_BETA_API_SUPPORT
/** Efl UI window class
*
* @ingroup Efl_Ui_Win_Legacy
*/
#define EFL_UI_WIN_LEGACY_CLASS efl_ui_win_legacy_class_get()
EWAPI const Efl_Class *efl_ui_win_legacy_class_get(void);
#endif /* EFL_BETA_API_SUPPORT */
#endif

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

@ -0,0 +1,17 @@
#ifndef _EFL_UI_WIN_LEGACY_EO_LEGACY_H_
#define _EFL_UI_WIN_LEGACY_EO_LEGACY_H_
#ifndef _EFL_UI_WIN_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_WIN_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Win_Legacy;
#endif
#ifndef _EFL_UI_WIN_LEGACY_EO_TYPES
#define _EFL_UI_WIN_LEGACY_EO_TYPES
#endif
#endif

4
src/lib/elementary/efl_ui_win_socket.c
View File

@ -8,7 +8,7 @@
#include <Elementary.h>
#include "elm_priv.h"
#include "efl_ui_win_socket_legacy.eo.h"
#include "efl_ui_win_socket_legacy_eo.h"
#define MY_CLASS EFL_UI_WIN_SOCKET_CLASS
#define MY_CLASS_NAME "Efl.Ui.Win_Socket"
@ -52,4 +52,4 @@ _efl_ui_win_socket_legacy_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
return obj;
}
#include "efl_ui_win_socket_legacy.eo.c"
#include "efl_ui_win_socket_legacy_eo.c"

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

@ -1,9 +0,0 @@
class @beta Efl.Ui.Win_Socket_Legacy extends Efl.Ui.Win_Socket implements Efl.Ui.Legacy
{
[[Elementary window socket class]]
data: null;
implements {
class.constructor;
Efl.Object.finalize;
}
}

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

@ -0,0 +1,35 @@
Efl_Object *_efl_ui_win_socket_legacy_efl_object_finalize(Eo *obj, void *pd);
static Eina_Bool
_efl_ui_win_socket_legacy_class_initializer(Efl_Class *klass)
{
const Efl_Object_Ops *opsp = NULL;
const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
#ifndef EFL_UI_WIN_SOCKET_LEGACY_EXTRA_OPS
#define EFL_UI_WIN_SOCKET_LEGACY_EXTRA_OPS
#endif
EFL_OPS_DEFINE(ops,
EFL_OBJECT_OP_FUNC(efl_finalize, _efl_ui_win_socket_legacy_efl_object_finalize),
EFL_UI_WIN_SOCKET_LEGACY_EXTRA_OPS
);
opsp = &ops;
return efl_class_functions_set(klass, opsp, ropsp);
}
static const Efl_Class_Description _efl_ui_win_socket_legacy_class_desc = {
EO_VERSION,
"Efl.Ui.Win_Socket_Legacy",
EFL_CLASS_TYPE_REGULAR,
0,
_efl_ui_win_socket_legacy_class_initializer,
_efl_ui_win_socket_legacy_class_constructor,
NULL
};
EFL_DEFINE_CLASS(efl_ui_win_socket_legacy_class_get, &_efl_ui_win_socket_legacy_class_desc, EFL_UI_WIN_SOCKET_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);

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

@ -0,0 +1,26 @@
#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_H_
#define _EFL_UI_WIN_SOCKET_LEGACY_EO_H_
#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_WIN_SOCKET_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Win_Socket_Legacy;
#endif
#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_TYPES
#define _EFL_UI_WIN_SOCKET_LEGACY_EO_TYPES
#endif
#ifdef EFL_BETA_API_SUPPORT
/** Elementary window socket class
*
* @ingroup Efl_Ui_Win_Socket_Legacy
*/
#define EFL_UI_WIN_SOCKET_LEGACY_CLASS efl_ui_win_socket_legacy_class_get()
EWAPI const Efl_Class *efl_ui_win_socket_legacy_class_get(void);
#endif /* EFL_BETA_API_SUPPORT */
#endif

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

@ -0,0 +1,17 @@
#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_LEGACY_H_
#define _EFL_UI_WIN_SOCKET_LEGACY_EO_LEGACY_H_
#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_CLASS_TYPE
#define _EFL_UI_WIN_SOCKET_LEGACY_EO_CLASS_TYPE
typedef Eo Efl_Ui_Win_Socket_Legacy;
#endif
#ifndef _EFL_UI_WIN_SOCKET_LEGACY_EO_TYPES
#define _EFL_UI_WIN_SOCKET_LEGACY_EO_TYPES
#endif
#endif

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

@ -1,9 +1,6 @@
pub_legacy_eo_files = [
'efl_ui_win_legacy.eo',
'efl_ui_clock_legacy.eo',
'elm_code_widget_legacy.eo',
'efl_ui_win_socket_legacy.eo',
'efl_ui_win_inlined_legacy.eo',
'elm_interface_fileselector.eo',
'elm_calendar.eo',
'elm_calendar_item.eo',
@ -719,6 +716,12 @@ elementary_pub_headers = [
'efl_ui_video_legacy_eo.h',
'efl_ui_video_legacy_eo.legacy.h',
'efl_ui_widget_eo.legacy.h',
'efl_ui_win_inlined_legacy_eo.h',
'efl_ui_win_inlined_legacy_eo.legacy.h',
'efl_ui_win_legacy_eo.h',
'efl_ui_win_legacy_eo.legacy.h',
'efl_ui_win_socket_legacy_eo.h',
'efl_ui_win_socket_legacy_eo.legacy.h',
'elm_hoversel_eo.h',
'elm_hoversel_eo.legacy.h',
'elm_hoversel_item_eo.h',