Eo: get rid of eo_class_do(_super) which we don't need anymore.

We now completely use eo_do(_super), so those are not needed.

diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 55f910e1fa07b25494619d860ada8fffb0181bc5..0e45fd06f68dd0c17e9fd844e36450e168a99d06 100644 (file)
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -604,13 +604,6 @@ EAPI Eina_Bool eo_shutdown(void);
  */
 #define eo_vdo(obj, args) eo_vdo_internal(__FILE__, __LINE__, obj, args)
 
-/**
- * @def eo_class_do
- * A convenience wrapper around eo_class_do_internal()
- * @see eo_class_do_internal
- */
-#define eo_class_do(klass, ...) eo_do(klass, __VA_ARGS__)
-
 /**
  * @brief Calls op functions of an object
  * @param obj The object to work on
@@ -650,19 +643,6 @@ EAPI Eina_Bool eo_vdo_internal(const char *file, int line, const Eo *obj, va_lis
  */
 #define eo_do_super(obj, cur_klass, ...) eo_do_super_internal(__FILE__, __LINE__, obj, cur_klass, __VA_ARGS__)
 
-/**
- * @brief Calls the super function for the specific op.
- * @param klass The klass to work on
- * @param cur_klass The *current* class (use the class *after* this in the MRO).
- * @param ... list of parameters.
- * @return @c EINA_TRUE on success.
- *
- * Unlike eo_class_do(), this function only accepts one op.
- *
- * @see #eo_class_do
- */
-#define eo_class_do_super(klass, cur_klass, ...) eo_do_super(klass, cur_klass, __VA_ARGS__)
-
 /**
  * @brief Calls the super function for the specific op.
  * @param obj The object to work on

diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index 0092655dfa983a63ac6be89e20aeea1384295afd..addf9fdd43ad5b2b42f13061dd342c8d7bb68cf4 100644 (file)
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -43,8 +43,8 @@ _class_print(Eo_Class *klass, void *data EINA_UNUSED, va_list *list)
 {
    (void) list;
    printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
-   fail_if(!eo_class_do_super(klass, MY_CLASS, simple_class_print()));
-   fail_if(!eo_class_do_super(klass, MY_CLASS, simple_class_print2()));
+   fail_if(!eo_do_super(klass, MY_CLASS, simple_class_print()));
+   fail_if(!eo_do_super(klass, MY_CLASS, simple_class_print2()));
 }
 
 static void

diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c
index c93e3130e1d291e381385b34be918f4e42dd609a..4210925dfe744f1d6b43eaf09816a56574ee5948 100644 (file)
--- a/src/tests/eo/function_overrides/function_overrides_main.c
+++ b/src/tests/eo/function_overrides/function_overrides_main.c
@@ -45,13 +45,13 @@ main(int argc, char *argv[])
    fail_if(eo_do(obj, simple_class_print()));
 #endif
 
-   fail_if(!eo_class_do(SIMPLE_CLASS, simple_class_print()));
-   fail_if(!eo_class_do(INHERIT_CLASS, simple_class_print()));
-   fail_if(!eo_class_do(INHERIT2_CLASS, simple_class_print()));
-   fail_if(!eo_class_do(INHERIT3_CLASS, simple_class_print()));
+   fail_if(!eo_do(SIMPLE_CLASS, simple_class_print()));
+   fail_if(!eo_do(INHERIT_CLASS, simple_class_print()));
+   fail_if(!eo_do(INHERIT2_CLASS, simple_class_print()));
+   fail_if(!eo_do(INHERIT3_CLASS, simple_class_print()));
 
 #ifdef EO_DEBUG
-   fail_if(eo_class_do(SIMPLE_CLASS, simple_a_print()));
+   fail_if(eo_do(SIMPLE_CLASS, simple_a_print()));
 #endif
 
    eo_do_super(obj, SIMPLE_CLASS, eo_constructor());

diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index ff1d5b3bc3f7c291345fd5d05b9f01fa0f2d5f9c..afa4fef9fb8354e96ecf8fe87b52a2d2beb8abe8 100644 (file)
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -34,8 +34,8 @@ _class_print(Eo_Class *klass, void *data EINA_UNUSED, va_list *list)
 {
    (void) list;
    printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
-   fail_if(eo_class_do_super(klass, MY_CLASS, simple_class_print()));
-   fail_if(eo_class_do_super(klass, MY_CLASS, simple_class_print2()));
+   fail_if(eo_do_super(klass, MY_CLASS, simple_class_print()));
+   fail_if(eo_do_super(klass, MY_CLASS, simple_class_print2()));
 }
 
 static void

diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 4ed09c96546d8b2a7f477cbad6da36ee4907be73..7c7b78697786a740140405215e95a7a296510de0 100644 (file)
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -133,15 +133,15 @@ main(int argc, char *argv[])
    eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1));
    fail_if(pd->cb_count != 1);
 
-   eo_class_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
+   eo_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
    fail_if(fcount != 0);
 
-   eo_class_do(EO_BASE_CLASS, eo_event_global_freeze());
-   eo_class_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
+   eo_do(EO_BASE_CLASS, eo_event_global_freeze());
+   eo_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
    fail_if(fcount != 1);
 
-   eo_class_do(EO_BASE_CLASS, eo_event_global_freeze());
-   eo_class_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
+   eo_do(EO_BASE_CLASS, eo_event_global_freeze());
+   eo_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
    fail_if(fcount != 2);
 
    eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2));
@@ -149,30 +149,30 @@ main(int argc, char *argv[])
 
    eo_do(obj, simple_a_set(2));
    fail_if(cb_count != 0);
-   eo_class_do(EO_BASE_CLASS, eo_event_global_thaw());
-   eo_class_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
+   eo_do(EO_BASE_CLASS, eo_event_global_thaw());
+   eo_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
    fail_if(fcount != 1);
 
-   eo_class_do(EO_BASE_CLASS, eo_event_global_thaw());
-   eo_class_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
+   eo_do(EO_BASE_CLASS, eo_event_global_thaw());
+   eo_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
    fail_if(fcount != 0);
 
    eo_do(obj, simple_a_set(3));
    fail_if(cb_count != 2);
 
    cb_count = 0;
-   eo_class_do(EO_BASE_CLASS, eo_event_global_thaw());
-   eo_class_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
+   eo_do(EO_BASE_CLASS, eo_event_global_thaw());
+   eo_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
    fail_if(fcount != 0);
 
-   eo_class_do(EO_BASE_CLASS, eo_event_global_freeze());
-   eo_class_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
+   eo_do(EO_BASE_CLASS, eo_event_global_freeze());
+   eo_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
    fail_if(fcount != 1);
 
    eo_do(obj, simple_a_set(2));
    fail_if(cb_count != 0);
-   eo_class_do(EO_BASE_CLASS, eo_event_global_thaw());
-   eo_class_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
+   eo_do(EO_BASE_CLASS, eo_event_global_thaw());
+   eo_do(EO_BASE_CLASS, eo_event_global_freeze_get(&fcount));
    fail_if(fcount != 0);
 
 

diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 74e807bef83f48e201b0be62c031370a53db15d1..ceeed242869dce55e4c1c88149c34df7acee334d 100644 (file)
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -670,9 +670,9 @@ START_TEST(eo_magic_checks)
         fail_if(eo_class_get((Eo *) buf));
         fail_if(eo_class_name_get((Eo_Class*) buf));
         eo_class_funcs_set((Eo_Class *) buf, NULL);
-        eo_class_do((Eo_Class *) buf, NULL);
-        eo_class_do_super((Eo_Class *) buf, SIMPLE_CLASS, EO_NOOP);
-        eo_class_do_super(SIMPLE_CLASS, (Eo_Class *) buf, EO_NOOP);
+        eo_do((Eo_Class *) buf, NULL);
+        eo_do_super((Eo_Class *) buf, SIMPLE_CLASS, EO_NOOP);
+        eo_do_super(SIMPLE_CLASS, (Eo_Class *) buf, EO_NOOP);
 
         fail_if(eo_class_new(NULL, (Eo_Class *) buf), NULL);
 
@@ -791,7 +791,7 @@ START_TEST(eo_multiple_do)
    fail_if(!obj);
 
    fail_if(!eo_do(obj, simple_a_print(), multi_a_print(), multi_a_print()));
-   fail_if(!eo_class_do(klass, simple_class_hi_print(), multi_class_hi_print(), multi_class_hi_print()));
+   fail_if(!eo_do(klass, simple_class_hi_print(), multi_class_hi_print(), multi_class_hi_print()));
 
    eo_unref(obj);