Revert "Efl: replace eo_data_get for objects data referencing."

This reverts commit 654a3f5f94c2464b8563d27da94a78398c112962.

7 files changed, 13 insertions, 20 deletions

diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 39cc560a5e..a3797f08b4 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -400,7 +400,7 @@ ecore_animator_del(Ecore_Animator *obj)
 
    if (!obj) return NULL;
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   Ecore_Animator_Private_Data *animator = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Animator_Private_Data *animator = eo_data_get(obj, MY_CLASS);
    _ecore_lock();
 
    if (!animator) goto unlock;
@@ -570,7 +570,7 @@ static Eina_Bool
 _ecore_animator_run(void *data)
 {
    Ecore_Animator *obj = data;
-   Ecore_Animator_Private_Data *animator = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Animator_Private_Data *animator = eo_data_get(obj, MY_CLASS);
 
    double pos = 0.0, t;
    Eina_Bool run_ret;
diff --git a/src/lib/ecore/ecore_idle_enterer.c b/src/lib/ecore/ecore_idle_enterer.c
index d5753ae2a5..36ab9a6aca 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -174,7 +174,7 @@ ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
 static void *
 _ecore_idle_enterer_del(Ecore_Idle_Enterer *obj)
 {
-   Ecore_Idle_Enterer_Private_Data *idle_enterer = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Idle_Enterer_Private_Data *idle_enterer = eo_data_get(obj, MY_CLASS);
 
    if (!idle_enterer) return NULL;
    EINA_SAFETY_ON_TRUE_RETURN_VAL(idle_enterer->delete_me, NULL);
diff --git a/src/lib/ecore/ecore_idle_exiter.c b/src/lib/ecore/ecore_idle_exiter.c
index cf76275027..fa93d1ca2e 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -125,7 +125,7 @@ ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
 static void *
 _ecore_idle_exiter_del(Ecore_Idle_Exiter *obj)
 {
-   Ecore_Idle_Exiter_Private_Data *idle_exiter = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Idle_Exiter_Private_Data *idle_exiter = eo_data_get(obj, MY_CLASS);
    EINA_SAFETY_ON_TRUE_RETURN_VAL(idle_exiter->delete_me, NULL);
    idle_exiter->delete_me = 1;
    idle_exiters_delete_me = 1;
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 0495b4edfa..0094e238e6 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -111,7 +111,7 @@ ecore_idler_del(Ecore_Idler *idler)
 static void *
 _ecore_idler_del(Ecore_Idler *obj)
 {
-   Ecore_Idler_Private_Data *idler = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Idler_Private_Data *idler = eo_data_get(obj, MY_CLASS);
    EINA_SAFETY_ON_TRUE_RETURN_VAL(idler->delete_me, NULL);
    idler->delete_me = 1;
    idlers_delete_me = 1;
diff --git a/src/lib/ecore/ecore_job.c b/src/lib/ecore/ecore_job.c
index cfdb1d1891..e057af00e2 100644
--- a/src/lib/ecore/ecore_job.c
+++ b/src/lib/ecore/ecore_job.c
@@ -124,7 +124,7 @@ ecore_job_del(Ecore_Job *obj)
 
    if (!obj) return NULL;
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   Ecore_Job_Private_Data *job = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Job_Private_Data *job = eo_data_get(obj, MY_CLASS);
    data = job->data;
    ecore_event_del(job->event);
    eo_parent_set(obj, NULL);
diff --git a/src/lib/ecore/ecore_poll.c b/src/lib/ecore/ecore_poll.c
index 886e6531cf..9057d992a7 100644
--- a/src/lib/ecore/ecore_poll.c
+++ b/src/lib/ecore/ecore_poll.c
@@ -394,7 +394,7 @@ ecore_poller_del(Ecore_Poller *obj)
 
    if (!obj) return NULL;
    EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
-   Ecore_Poller_Private_Data *poller = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Poller_Private_Data *poller = eo_data_get(obj, MY_CLASS);
    /* we are walking the poller list - a bad idea to remove from it while
     * walking it, so just flag it as delete_me and come back to it after
     * the loop has finished */
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c
index 08396d6ae0..2ecd67af7e 100644
--- a/src/lib/ecore/ecore_timer.c
+++ b/src/lib/ecore/ecore_timer.c
@@ -603,7 +603,7 @@ EAPI void
 _ecore_timer_delay(Ecore_Timer *obj,
                    double       add)
 {
-   Ecore_Timer_Private_Data *timer = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Timer_Private_Data *timer = eo_data_get(obj, MY_CLASS);
 
    if (timer->frozen)
      {
@@ -612,7 +612,6 @@ _ecore_timer_delay(Ecore_Timer *obj,
    else
      {
         timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
-        eo_data_unref(obj, timer);
         _ecore_timer_set(obj, timer->at + add, timer->in, timer->func, timer->data);
      }
 }
@@ -620,13 +619,12 @@ _ecore_timer_delay(Ecore_Timer *obj,
 void *
 _ecore_timer_del(Ecore_Timer *obj)
 {
-   Ecore_Timer_Private_Data *timer = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Timer_Private_Data *timer = eo_data_get(obj, MY_CLASS);
 
    if (timer->frozen && !timer->references)
      {
         void *data = timer->data;
 
-        eo_data_unref(obj, timer);
         suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
 
         if (timer->delete_me)
@@ -670,7 +668,6 @@ _ecore_timer_shutdown(void)
      {
         timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timers));
 
-        eo_data_unref(timer->obj, timer);
         eo_parent_set(timer->obj, NULL);
         if (eo_destructed_is(timer->obj))
           eo_manual_free(timer->obj);
@@ -682,7 +679,6 @@ _ecore_timer_shutdown(void)
      {
         suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(suspended));
 
-        eo_data_unref(timer->obj, timer);
         eo_parent_set(timer->obj, NULL);
         if (eo_destructed_is(timer->obj))
           eo_manual_free(timer->obj);
@@ -714,7 +710,6 @@ _ecore_timer_cleanup(void)
                }
              timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
 
-             eo_data_unref(timer->obj, timer);
              eo_parent_set(timer->obj, NULL);
              if (eo_destructed_is(timer->obj))
                eo_manual_free(timer->obj);
@@ -739,7 +734,6 @@ _ecore_timer_cleanup(void)
                }
              suspended = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(suspended), EINA_INLIST_GET(timer));
 
-             eo_data_unref(timer->obj, timer);
              eo_parent_set(timer->obj, NULL);
              if (eo_destructed_is(timer->obj))
                 eo_manual_free(timer->obj);
@@ -800,7 +794,7 @@ static inline Ecore_Timer *
 _ecore_timer_after_get(Ecore_Timer *obj)
 {
    Ecore_Timer *ret = NULL;
-   Ecore_Timer_Private_Data *base = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Timer_Private_Data *base = eo_data_get(obj, MY_CLASS);
 
    Ecore_Timer_Private_Data *timer = (Ecore_Timer_Private_Data *)EINA_INLIST_GET(base)->next;
    Ecore_Timer_Private_Data *valid_timer = NULL;
@@ -832,7 +826,7 @@ _ecore_timer_next_get(void)
    second_obj = _ecore_timer_after_get(first_obj);
    if (second_obj) first_obj = second_obj;
 
-   first = eo_data_scope_get(first_obj, MY_CLASS);
+   first = eo_data_get(first_obj, MY_CLASS);
 
    now = ecore_loop_time_get();
    in = first->at - now;
@@ -844,11 +838,10 @@ static inline void
 _ecore_timer_reschedule(Ecore_Timer *obj,
                         double       when)
 {
-   Ecore_Timer_Private_Data *timer = eo_data_scope_get(obj, MY_CLASS);
+   Ecore_Timer_Private_Data *timer = eo_data_get(obj, MY_CLASS);
    if ((timer->delete_me) || (timer->frozen)) return;
 
    timers = (Ecore_Timer_Private_Data *)eina_inlist_remove(EINA_INLIST_GET(timers), EINA_INLIST_GET(timer));
-   eo_data_unref(obj, timer);
 
    /* if the timer would have gone off more than 15 seconds ago,
     * assume that the system hung and set the timer to go off
@@ -939,7 +932,7 @@ _ecore_timer_set(Ecore_Timer  *obj,
 {
    Ecore_Timer_Private_Data *t2;
 
-   Ecore_Timer_Private_Data *timer = eo_data_ref(obj, MY_CLASS);
+   Ecore_Timer_Private_Data *timer = eo_data_get(obj, MY_CLASS);
 
    timers_added = 1;
    timer->at = at;