interface: rename Efl.Dup to Efl.Duplicate.

dup is considered too short and maybe confusing,
hence rename it to duplicate instead.

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index d623743..c80d81c 100644 (file)
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -17,7 +17,7 @@ efl_eolian_files = \
       lib/efl/interfaces/efl_canvas_pointer.eo \
       lib/efl/interfaces/efl_config.eo \
       lib/efl/interfaces/efl_control.eo \
-      lib/efl/interfaces/efl_dup.eo \
+      lib/efl/interfaces/efl_duplicate.eo \
       lib/efl/interfaces/efl_file.eo \
       lib/efl/interfaces/efl_image_load.eo \
       lib/efl/interfaces/efl_part.eo \

diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index f8ae9da..38c9441 100644 (file)
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -22,7 +22,7 @@ _pointer_down(void *data, const Efl_Event *ev)
    testdata *td = data;
    td->down = 1;
    efl_unref(td->evdown);
-   td->evdown = efl_dup(ev->info);
+   td->evdown = efl_duplicate(ev->info);
 }
 
 static void
@@ -30,7 +30,7 @@ _pointer_move(void *data, const Efl_Event *ev)
 {
    testdata *td = data;
    efl_unref(td->evmove);
-   td->evmove = efl_dup(ev->info);
+   td->evmove = efl_duplicate(ev->info);
 }
 
 static void
@@ -39,7 +39,7 @@ _pointer_up(void *data, const Efl_Event *ev)
    testdata *td = data;
    td->down = 0;
    efl_unref(td->evup);
-   td->evup = efl_dup(ev->info);
+   td->evup = efl_duplicate(ev->info);
 }
 
 static void
@@ -64,7 +64,7 @@ _key_down(void *data, const Efl_Event *ev)
    if (!efl_input_fake_get(ev->info))
      {
         efl_unref(td->evkeydown);
-        td->evkeydown = efl_dup(ev->info);
+        td->evkeydown = efl_duplicate(ev->info);
      }
 }
 
@@ -89,7 +89,7 @@ _key_up(void *data, const Efl_Event *ev)
    if (!efl_input_fake_get(ev->info))
      {
         efl_unref(td->evkeyup);
-        td->evkeyup = efl_dup(ev->info);
+        td->evkeyup = efl_duplicate(ev->info);
      }
 
    if (td->f) eina_future_cancel(td->f);

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index c2dbee5..64b95ed 100644 (file)
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3151,7 +3151,7 @@ _edje_svg_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3 EINA_U
         dest_root = efl_canvas_vg_root_node_get(ep->object);
         efl_ref(dest_root);
 
-        root = efl_dup(src_root);
+        root = efl_duplicate(src_root);
 
         if (!evas_vg_node_interpolate(root, src_root, dest_root, pos))
           {

diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index e80e5de..b0a258b 100644 (file)
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -76,7 +76,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 /* Interfaces */
 #include "interfaces/efl_config.eo.h"
 #include "interfaces/efl_control.eo.h"
-#include "interfaces/efl_dup.eo.h"
+#include "interfaces/efl_duplicate.eo.h"
 #include "interfaces/efl_file.eo.h"
 #include "interfaces/efl_image.eo.h"
 #include "interfaces/efl_image_animated.eo.h"

diff --git a/src/lib/efl/interfaces/efl_dup.eo b/src/lib/efl/interfaces/efl_duplicate.eo
similarity index 72%
rename from src/lib/efl/interfaces/efl_dup.eo
rename to src/lib/efl/interfaces/efl_duplicate.eo
index 5654983..1b71d80 100644 (file)
--- a/src/lib/efl/interfaces/efl_dup.eo
+++ b/src/lib/efl/interfaces/efl_duplicate.eo
@@ -1,17 +1,17 @@
-interface Efl.Dup
+interface Efl.Duplicate
 {
    [[An interface for duplication of objects.
 
-     Objects implementing this interface can be duplicated with @.dup.
+     Objects implementing this interface can be duplicated with @.duplicate.
    ]]
    methods {
-      dup @const {
+      duplicate @const {
          [[Creates a carbon copy of this object and returns it.
 
            The newly created object will have no event handlers or anything of
            the sort.
          ]]
-         return: Efl.Dup @owned; [[Returned carbon copy]]
+         return: Efl.Duplicate @owned; [[Returned carbon copy]]
       }
    }
 }

diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 930e55e..882990b 100644 (file)
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -6,7 +6,7 @@
 
 #include "interfaces/efl_config.eo.c"
 #include "interfaces/efl_control.eo.c"
-#include "interfaces/efl_dup.eo.c"
+#include "interfaces/efl_duplicate.eo.c"
 #include "interfaces/efl_image.eo.c"
 #include "interfaces/efl_image_animated.eo.c"
 #include "interfaces/efl_image_load.eo.c"

diff --git a/src/lib/evas/canvas/efl_canvas_vg.c b/src/lib/evas/canvas/efl_canvas_vg.c
index 2b16c88..ad8dc66 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_vg.c
+++ b/src/lib/evas/canvas/efl_canvas_vg.c
@@ -496,7 +496,7 @@ _cache_vg_entry_render(Evas_Object_Protected_Data *obj,
    buffer = obj->layer->evas->engine.func->ector_surface_cache_get(engine, root);
    if (!buffer)
      {
-        dupe_root = efl_dup(root);
+        dupe_root = efl_duplicate(root);
         // render to the buffer
         buffer = _render_to_buffer(obj, vd,
                                    engine, surface,

diff --git a/src/lib/evas/canvas/efl_input_event.eo b/src/lib/evas/canvas/efl_input_event.eo
index 45bd937..48bef43 100644 (file)
--- a/src/lib/evas/canvas/efl_input_event.eo
+++ b/src/lib/evas/canvas/efl_input_event.eo
@@ -1,6 +1,6 @@
 import efl_input_types;
 
-mixin Efl.Input.Event (Efl.Interface, Efl.Object, Efl.Dup)
+mixin Efl.Input.Event (Efl.Interface, Efl.Object, Efl.Duplicate)
 {
    [[Represents a generic event data.
 

diff --git a/src/lib/evas/canvas/efl_input_focus.c b/src/lib/evas/canvas/efl_input_focus.c
index e6d273f..abf1c73 100644 (file)
--- a/src/lib/evas/canvas/efl_input_focus.c
+++ b/src/lib/evas/canvas/efl_input_focus.c
@@ -112,7 +112,7 @@ _efl_input_focus_efl_input_event_timestamp_get(Eo *obj EINA_UNUSED,
 }
 
 EOLIAN static Efl_Input_Focus *
-_efl_input_focus_efl_dup_dup(const Eo *obj, Efl_Input_Focus_Data *pd)
+_efl_input_focus_efl_duplicate_duplicate(const Eo *obj, Efl_Input_Focus_Data *pd)
 {
    Efl_Input_Focus_Data *ev;
    Efl_Input_Focus *evt;

diff --git a/src/lib/evas/canvas/efl_input_focus.eo b/src/lib/evas/canvas/efl_input_focus.eo
index 006ab68..fe64752 100644 (file)
--- a/src/lib/evas/canvas/efl_input_focus.eo
+++ b/src/lib/evas/canvas/efl_input_focus.eo
@@ -17,7 +17,7 @@ class Efl.Input.Focus(Efl.Object, Efl.Input.Event)
       Efl.Object.destructor;
       Efl.Input.Event.device { get; set; }
       Efl.Input.Event.reset;
-      Efl.Dup.dup;
+      Efl.Duplicate.duplicate;
          [[Creates a copy of this event. @Efl.Input.Event.fake is $true.
 
            The returned event object is similar to the given object in most

diff --git a/src/lib/evas/canvas/efl_input_hold.c b/src/lib/evas/canvas/efl_input_hold.c
index edb9084..0e23efd 100644 (file)
--- a/src/lib/evas/canvas/efl_input_hold.c
+++ b/src/lib/evas/canvas/efl_input_hold.c
@@ -101,7 +101,7 @@ _efl_input_hold_efl_input_event_reset(Eo *obj, Efl_Input_Hold_Data *pd)
 }
 
 EOLIAN static Efl_Input_Event *
-_efl_input_hold_efl_dup_dup(const Eo *obj, Efl_Input_Hold_Data *pd)
+_efl_input_hold_efl_duplicate_duplicate(const Eo *obj, Efl_Input_Hold_Data *pd)
 {
    Efl_Input_Hold_Data *ev;
    Efl_Input_Hold *evt;

diff --git a/src/lib/evas/canvas/efl_input_hold.eo b/src/lib/evas/canvas/efl_input_hold.eo
index 8deb3bc..7e83917 100644 (file)
--- a/src/lib/evas/canvas/efl_input_hold.eo
+++ b/src/lib/evas/canvas/efl_input_hold.eo
@@ -13,7 +13,7 @@ class Efl.Input.Hold (Efl.Object, Efl.Input.Event)
       Efl.Object.constructor;
       Efl.Object.destructor;
       Efl.Input.Event.reset;
-      Efl.Dup.dup;
+      Efl.Duplicate.duplicate;
          [[Creates a copy of this event. @Efl.Input.Event.fake is $true.
 
            The returned event object is similar to the given object in most

diff --git a/src/lib/evas/canvas/efl_input_key.c b/src/lib/evas/canvas/efl_input_key.c
index f417da6..c6b8061 100644 (file)
--- a/src/lib/evas/canvas/efl_input_key.c
+++ b/src/lib/evas/canvas/efl_input_key.c
@@ -188,7 +188,7 @@ _efl_input_key_efl_input_event_reset(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd
 }
 
 EOLIAN static Efl_Input_Event *
-_efl_input_key_efl_dup_dup(const Eo *obj, Efl_Input_Key_Data *pd)
+_efl_input_key_efl_duplicate_duplicate(const Eo *obj, Efl_Input_Key_Data *pd)
 {
    Efl_Input_Key_Data *ev;
    Efl_Input_Key *evt;

diff --git a/src/lib/evas/canvas/efl_input_key.eo b/src/lib/evas/canvas/efl_input_key.eo
index 09938b8..45fe094 100644 (file)
--- a/src/lib/evas/canvas/efl_input_key.eo
+++ b/src/lib/evas/canvas/efl_input_key.eo
@@ -56,7 +56,7 @@ class Efl.Input.Key (Efl.Object, Efl.Input.Event, Efl.Input.State, Efl.Input.Eve
       Efl.Object.constructor;
       Efl.Object.destructor;
       Efl.Input.Event.reset;
-      Efl.Dup.dup;
+      Efl.Duplicate.duplicate;
          [[Creates a copy of this event. @Efl.Input.Event.fake is $true.
 
            The returned event object is similar to the given object in most

diff --git a/src/lib/evas/canvas/efl_input_pointer.c b/src/lib/evas/canvas/efl_input_pointer.c
index fd84f9b..282ffea 100644 (file)
--- a/src/lib/evas/canvas/efl_input_pointer.c
+++ b/src/lib/evas/canvas/efl_input_pointer.c
@@ -143,7 +143,7 @@ _efl_input_pointer_efl_input_event_reset(Eo *obj, Efl_Input_Pointer_Data *pd)
 }
 
 EOLIAN static Efl_Input_Event *
-_efl_input_pointer_efl_dup_dup(const Eo *obj, Efl_Input_Pointer_Data *pd)
+_efl_input_pointer_efl_duplicate_duplicate(const Eo *obj, Efl_Input_Pointer_Data *pd)
 {
    Efl_Input_Pointer_Data *ev;
    Efl_Input_Focus *evt;

diff --git a/src/lib/evas/canvas/efl_input_pointer.eo b/src/lib/evas/canvas/efl_input_pointer.eo
index 878e27f..e233ce4 100644 (file)
--- a/src/lib/evas/canvas/efl_input_pointer.eo
+++ b/src/lib/evas/canvas/efl_input_pointer.eo
@@ -161,7 +161,7 @@ class Efl.Input.Pointer (Efl.Object, Efl.Input.Event, Efl.Input.State)
       Efl.Object.destructor;
       class.destructor;
       Efl.Input.Event.reset;
-      Efl.Dup.dup;
+      Efl.Duplicate.duplicate;
          [[Creates a copy of this event. @Efl.Input.Event.fake is $true.
 
            The returned event object is similar to the given object in most

diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo
index 2457c0e..54ed2d9 100644 (file)
--- a/src/lib/evas/canvas/efl_vg.eo
+++ b/src/lib/evas/canvas/efl_vg.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Dup)
+abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Duplicate)
 {
    [[Efl vector graphics abstract class]]
    eo_prefix: efl_vg;
@@ -119,6 +119,6 @@ abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Dup)
       Efl.Gfx.Stack.stack_above;
       Efl.Gfx.Stack.raise;
       Efl.Gfx.Stack.lower;
-      Efl.Dup.dup;
+      Efl.Duplicate.duplicate;
    }
 }

diff --git a/src/lib/evas/canvas/efl_vg_container.eo b/src/lib/evas/canvas/efl_vg_container.eo
index fbf4add..4913e78 100644 (file)
--- a/src/lib/evas/canvas/efl_vg_container.eo
+++ b/src/lib/evas/canvas/efl_vg_container.eo
@@ -20,6 +20,6 @@ class Efl.VG.Container (Efl.VG)
       Efl.Object.destructor;
       Efl.VG.bounds_get;
       Efl.VG.interpolate;
-      Efl.Dup.dup;
+      Efl.Duplicate.duplicate;
    }
 }

diff --git a/src/lib/evas/canvas/efl_vg_gradient.eo b/src/lib/evas/canvas/efl_vg_gradient.eo
index c604568..53ec941 100644 (file)
--- a/src/lib/evas/canvas/efl_vg_gradient.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient.eo
@@ -6,6 +6,6 @@ abstract Efl.VG.Gradient (Efl.VG, Efl.Gfx.Gradient)
       Efl.Gfx.Gradient.stop { get; set; }
       Efl.Gfx.Gradient.spread { get; set; }
       Efl.VG.interpolate;
-      Efl.Dup.dup;
+      Efl.Duplicate.duplicate;
    }
 }

diff --git a/src/lib/evas/canvas/efl_vg_gradient_linear.eo b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
index 4f9ea61..3048e17 100644 (file)
--- a/src/lib/evas/canvas/efl_vg_gradient_linear.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
@@ -7,7 +7,7 @@ class Efl.VG.Gradient.Linear (Efl.VG.Gradient, Efl.Gfx.Gradient.Linear)
       Efl.Gfx.Gradient.Linear.end { get; set; }
       Efl.VG.bounds_get;
       Efl.VG.interpolate;
-      Efl.Dup.dup;
+      Efl.Duplicate.duplicate;
       Efl.Object.constructor;
       Efl.Object.destructor;
    }

diff --git a/src/lib/evas/canvas/efl_vg_gradient_radial.eo b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
index 3e3f74f..efc75be 100644 (file)
--- a/src/lib/evas/canvas/efl_vg_gradient_radial.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
@@ -8,7 +8,7 @@ class Efl.VG.Gradient.Radial (Efl.VG.Gradient, Efl.Gfx.Gradient.Radial)
       Efl.Gfx.Gradient.Radial.focal { get; set; }
       Efl.VG.bounds_get;
       Efl.VG.interpolate;
-      Efl.Dup.dup;
+      Efl.Duplicate.duplicate;
       Efl.Object.constructor;
       Efl.Object.destructor;
    }

diff --git a/src/lib/evas/canvas/efl_vg_shape.eo b/src/lib/evas/canvas/efl_vg_shape.eo
index a250398..6dc846b 100644 (file)
--- a/src/lib/evas/canvas/efl_vg_shape.eo
+++ b/src/lib/evas/canvas/efl_vg_shape.eo
@@ -37,7 +37,7 @@ class Efl.VG.Shape (Efl.VG, Efl.Gfx.Shape)
    implements {
       Efl.VG.bounds_get;
       Efl.VG.interpolate;
-      Efl.Dup.dup;
+      Efl.Duplicate.duplicate;
       Efl.Object.constructor;
       Efl.Object.destructor;
    }

diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index ab204ac..23eb01d 100644 (file)
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -475,7 +475,7 @@ _evas_device_cleanup(Evas *eo_e)
    /* If the device is deleted, _del_cb will remove the device
     * from the devices list. Ensure we delete them only once, and only if this
     * Evas is the owner, otherwise we would kill external references (eg.
-    * from efl_dup()). */
+    * from efl_duplicate()). */
 again:
    e->devices_modified = EINA_FALSE;
    cpy = eina_list_clone(e->devices);

diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 3448ec2..148ac17 100644 (file)
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -465,7 +465,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
 
    if (obj->delete_me || src->delete_me || e->is_frozen) return;
 
-   evt = efl_dup(parent_ev);
+   evt = efl_duplicate(parent_ev);
    ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
    if (!ev) return;
 
@@ -574,7 +574,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
 
    if (obj->delete_me || src->delete_me || e->is_frozen) return;
 
-   evt = efl_dup(parent_ev);
+   evt = efl_duplicate(parent_ev);
    ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
    if (!ev) return;
 
@@ -787,7 +787,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
 
    if (obj->delete_me || src->delete_me || e->is_frozen) return;
 
-   evt = efl_dup(parent_ev);
+   evt = efl_duplicate(parent_ev);
    ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
    if (!ev) return;
 
@@ -877,7 +877,7 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e,
 
    if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return;
 
-   evt = efl_dup(parent_ev);
+   evt = efl_duplicate(parent_ev);
    ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
    if (!ev) return;
 
@@ -936,7 +936,7 @@ _evas_event_source_multi_down_events(Evas_Object_Protected_Data *obj, Evas_Publi
 
    if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return;
 
-   evt = efl_dup(parent_ev);
+   evt = efl_duplicate(parent_ev);
    ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
    if (!ev) return;
 
@@ -1002,7 +1002,7 @@ _evas_event_source_multi_up_events(Evas_Object_Protected_Data *obj, Evas_Public_
 
    if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return;
 
-   evt = efl_dup(parent_ev);
+   evt = efl_duplicate(parent_ev);
    ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
    if (!ev) return;
 
@@ -1062,7 +1062,7 @@ _evas_event_source_multi_move_events(Evas_Object_Protected_Data *obj, Evas_Publi
 
    if (obj->delete_me || src->delete_me || e->is_frozen) return;
 
-   evt = efl_dup(parent_ev);
+   evt = efl_duplicate(parent_ev);
    ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
    if (!ev) return;
 
@@ -1176,7 +1176,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e,
    Evas_Pointer_Data *pdata;
 
    if (obj->delete_me || src->delete_me || e->is_frozen) return;
-   evt = efl_dup(parent_ev);
+   evt = efl_duplicate(parent_ev);
 
    ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
    if (!ev) return;
@@ -1267,7 +1267,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e,
 
    if (obj->delete_me || src->delete_me || e->is_frozen) return;
 
-   evt = efl_dup(parent_ev);
+   evt = efl_duplicate(parent_ev);
    ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
    if (!ev) return;
 
@@ -1594,7 +1594,7 @@ _post_up_handle(Evas_Public_Data *e, Efl_Input_Pointer *parent_ev,
    int event_id;
 
    /* Duplicating UP event */
-   evt = efl_dup(parent_ev);
+   evt = efl_duplicate(parent_ev);
    ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
    if (!ev) return;
 
@@ -1982,7 +1982,7 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, Efl_Input_Pointer_Data *pe)
 
    event_id = _evas_object_event_new();
 
-   evt = efl_dup(pe->eo);
+   evt = efl_duplicate(pe->eo);
    ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
    if (!ev) return;
 

diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c
index 907d428..5ddad99 100644 (file)
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -152,17 +152,17 @@ _efl_vg_container_efl_vg_interpolate(Eo *obj,
 }
 
 EOLIAN static Efl_VG *
-_efl_vg_container_efl_dup_dup(const Eo *obj, Efl_VG_Container_Data *pd)
+_efl_vg_container_efl_duplicate_duplicate(const Eo *obj, Efl_VG_Container_Data *pd)
 {
    Eina_List *l;
    Efl_VG *child;
    Efl_VG *cn = NULL;
 
-   cn = efl_dup(efl_super(obj, MY_CLASS));
+   cn = efl_duplicate(efl_super(obj, MY_CLASS));
    EINA_LIST_FOREACH(pd->children, l, child)
      {
         // parent_set adds the new node to the list of children of cn
-        efl_parent_set(efl_dup(child), cn);
+        efl_parent_set(efl_duplicate(child), cn);
      }
    return cn;
 }

diff --git a/src/lib/evas/canvas/evas_vg_gradient.c b/src/lib/evas/canvas/evas_vg_gradient.c
index 10db4e3..af4014c 100644 (file)
--- a/src/lib/evas/canvas/evas_vg_gradient.c
+++ b/src/lib/evas/canvas/evas_vg_gradient.c
@@ -97,12 +97,12 @@ _efl_vg_gradient_efl_vg_interpolate(Eo *obj,
 }
 
 EOLIAN static Efl_VG *
-_efl_vg_gradient_efl_dup_dup(const Eo *obj, Efl_VG_Gradient_Data *pd)
+_efl_vg_gradient_efl_duplicate_duplicate(const Eo *obj, Efl_VG_Gradient_Data *pd)
 
 {
    Efl_VG *cn = NULL;
 
-   cn = efl_dup(efl_super(obj, MY_CLASS));
+   cn = efl_duplicate(efl_super(obj, MY_CLASS));
    efl_gfx_gradient_stop_set(cn, pd->colors, pd->colors_count);
    efl_gfx_gradient_spread_set(cn, pd->s);
    return cn;

diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c
index c8bfcc2..8747950 100644 (file)
--- a/src/lib/evas/canvas/evas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c
@@ -154,11 +154,11 @@ _efl_vg_gradient_linear_efl_vg_interpolate(Eo *obj,
 }
 
 EOLIAN static Efl_VG *
-_efl_vg_gradient_linear_efl_dup_dup(const Eo *obj, Efl_VG_Gradient_Linear_Data *pd)
+_efl_vg_gradient_linear_efl_duplicate_duplicate(const Eo *obj, Efl_VG_Gradient_Linear_Data *pd)
 {
    Efl_VG *cn = NULL;
 
-   cn = efl_dup(efl_super(obj, MY_CLASS));
+   cn = efl_duplicate(efl_super(obj, MY_CLASS));
    efl_gfx_gradient_linear_start_set(cn, pd->start.x, pd->start.y);
    efl_gfx_gradient_linear_end_set(cn, pd->end.x, pd->end.y);
    return cn;

diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c
index 0090550..1489e81 100644 (file)
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c
@@ -174,12 +174,12 @@ _efl_vg_gradient_radial_efl_vg_interpolate(Eo *obj,
 
 
 EOLIAN static Efl_VG *
-_efl_vg_gradient_radial_efl_dup_dup(const Eo *obj, Efl_VG_Gradient_Radial_Data *pd)
+_efl_vg_gradient_radial_efl_duplicate_duplicate(const Eo *obj, Efl_VG_Gradient_Radial_Data *pd)
 
 {
    Efl_VG *cn = NULL;
 
-   cn = efl_dup(efl_super(obj, MY_CLASS));
+   cn = efl_duplicate(efl_super(obj, MY_CLASS));
    efl_gfx_gradient_radial_focal_set(cn, pd->focal.x, pd->focal.y);
    efl_gfx_gradient_radial_center_set(cn, pd->center.x, pd->center.y);
    efl_gfx_gradient_radial_radius_set(cn, pd->radius);

diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 6349555..ae502c1 100644 (file)
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -716,7 +716,7 @@ _efl_vg_interpolate(Eo *obj,
 }
 
 EOLIAN static Efl_VG *
-_efl_vg_efl_dup_dup(const Eo *obj, Efl_VG_Data *pd)
+_efl_vg_efl_duplicate_duplicate(const Eo *obj, Efl_VG_Data *pd)
 {
    Efl_VG *cn;
    Efl_VG_Data *cd;
@@ -733,7 +733,7 @@ _efl_vg_efl_dup_dup(const Eo *obj, Efl_VG_Data *pd)
      }
 
    if (pd->mask)
-     cd->mask = efl_dup(pd->mask);
+     cd->mask = efl_duplicate(pd->mask);
 
    cd->x = pd->x;
    cd->y = pd->y;

diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 177d05e..4d60323 100644 (file)
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -183,19 +183,19 @@ _efl_vg_shape_efl_vg_interpolate(Eo *obj,
 
 
 EOLIAN static Efl_VG *
-_efl_vg_shape_efl_dup_dup(const Eo *obj, Efl_VG_Shape_Data *pd)
+_efl_vg_shape_efl_duplicate_duplicate(const Eo *obj, Efl_VG_Shape_Data *pd)
 {
    Efl_VG *cn = NULL;
    Efl_VG_Shape_Data *cd = NULL;
 
-   cn = efl_dup(efl_super(obj, MY_CLASS));
+   cn = efl_duplicate(efl_super(obj, MY_CLASS));
    cd = efl_data_scope_get(cn, MY_CLASS);
    if (pd->fill)
-     cd->fill = efl_dup(pd->fill);
+     cd->fill = efl_duplicate(pd->fill);
    if (pd->stroke.fill)
-     cd->stroke.fill = efl_dup(pd->stroke.fill);
+     cd->stroke.fill = efl_duplicate(pd->stroke.fill);
    if (pd->stroke.marker)
-     cd->stroke.marker = efl_dup(pd->stroke.marker);
+     cd->stroke.marker = efl_duplicate(pd->stroke.marker);
 
    efl_gfx_path_copy_from(cn, obj);
    return cn;

diff --git a/src/lib/evas/vg/evas_vg_cache.c b/src/lib/evas/vg/evas_vg_cache.c
index 89546e7..1e56fc1 100644 (file)
--- a/src/lib/evas/vg/evas_vg_cache.c
+++ b/src/lib/evas/vg/evas_vg_cache.c
@@ -274,7 +274,7 @@ _evas_vg_dup_vg_tree(Vg_File_Data *fd, double w, double h)
    if (!fd) return NULL;
    if ( !w || !h ) return NULL;
 
-   root = efl_dup(fd->root);
+   root = efl_duplicate(fd->root);
    _apply_transformation(root, w, h, fd);
 
    return root;