cedric pushed a commit to branch master.

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

commit dae9581d21f08bc571d03f3136c175544537764d
Author: Cedric BAIL <ced...@osg.samsung.com>
Date:   Thu Jan 7 16:25:17 2016 -0800

    edje: correct function that should have been Eo API already.
---
 src/lib/edje/Edje_Legacy.h  | 50 -----------------------------------------
 src/lib/edje/edje_object.eo | 54 +++++++++++++++++++++++++++++++++++++++++++--
 src/lib/edje/edje_util.c    | 31 +++++++++-----------------
 3 files changed, 63 insertions(+), 72 deletions(-)

diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index d73a784..fc68c16 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -97,56 +97,6 @@ EAPI void        *edje_object_signal_callback_del 
(Evas_Object *obj, const char
  */
 EAPI void        *edje_object_signal_callback_del_full(Evas_Object *obj, const 
char *emission, const char *source, Edje_Signal_Cb func, void *data);
 
-/**
- * @brief Delete the object color class.
- *
- * @param obj The edje object's reference.
- * @param color_class The color class to be deleted.
- *
- * This function deletes any values at the object level for the
- * specified object and color class.
- * @note Deleting the color class will revert it to the values
- *       defined by edje_color_class_set() or the color class
- *       defined in the theme file.
- *
- * Deleting the color class will emit the signal "color_class,del"
- * for the given Edje object.
- */
- EAPI void         edje_object_color_class_del         (Evas_Object *obj, 
const char *color_class);
-
-/**
- * @brief Delete the object text class.
- *
- * @param obj The edje object's reference.
- * @param text_class The text class to be deleted.
- *
- * This function deletes any values at the object level for the
- * specified object and text class.
- * @note Deleting the text class will revert it to the values
- *       defined by edje_text_class_set() or the text class
- *       defined in the theme file.
- *
- * @since 1.17
- *
- */
-EAPI void         edje_object_text_class_del         (Evas_Object *obj, const 
char *text_class);
-
-/**
- * @brief Delete the object size class.
- *
- * @param obj The edje object's reference.
- * @param size_class The size class to be deleted.
- *
- * This function deletes any values at the object level for the
- * specified object and size class.
- * @note Deleting the size class will revert it to the values
- *       defined by edje_size_class_set() or the size class
- *       defined in the theme file.
- *
- * @since 1.17
- */
- EAPI void         edje_object_size_class_del         (Evas_Object *obj, const 
char *size_class);
-
  /**
  * @brief Set the object minimum size.
  *
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index e600a15..30204fb 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -1835,6 +1835,21 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             @out size: Evas.Font.Size; [[Font Size]]
          }
       }
+      text_class_del {
+         [[Delete the object text class.
+
+           This function deletes any values at the object level for the
+           specified object and text class.
+
+           Deleting the text class will revert it to the values
+           defined by edje_text_class_set() or the text class
+           defined in the theme file.
+
+           @since 1.17]]
+         params {
+            @in text_class: const(char)*; [[The color class to be deleted.]]
+         }
+      }
       color_class_set {
          [[Sets the object color class.
 
@@ -1916,12 +1931,30 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
            @since 1.17.0]]
          return: bool; [[$true, on success or $false, on error]]
       }
+      color_class_del {
+         [[Delete the object color class.
+
+           This function deletes any values at the object level for the
+           specified object and color class.
+
+           Deleting the color class will revert it to the values
+           defined by edje_color_class_set() or the color class
+           defined in the theme file.
+
+           Deleting the color class will emit the signal "color_class,del"
+           for the given Edje object.]]
+         params {
+            @in color_class: const(char)*; [[The color class to be deleted.]]
+         }
+      }
       size_class_set {
          [[Sets the object size class.
 
            This function sets the min and max values for an object level size
            class. This will make all edje parts in the specified object that
-           have the specified size class update their min and max size with 
given values.]]
+           have the specified size class update their min and max size with 
given values.
+
+           @since 1.17]]
          return: bool; [[$true, on success or $false, on error]]
          params {
             @in size_class: const(char)*; [[The size class name]]
@@ -1936,7 +1969,9 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
 
            This function gets the min and max values for an object level size
            class. These values will only be valid until the size class is 
changed
-           or the edje object is deleted.]]
+           or the edje object is deleted.
+
+           @since 1.17]]
          return: bool; [[$true, on success or $false, on error]]
          params {
             @in size_class: const(char)*; [[The size class name]]
@@ -1946,6 +1981,21 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             @out maxh: int; [[The max height]]
          }
       }
+      size_class_del {
+         [[Delete the object size class.
+
+          This function deletes any values at the object level for the
+           specified object and size class.
+
+           Deleting the size class will revert it to the values
+           defined by edje_size_class_set() or the color class
+           defined in the theme file.
+
+           @since 1.17]]
+         params {
+            @in size_class: const(char)*;
+         }
+      }
       part_drag_step {
          [[Steps the dragable x,y steps.
 
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 600b38d..cdf1f5c 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -989,16 +989,13 @@ _edje_object_color_class_description_get(Eo *obj 
EINA_UNUSED, Edje *ed, const ch
    return cc ? cc->desc : NULL;
 }
 
-void
-edje_object_color_class_del(Evas_Object *obj, const char *color_class)
+EOLIAN void
+_edje_object_color_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char 
*color_class)
 {
-   Edje *ed;
    Edje_Color_Class *cc = NULL;
    unsigned int i;
 
-   ed = _edje_fetch(obj);
-
-   if ((!ed) || (!color_class)) return;
+   if (!color_class) return;
 
    eina_hash_del(ed->color_classes, color_class, cc);
 
@@ -1226,7 +1223,7 @@ edje_text_class_get(const char *text_class, const char 
**font, Evas_Font_Size *s
    return EINA_TRUE;
 }
 
-void
+EAPI void
 edje_text_class_del(const char *text_class)
 {
    Edje_Text_Class *tc;
@@ -1449,16 +1446,13 @@ _edje_object_text_class_get(Eo *obj EINA_UNUSED, Edje 
*ed, const char *text_clas
    return EINA_TRUE;
 }
 
-EAPI void
-edje_object_text_class_del(Evas_Object *obj, const char *text_class)
+EOLIAN void
+_edje_object_text_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char 
*text_class)
 {
-   Edje *ed;
    Edje_Text_Class *tc = NULL;
    unsigned int i;
 
-   ed = _edje_fetch(obj);
-
-   if ((!ed) || (!text_class)) return;
+   if (!text_class) return;
 
    eina_hash_del(ed->text_classes, text_class, tc);
 
@@ -1646,7 +1640,7 @@ edje_size_class_get(const char *size_class, Evas_Coord 
*minw, Evas_Coord *minh,
    return EINA_TRUE;
 }
 
-void
+EAPI void
 edje_size_class_del(const char *size_class)
 {
    Edje_Size_Class *sc;
@@ -1867,16 +1861,13 @@ _edje_object_size_class_get(Eo *obj EINA_UNUSED, Edje 
*ed, const char *size_clas
    return EINA_TRUE;
 }
 
-EAPI void
-edje_object_size_class_del(Evas_Object *obj, const char *size_class)
+EOLIAN void
+_edje_object_size_class_del(Eo *obj EINA_UNUSED, Edje *ed, const char 
*size_class)
 {
-   Edje *ed;
    Edje_Size_Class *sc = NULL;
    unsigned int i;
 
-   ed = _edje_fetch(obj);
-
-   if ((!ed) || (!size_class)) return;
+   if (!size_class) return;
 
    eina_hash_del(ed->size_classes, size_class, sc);
 

-- 


Reply via email to