aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-07 14:44:18 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-08 10:27:27 +0100
commit38612b54904e6b8c422e7f1cb21878fa34057c56 (patch)
tree2533c6303ab259b86c66093acf173ce5d92347b2
parentefl_ui_text: s/ELM_SEL_FORMAT_IMAGE/EFL_UI_SELECTION_FORMAT_IMAGE/g (diff)
downloadefl-38612b54904e6b8c422e7f1cb21878fa34057c56.tar.gz
eo: lets drop efl_interfaces
its not required anymore, our wonderfull new syntax solves the original problem it was trying to solve. fixes https://phab.enlightenment.org/T7565 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D7893
-rw-r--r--src/Makefile_Eo.am3
-rw-r--r--src/lib/elementary/efl_ui_legacy.eo2
-rw-r--r--src/lib/elementary/efl_ui_list_view_model.eo2
-rw-r--r--src/lib/elementary/efl_ui_list_view_relayout.eo2
-rw-r--r--src/lib/eo/Eo.h1
-rw-r--r--src/lib/eo/efl_interface.eo7
-rw-r--r--src/lib/eo/eo_class_class.c1
-rw-r--r--src/lib/eo/meson.build3
8 files changed, 5 insertions, 16 deletions
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 5b602af246..423a435470 100644
--- 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 f4cba24d9c..eab362b1f4 100644
--- 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 f01fee8e07..1c99555606 100644
--- 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 26a44c9120..77112450a9 100644
--- 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 d258a47df4..2fd2c1b7e8 100644
--- 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
index f2d6b273b0..0000000000
--- 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 e89b177543..efee21a8f8 100644
--- 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 6647096d6c..e8b32c424c 100644
--- 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 = [