jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=c2522dd736dccd00c1924e80508d2c3268382d54

commit c2522dd736dccd00c1924e80508d2c3268382d54
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Wed Jan 13 17:40:07 2016 +0900

    Evas filter: Rename constructor/destructor to ctor/dtor
    
    This avoids a name clash with Eo.Base.
---
 src/lib/evas/canvas/evas_filter.eo      | 4 ++--
 src/lib/evas/canvas/evas_filter_mixin.c | 4 ++--
 src/lib/evas/canvas/evas_object_image.c | 4 ++--
 src/lib/evas/canvas/evas_object_text.c  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lib/evas/canvas/evas_filter.eo 
b/src/lib/evas/canvas/evas_filter.eo
index 0d618c5..85699b5 100644
--- a/src/lib/evas/canvas/evas_filter.eo
+++ b/src/lib/evas/canvas/evas_filter.eo
@@ -19,13 +19,13 @@ mixin Evas.Filter (Efl.Gfx.Filter)
             val: bool;
          }
       }
-      constructor @protected {
+      ctor @protected {
          [[Initialize the Evas.Filter mixin.
 
            Should be called in a parent's class constructor.
          ]]
       }
-      destructor @protected {
+      dtor @protected {
          [[Release all data held by this Evas.Filter.
 
            This may include image buffers allocated by the Evas engine.
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c 
b/src/lib/evas/canvas/evas_filter_mixin.c
index edc47f9..664cf15 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -584,14 +584,14 @@ _evas_filter_invalid_set(Eo *eo_obj EINA_UNUSED, 
Evas_Filter_Data *pd, Eina_Bool
 }
 
 EOLIAN static void
-_evas_filter_constructor(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd)
+_evas_filter_ctor(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd)
 {
    pd->data = eina_cow_alloc(evas_object_filter_cow);
    SLKI(pd->lck);
 }
 
 EOLIAN static void
-_evas_filter_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
+_evas_filter_dtor(Eo *eo_obj, Evas_Filter_Data *pd)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, 
EVAS_OBJECT_CLASS);
    Evas_Filter_Data_Binding *db;
diff --git a/src/lib/evas/canvas/evas_object_image.c 
b/src/lib/evas/canvas/evas_object_image.c
index b2fa8cc..dfeda99 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -371,7 +371,7 @@ _evas_image_eo_base_constructor(Eo *eo_obj, Evas_Image_Data 
*o)
         EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
      }
 
-   eo_do(eo_obj, evas_filter_constructor());
+   eo_do(eo_obj, evas_filter_ctor());
 
    return eo_obj;
 }
@@ -3031,7 +3031,7 @@ evas_object_image_free(Evas_Object *eo_obj, 
Evas_Object_Protected_Data *obj)
        EINA_COW_PIXEL_WRITE_END(o, pixi_write);
      }
 
-   eo_do(eo_obj, evas_filter_destructor());
+   eo_do(eo_obj, evas_filter_dtor());
 }
 
 static void
diff --git a/src/lib/evas/canvas/evas_object_text.c 
b/src/lib/evas/canvas/evas_object_text.c
index 41522d8..355c8f8 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -1599,7 +1599,7 @@ evas_object_text_init(Evas_Object *eo_obj)
    o->inherit_paragraph_direction = EINA_TRUE;
 #endif
 
-   eo_do(eo_obj, evas_filter_constructor());
+   eo_do(eo_obj, evas_filter_ctor());
 }
 
 EOLIAN static void
@@ -1616,7 +1616,7 @@ evas_object_text_free(Evas_Object *eo_obj, 
Evas_Object_Protected_Data *obj)
    Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
 
    /* free obj */
-   eo_do(eo_obj, evas_filter_destructor());
+   eo_do(eo_obj, evas_filter_dtor());
    _evas_object_text_items_clear(o);
    if (o->cur.utf8_text) eina_stringshare_del(o->cur.utf8_text);
    if (o->cur.font) eina_stringshare_del(o->cur.font);

-- 


Reply via email to