eo: lets drop efl_interfaces

its not required anymore, our wonderfull new syntax solves the original
problem it was trying to solve.

fixes T7565

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D7893

diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 5b602af..423a435 100644 (file)
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -4,8 +4,7 @@
 eo_eolian_files = \
        lib/eo/efl_object.eo \
        lib/eo/efl_class.eo \
-       lib/eo/efl_object_override.eo \
-       lib/eo/efl_interface.eo
+       lib/eo/efl_object_override.eo
 
 eo_eolian_c = $(eo_eolian_files:%.eo=%.eo.c)
 eo_eolian_h = $(eo_eolian_files:%.eo=%.eo.h)

diff --git a/src/lib/elementary/efl_ui_legacy.eo b/src/lib/elementary/efl_ui_legacy.eo
index f4cba24..eab362b 100644 (file)
--- a/src/lib/elementary/efl_ui_legacy.eo
+++ b/src/lib/elementary/efl_ui_legacy.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.Legacy extends Efl.Interface
+interface Efl.Ui.Legacy
 {
    [[The bg (background) widget is used for setting (solid) background decorations
 

diff --git a/src/lib/elementary/efl_ui_list_view_model.eo b/src/lib/elementary/efl_ui_list_view_model.eo
index f01fee8..1c99555 100644 (file)
--- a/src/lib/elementary/efl_ui_list_view_model.eo
+++ b/src/lib/elementary/efl_ui_list_view_model.eo
@@ -1,6 +1,6 @@
 import efl_ui_list_view_types;
 
-interface Efl.Ui.List_View_Model extends Efl.Interface
+interface Efl.Ui.List_View_Model
 {
    methods {
       @property load_range {

diff --git a/src/lib/elementary/efl_ui_list_view_relayout.eo b/src/lib/elementary/efl_ui_list_view_relayout.eo
index 26a44c9..7711245 100644 (file)
--- a/src/lib/elementary/efl_ui_list_view_relayout.eo
+++ b/src/lib/elementary/efl_ui_list_view_relayout.eo
@@ -1,4 +1,4 @@
-interface Efl.Ui.List_View_Relayout extends Efl.Interface
+interface Efl.Ui.List_View_Relayout
 {
    methods {
       layout_do {

diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index d258a47..2fd2c1b 100644 (file)
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -216,7 +216,6 @@ typedef void (*Efl_Del_Intercept) (Eo *obj_id);
 
 #include "efl_object_override.eo.h"
 #include "efl_object.eo.h"
-#include "efl_interface.eo.h"
 #define EO_CLASS EFL_OBJECT_CLASS
 
 /** An event callback prototype. */

diff --git a/src/lib/eo/efl_interface.eo b/src/lib/eo/efl_interface.eo
deleted file mode 100644 (file)
index f2d6b27..0000000
--- a/src/lib/eo/efl_interface.eo
+++ /dev/null
@@ -1,7 +0,0 @@
-interface Efl.Interface
-{
-   [[An interface for other interfaces to inherit from.
-    This is useful when you want to create interfaces and mixins that expose
-    functions from a normal class such as @Efl.Object.constructor.]]
-}
-

diff --git a/src/lib/eo/eo_class_class.c b/src/lib/eo/eo_class_class.c
index e89b177..efee21a 100644 (file)
--- a/src/lib/eo/eo_class_class.c
+++ b/src/lib/eo/eo_class_class.c
@@ -5,4 +5,3 @@
 #include "Eo.h"
 
 #include "efl_class.eo.c"
-#include "efl_interface.eo.c"

diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build
index 6647096..e8b32c4 100644 (file)
--- a/src/lib/eo/meson.build
+++ b/src/lib/eo/meson.build
@@ -4,8 +4,7 @@ eo_pub_deps = [eina]
 pub_eo_files = [
   'efl_object.eo',
   'efl_class.eo',
-  'efl_object_override.eo',
-  'efl_interface.eo'
+  'efl_object_override.eo'
 ]
 
 eo_src = [