From a6f126af125741ee5210f5643c23ad5725858da2 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 23 Aug 2016 14:11:38 +0100
Subject: [PATCH] Efl object: Don't pass events to eo class creation.

This was never used and there is no plan to ever use it. I'm going to
soon add a different mechanism with which it will be possible to provide
them again to Eo if ever needed without breaking ABI. Though it's
unlikely it will ever be.
---
 src/benchmarks/eo/class_simple.c                     |  1 -
 src/benchmarks/eo/eo_bench_eo_do.c                   |  1 -
 src/bin/elementary/test_ui_grid.c                    |  2 +-
 src/lib/elementary/efl_ui_grid.c                     |  2 +-
 src/lib/eo/Eo.h                                      |  1 -
 src/tests/eo/access/access_inherit.c                 |  1 -
 src/tests/eo/access/access_simple.c                  |  6 ------
 src/tests/eo/children/children_simple.c              |  1 -
 .../eo/composite_objects/composite_objects_comp.c    |  1 -
 .../eo/composite_objects/composite_objects_simple.c  |  6 ------
 src/tests/eo/constructors/constructors_mixin.c       |  1 -
 src/tests/eo/constructors/constructors_simple.c      |  1 -
 src/tests/eo/constructors/constructors_simple2.c     |  1 -
 src/tests/eo/constructors/constructors_simple3.c     |  1 -
 src/tests/eo/constructors/constructors_simple4.c     |  1 -
 src/tests/eo/constructors/constructors_simple5.c     |  1 -
 src/tests/eo/constructors/constructors_simple6.c     |  1 -
 src/tests/eo/constructors/constructors_simple7.c     |  1 -
 .../function_overrides/function_overrides_inherit.c  |  1 -
 .../function_overrides/function_overrides_inherit2.c |  1 -
 .../function_overrides/function_overrides_inherit3.c |  1 -
 .../function_overrides/function_overrides_simple.c   |  1 -
 src/tests/eo/interface/interface_interface.c         |  1 -
 src/tests/eo/interface/interface_interface2.c        |  1 -
 src/tests/eo/interface/interface_simple.c            |  1 -
 src/tests/eo/mixin/mixin_inherit.c                   |  1 -
 src/tests/eo/mixin/mixin_mixin.c                     |  1 -
 src/tests/eo/mixin/mixin_mixin2.c                    |  1 -
 src/tests/eo/mixin/mixin_mixin3.c                    |  1 -
 src/tests/eo/mixin/mixin_mixin4.c                    |  1 -
 src/tests/eo/mixin/mixin_simple.c                    |  1 -
 src/tests/eo/signals/signals_simple.c                |  8 --------
 src/tests/eo/suite/eo_test_class_behaviour_errors.c  |  2 --
 src/tests/eo/suite/eo_test_class_errors.c            | 12 ------------
 src/tests/eo/suite/eo_test_class_simple.c            |  5 +----
 src/tests/eo/suite/eo_test_class_singleton.c         |  1 -
 src/tests/eo/suite/eo_test_general.c                 |  9 ---------
 src/tests/eo/suite/eo_test_threaded_calls.c          |  1 -
 38 files changed, 3 insertions(+), 78 deletions(-)

diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index b8fd274191..d37e3a11ec 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -40,7 +40,6 @@ static const Efl_Class_Description class_desc = {
      "Simple",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_desc),
-     NULL,
      sizeof(Simple_Public_Data),
      NULL,
      NULL
diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c
index d9279901e1..1f75119633 100644
--- a/src/benchmarks/eo/eo_bench_eo_do.c
+++ b/src/benchmarks/eo/eo_bench_eo_do.c
@@ -70,7 +70,6 @@ bench_eo_do_super(int request)
         "Simple2",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_OPS(op_desc),
-        NULL,
         0,
         NULL,
         NULL
diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index bc5fb95ed3..5f643f31f7 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -25,7 +25,7 @@ static const Efl_Op_Description custom_engine_op_desc[] = {
 
 static const Efl_Class_Description custom_engine_class_desc = {
    EO_VERSION, "Custom Layout Engine", EFL_CLASS_TYPE_INTERFACE,
-   EFL_CLASS_DESCRIPTION_OPS(custom_engine_op_desc), NULL, 0, NULL, NULL
+   EFL_CLASS_DESCRIPTION_OPS(custom_engine_op_desc), 0, NULL, NULL
 };
 
 EFL_DEFINE_CLASS(_test_ui_grid_custom_engine_class_get, &custom_engine_class_desc, EFL_PACK_LAYOUT_INTERFACE, NULL)
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 639395d8f9..c402d365a6 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -171,7 +171,7 @@ static const Efl_Op_Description custom_table_op_desc[] = {
 
 static const Efl_Class_Description custom_table_class_desc = {
    EO_VERSION, "Efl.Ui.Grid.Internal", EFL_CLASS_TYPE_REGULAR,
-   EFL_CLASS_DESCRIPTION_OPS(custom_table_op_desc), NULL,
+   EFL_CLASS_DESCRIPTION_OPS(custom_table_op_desc),
    sizeof(Custom_Table_Data), NULL, NULL
 };
 
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 0911e341cb..5523cd1122 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -411,7 +411,6 @@ struct _Efl_Class_Description
    const char *name; /**< The name of the class. */
    Efl_Class_Type type; /**< The type of the class. */
    Efl_Object_Ops ops;  /**< The ops description, should be filled using #EFL_CLASS_DESCRIPTION_OPS (later sorted by Eo). */
-   const Efl_Event_Description * const *events; /**< The event descriptions for this class. */
    size_t data_size; /**< The size of data (private + protected + public) this class needs per object. */
    void (*class_constructor)(Efl_Class *klass); /**< The constructor of the class. */
    void (*class_destructor)(Efl_Class *klass); /**< The destructor of the class. */
diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c
index 0e5685bb8d..2967f3d66d 100644
--- a/src/tests/eo/access/access_inherit.c
+++ b/src/tests/eo/access/access_inherit.c
@@ -27,7 +27,6 @@ static const Efl_Class_Description class_desc = {
      "Inherit",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index ed0c0195fb..2328120df8 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -36,17 +36,11 @@ static Efl_Op_Description op_descs[] = {
      EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
 };
 
-static const Efl_Event_Description *event_desc[] = {
-     EV_A_CHANGED,
-     NULL
-};
-
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     event_desc,
      sizeof(Private_Data),
      NULL,
      NULL
diff --git a/src/tests/eo/children/children_simple.c b/src/tests/eo/children/children_simple.c
index 853381ffb7..4f4dae975b 100644
--- a/src/tests/eo/children/children_simple.c
+++ b/src/tests/eo/children/children_simple.c
@@ -12,7 +12,6 @@ static const Efl_Class_Description class_desc = {
      "Simple",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_NOOPS(),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index e51bf5db95..d182835638 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -46,7 +46,6 @@ static const Efl_Class_Description class_desc = {
      "Comp",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index 520eaee61b..41f5f1a86f 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -168,17 +168,11 @@ static Efl_Op_Description op_descs[] = {
      EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
 };
 
-static const Efl_Event_Description *event_desc[] = {
-     EV_A_CHANGED,
-     NULL
-};
-
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     event_desc,
      sizeof(Simple_Public_Data),
      NULL,
      NULL
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 417958941e..e193d9e1e9 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -48,7 +48,6 @@ static const Efl_Class_Description class_desc = {
      "Mixin",
      EFL_CLASS_TYPE_MIXIN,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index 6d12ef9fb8..a6c992ad2f 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -100,7 +100,6 @@ static const Efl_Class_Description class_desc = {
      "Simple",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      sizeof(Private_Data),
      _class_constructor,
      _class_destructor
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index a7b7eb986d..9dc68597b9 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -25,7 +25,6 @@ static const Efl_Class_Description class_desc = {
      "Simple2",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index a6e09606d1..528efb2734 100644
--- a/src/tests/eo/constructors/constructors_simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -23,7 +23,6 @@ static const Efl_Class_Description class_desc = {
      "Simple3",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/constructors/constructors_simple4.c b/src/tests/eo/constructors/constructors_simple4.c
index e71cc9b5e5..83e27ce425 100644
--- a/src/tests/eo/constructors/constructors_simple4.c
+++ b/src/tests/eo/constructors/constructors_simple4.c
@@ -14,7 +14,6 @@ static const Efl_Class_Description class_desc = {
      "Simple4",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_NOOPS(),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index b47f05b588..280b335a19 100644
--- a/src/tests/eo/constructors/constructors_simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -23,7 +23,6 @@ static const Efl_Class_Description class_desc = {
      "Simple5",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index 7b41275938..92825d3416 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -23,7 +23,6 @@ static const Efl_Class_Description class_desc = {
      "Simple6",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c
index b01987fd86..c4bfaf6dba 100644
--- a/src/tests/eo/constructors/constructors_simple7.c
+++ b/src/tests/eo/constructors/constructors_simple7.c
@@ -27,7 +27,6 @@ static const Efl_Class_Description class_desc = {
      "Simple7",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit.c b/src/tests/eo/function_overrides/function_overrides_inherit.c
index a473a89f3e..de17dfb2da 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit.c
@@ -13,7 +13,6 @@ static const Efl_Class_Description class_desc = {
      "Inherit",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_NOOPS(),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index 7bae304b4c..c962d8a06f 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -71,7 +71,6 @@ static const Efl_Class_Description class_desc = {
      "Inherit2",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index 2a66926f2d..38dd470342 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -25,7 +25,6 @@ static const Efl_Class_Description class_desc = {
      "Inherit3",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index 45d19d2838..7b3ef7a4d0 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -68,7 +68,6 @@ static const Efl_Class_Description class_desc = {
      "Simple",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      sizeof(Simple_Public_Data),
      NULL,
      NULL
diff --git a/src/tests/eo/interface/interface_interface.c b/src/tests/eo/interface/interface_interface.c
index 9c699ecad0..8358bcc4ad 100644
--- a/src/tests/eo/interface/interface_interface.c
+++ b/src/tests/eo/interface/interface_interface.c
@@ -19,7 +19,6 @@ static const Efl_Class_Description class_desc = {
      "Interface",
      EFL_CLASS_TYPE_INTERFACE,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/interface/interface_interface2.c b/src/tests/eo/interface/interface_interface2.c
index ed0f6c219c..b4c2f9df4c 100644
--- a/src/tests/eo/interface/interface_interface2.c
+++ b/src/tests/eo/interface/interface_interface2.c
@@ -20,7 +20,6 @@ static const Efl_Class_Description class_desc = {
      "Interface2",
      EFL_CLASS_TYPE_INTERFACE,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index f13f1b7a23..a1e03d8d44 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -70,7 +70,6 @@ static const Efl_Class_Description class_desc = {
      "Simple",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      sizeof(Private_Data),
      NULL,
      NULL
diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c
index f363bf7774..afabf6f957 100644
--- a/src/tests/eo/mixin/mixin_inherit.c
+++ b/src/tests/eo/mixin/mixin_inherit.c
@@ -28,7 +28,6 @@ static const Efl_Class_Description class_desc = {
      "Inherit",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index a79c5e5910..4373c5c022 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -43,7 +43,6 @@ static const Efl_Class_Description class_desc = {
      "Mixin",
      EFL_CLASS_TYPE_MIXIN,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index 8c1c60404c..71f6b0b231 100644
--- a/src/tests/eo/mixin/mixin_mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -57,7 +57,6 @@ static const Efl_Class_Description class_desc = {
      "Mixin2",
      EFL_CLASS_TYPE_MIXIN,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      sizeof(Mixin2_Public_Data),
      NULL,
      NULL
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c
index 5a29e9d3ae..d0133722c7 100644
--- a/src/tests/eo/mixin/mixin_mixin3.c
+++ b/src/tests/eo/mixin/mixin_mixin3.c
@@ -56,7 +56,6 @@ static const Efl_Class_Description class_desc = {
      "Mixin3",
      EFL_CLASS_TYPE_MIXIN,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      sizeof(Mixin3_Public_Data),
      NULL,
      NULL
diff --git a/src/tests/eo/mixin/mixin_mixin4.c b/src/tests/eo/mixin/mixin_mixin4.c
index cfe41c0e20..ff2757dc8d 100644
--- a/src/tests/eo/mixin/mixin_mixin4.c
+++ b/src/tests/eo/mixin/mixin_mixin4.c
@@ -16,7 +16,6 @@ static const Efl_Class_Description class_desc = {
      "Mixin4",
      EFL_CLASS_TYPE_MIXIN,
      EFL_CLASS_DESCRIPTION_NOOPS(),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index 8aef3dc4f5..d2f2d41bdd 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -49,7 +49,6 @@ static const Efl_Class_Description class_desc = {
      "Simple",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      sizeof(Private_Data),
      NULL,
      NULL
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 8e07408a23..e8c0ba2e2f 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -76,19 +76,11 @@ static Efl_Op_Description op_descs[] = {
      EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
 };
 
-
-static const Efl_Event_Description *event_desc[] = {
-     EV_A_CHANGED,
-     EV_RESTART,
-     NULL
-};
-
 static const Efl_Class_Description class_desc = {
      EO_VERSION,
      "Simple",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     event_desc,
      sizeof(Private_Data),
      NULL,
      NULL
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
index 043a0a23ea..678cce638d 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -36,7 +36,6 @@ START_TEST(efl_destructor_unref)
         "Simple",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_OPS(op_descs),
-        NULL,
         0,
         NULL,
         NULL
@@ -67,7 +66,6 @@ START_TEST(efl_destructor_double_del)
         "Simple",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         0,
         NULL,
         NULL
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index 400ea544ef..410174bab8 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -26,7 +26,6 @@ START_TEST(eo_inherit_errors)
         "Simple",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         0,
         NULL,
         NULL
@@ -37,7 +36,6 @@ START_TEST(eo_inherit_errors)
         "Mixin",
         EFL_CLASS_TYPE_MIXIN,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         0,
         NULL,
         NULL
@@ -48,7 +46,6 @@ START_TEST(eo_inherit_errors)
         "General",
         EFL_CLASS_TYPE_MIXIN,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         0,
         NULL,
         NULL
@@ -94,7 +91,6 @@ START_TEST(eo_inconsistent_mro)
         "Simple",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         0,
         NULL,
         NULL
@@ -105,7 +101,6 @@ START_TEST(eo_inconsistent_mro)
         "Mixin",
         EFL_CLASS_TYPE_MIXIN,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         0,
         NULL,
         NULL
@@ -116,7 +111,6 @@ START_TEST(eo_inconsistent_mro)
         "Mixin2",
         EFL_CLASS_TYPE_MIXIN,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         0,
         NULL,
         NULL
@@ -127,7 +121,6 @@ START_TEST(eo_inconsistent_mro)
         "Mixin3",
         EFL_CLASS_TYPE_MIXIN,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         0,
         NULL,
         NULL
@@ -173,7 +166,6 @@ START_TEST(eo_bad_interface)
         "Interface",
         EFL_CLASS_TYPE_INTERFACE,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         10,
         NULL,
         NULL
@@ -225,7 +217,6 @@ START_TEST(eo_null_api)
         "Simple",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_OPS(op_descs),
-        NULL,
         0,
         NULL,
         NULL
@@ -257,7 +248,6 @@ START_TEST(eo_wrong_override)
         "Simple",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_OPS(op_descs),
-        NULL,
         0,
         NULL,
         NULL
@@ -290,7 +280,6 @@ START_TEST(eo_api_redefined)
         "Simple",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_OPS(op_descs),
-        NULL,
         0,
         NULL,
         NULL
@@ -323,7 +312,6 @@ START_TEST(eo_dich_func_override)
         "Simple",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_OPS(op_descs),
-        NULL,
         0,
         NULL,
         NULL
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 0971f88966..a68d643fb0 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -104,7 +104,6 @@ static const Efl_Class_Description class_desc = {
      "Simple",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      sizeof(Simple_Public_Data),
      NULL,
      NULL
@@ -130,7 +129,6 @@ static const Efl_Class_Description class_desc2 = {
      "Simple2",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs2),
-     NULL,
      0,
      NULL,
      NULL
@@ -155,10 +153,9 @@ static const Efl_Class_Description class_desc_searchable = {
      "Searchable",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs_searchable),
-     NULL,
      0,
      NULL,
      NULL
 };
 
-EFL_DEFINE_CLASS(searchable_class_get, &class_desc_searchable, EO_CLASS, NULL)
\ No newline at end of file
+EFL_DEFINE_CLASS(searchable_class_get, &class_desc_searchable, EO_CLASS, NULL)
diff --git a/src/tests/eo/suite/eo_test_class_singleton.c b/src/tests/eo/suite/eo_test_class_singleton.c
index b6ed50dca0..b0a2304b40 100644
--- a/src/tests/eo/suite/eo_test_class_singleton.c
+++ b/src/tests/eo/suite/eo_test_class_singleton.c
@@ -34,7 +34,6 @@ static const Efl_Class_Description class_desc = {
      "Singleton",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      0,
      NULL,
      NULL
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index a8f4fd6702..fd16ddbdf0 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -268,7 +268,6 @@ START_TEST(efl_data_fetch)
         "Simple2",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         10,
         NULL,
         NULL
@@ -311,7 +310,6 @@ START_TEST(efl_isa_tests)
              "Iface",
              EFL_CLASS_TYPE_INTERFACE,
              EFL_CLASS_DESCRIPTION_NOOPS(),
-             NULL,
              0,
              NULL,
              NULL
@@ -328,7 +326,6 @@ START_TEST(efl_isa_tests)
              "Mixin",
              EFL_CLASS_TYPE_MIXIN,
              EFL_CLASS_DESCRIPTION_NOOPS(),
-             NULL,
              0,
              NULL,
              NULL
@@ -345,7 +342,6 @@ START_TEST(efl_isa_tests)
              "Simple2",
              EFL_CLASS_TYPE_REGULAR,
              EFL_CLASS_DESCRIPTION_NOOPS(),
-             NULL,
              10,
              NULL,
              NULL
@@ -445,7 +441,6 @@ START_TEST(eo_man_free)
         "Simple2",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_OPS(op_descs),
-        NULL,
         10,
         NULL,
         NULL
@@ -994,7 +989,6 @@ START_TEST(eo_multiple_do)
         "Inherit",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_OPS(_multi_do_op_descs),
-        NULL,
         0,
         NULL,
         NULL
@@ -1070,7 +1064,6 @@ START_TEST(eo_pointers_indirection)
         "Simple",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         0,
         NULL,
         NULL
@@ -1168,7 +1161,6 @@ START_TEST(efl_add_failures)
         "Simple2",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_OPS(_efl_add_failures_op_descs),
-        NULL,
         0,
         NULL,
         NULL
@@ -1206,7 +1198,6 @@ START_TEST(efl_del_intercept)
         "Simple",
         EFL_CLASS_TYPE_REGULAR,
         EFL_CLASS_DESCRIPTION_NOOPS(),
-        NULL,
         0,
         NULL,
         NULL
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index df840974cf..935a3164fc 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -71,7 +71,6 @@ static const Efl_Class_Description class_desc = {
      "Thread Test",
      EFL_CLASS_TYPE_REGULAR,
      EFL_CLASS_DESCRIPTION_OPS(op_descs),
-     NULL,
      sizeof(Thread_Test_Public_Data),
      NULL,
      NULL