diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index f565ed45a6..8b8d60eafb 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -97,12 +97,10 @@ efl_eolian_type_files = \ efl_eolian_files_h = $(efl_eolian_files:%.eo=%.eo.h) \ $(efl_eolian_type_files:%.eot=%.eot.h) efl_eolian_files_c = $(efl_eolian_files:%.eo=%.eo.c) -efl_eolian_legacy_files_h = $(efl_eolian_legacy_files:%.eo=%.eo.legacy.h) BUILT_SOURCES += \ $(efl_eolian_files_c) \ - $(efl_eolian_files_h) \ - $(efl_eolian_legacy_files_h) + $(efl_eolian_files_h) EXTRA_DIST2 += \ lib/efl/Efl_Config.h \ @@ -153,8 +151,7 @@ dist_installed_eflheaders_DATA = \ installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces nodist_installed_eflinterfaces_DATA = \ $(efl_eolian_files_h) \ - lib/efl/interfaces/efl_file.h \ - $(efl_eolian_legacy_files_h) + lib/efl/interfaces/efl_file.h if HAVE_LUA_BINDINGS diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index a398c1109d..5a2904f8f3 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -227,11 +227,6 @@ EAPI Eina_Future *efl_ui_view_factory_create_with_event(Efl_Ui_Factory *factory, #include "interfaces/efl_gfx_types.eot.h" #include "interfaces/efl_ui_types.eot.h" #include "interfaces/efl_input_types.eot.h" -#include "interfaces/efl_gfx_fill.eo.legacy.h" -#include "interfaces/efl_gfx_entity.eo.legacy.h" -#include "interfaces/efl_gfx_image.eo.legacy.h" -#include "interfaces/efl_gfx_frame_controller.eo.legacy.h" -#include "interfaces/efl_input_device.eo.legacy.h" #include "interfaces/efl_text_types.eot.h" #endif diff --git a/src/lib/efl/interfaces/efl_text_annotate.eo b/src/lib/efl/interfaces/efl_text_annotate.eo index 9dc5f6e003..8cf8f15c4d 100644 --- a/src/lib/efl/interfaces/efl_text_annotate.eo +++ b/src/lib/efl/interfaces/efl_text_annotate.eo @@ -19,11 +19,9 @@ interface @beta Efl.Text_Annotate { @since 1.18 ]] set { - legacy: null; return: bool; [[$true on success, $false otherwise.]] } get { - legacy: null; } keys { annotation: ptr(Efl.Text_Annotate_Annotation); [[Given annotation]] @@ -37,7 +35,6 @@ interface @beta Efl.Text_Annotate { @since 1.18 ]] - legacy: null; params { @in start: ptr(const(Efl.Text_Cursor_Cursor)); [[Start of range]] @in end: ptr(const(Efl.Text_Cursor_Cursor)); [[End of range]] @@ -52,7 +49,6 @@ interface @beta Efl.Text_Annotate { @since 1.18 ]] - legacy: null; params { @in start: ptr(Efl.Text_Cursor_Cursor); [[Start of range]] @in end: ptr(Efl.Text_Cursor_Cursor); [[End of range]] @@ -68,7 +64,6 @@ interface @beta Efl.Text_Annotate { @since 1.18 ]] - legacy: null; params { @in annotation: ptr(Efl.Text_Annotate_Annotation); [[Annotation to be removed]] @@ -83,7 +78,6 @@ interface @beta Efl.Text_Annotate { @since 1.18 ]] - legacy: null; params { @in annotation: ptr(const(Efl.Text_Annotate_Annotation)); [[Annotation handle to query]] @@ -103,7 +97,6 @@ interface @beta Efl.Text_Annotate { @since 1.21 ]] - legacy: null; params { annotation: ptr(Efl.Text_Annotate_Annotation); [[Given annotation]] } @@ -116,7 +109,6 @@ interface @beta Efl.Text_Annotate { @since 1.18 ]] - legacy: null; params { @in an: ptr(const(Efl.Text_Annotate_Annotation)); [[Given annotation to query]] @out x: int; [[X coordinate of the annotation]] @@ -130,7 +122,6 @@ interface @beta Efl.Text_Annotate { @property cursor_item_annotation { [[The object-item annotation at the cursor's position.]] get { - legacy: null; } values { annotation: ptr(Efl.Text_Annotate_Annotation); [[Annotation]] @@ -146,7 +137,6 @@ interface @beta Efl.Text_Annotate { which in turn place graphics on top of it. It essentially places an OBJECT REPLACEMENT CHARACTER and set a special annotation to it. ]] - legacy: null; params { cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] @in item: string; [[Item key to be used in higher-up diff --git a/src/lib/efl/interfaces/efl_ui_zoom.eo b/src/lib/efl/interfaces/efl_ui_zoom.eo index c053aec1b4..d42e1ab5e7 100644 --- a/src/lib/efl/interfaces/efl_ui_zoom.eo +++ b/src/lib/efl/interfaces/efl_ui_zoom.eo @@ -1,7 +1,6 @@ enum Efl.Ui.Zoom_Mode { [[Types of zoom available.]] - legacy: efl_ui_zoom_mode; manual = 0, [[Zoom controlled normally by efl_ui_zoom_set]] auto_fit, [[Zoom until photo fits in zoomable object]] auto_fill, [[Zoom until photo fills zoomable object]] diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build index d91ea663c6..1c63bb327d 100644 --- a/src/lib/efl/interfaces/meson.build +++ b/src/lib/efl/interfaces/meson.build @@ -29,16 +29,6 @@ foreach eo_file : pub_legacy_eo_files '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), '-gchd', '@INPUT@']) - pub_eo_file_target += custom_target('eolian_gen_legacy_' + eo_file, - input : eo_file, - output : [eo_file + '.legacy.h'], - depfile : eo_file + '.legacy.d', - install : true, - install_dir : join_paths(dir_package_include, 'interfaces'), - command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, - '-o', 'l:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.h'), - '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.legacy.d'), - '-gld', '@INPUT@']) endforeach pub_eo_files = [