Efl gfx: Remove the no longer needed .Base hack.

diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 21a1c00..58a00c5 100644 (file)
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -1,7 +1,7 @@
 # Even though libefl is new, it contains definitions used by legacy APIs
 efl_eolian_legacy_files = \
        lib/efl/interfaces/efl_gfx_fill.eo \
-       lib/efl/interfaces/efl_gfx_base.eo \
+       lib/efl/interfaces/efl_gfx.eo \
        lib/efl/interfaces/efl_image.eo \
        lib/efl/interfaces/efl_image_animated.eo \
        $(NULL)

diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c
index 59a1da9..fbd85e4 100644 (file)
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -132,7 +132,7 @@ static Eina_Bool
 child_evt_cb(void *data, const Eo_Event *event)
 {
    Elm_Label *o = data;
-   Efl_Gfx_Base *it = event->info;
+   Efl_Gfx *it = event->info;
    int col, row, colspan, rowspan;
    char buf[64];
 

diff --git a/src/lib/edje/edje_containers.c b/src/lib/edje/edje_containers.c
index 75d61c4..f6d7155 100644 (file)
--- a/src/lib/edje/edje_containers.c
+++ b/src/lib/edje/edje_containers.c
@@ -83,7 +83,7 @@ _efl_canvas_layout_internal_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Edje_Bo
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj)
+_efl_canvas_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj)
 {
    Evas_Object *removed;
    removed = _edje_part_box_remove(pd->ed, pd->part, subobj);
@@ -91,37 +91,37 @@ _efl_canvas_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Edje_Box_Da
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj)
+_efl_canvas_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj)
 {
    return _edje_part_box_append(pd->ed, pd->part, subobj);
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj)
+_efl_canvas_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj)
 {
    return _edje_part_box_prepend(pd->ed, pd->part, subobj);
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj)
+_efl_canvas_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj)
 {
    return _edje_part_box_append(pd->ed, pd->part, subobj);
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing)
+_efl_canvas_layout_internal_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing)
 {
    return _edje_part_box_insert_before(pd->ed, pd->part, subobj, existing);
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing)
+_efl_canvas_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing)
 {
    return _edje_part_box_insert_after(pd->ed, pd->part, subobj, existing);
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_box_efl_pack_linear_pack_at(Eo *obj, Edje_Box_Data *pd, Efl_Gfx_Base *subobj, int index)
+_efl_canvas_layout_internal_box_efl_pack_linear_pack_at(Eo *obj, Edje_Box_Data *pd, Efl_Gfx *subobj, int index)
 {
    int cnt = efl_content_count(obj);
    if ((index < 0) && ((-index) <= (cnt + 1)))
@@ -132,7 +132,7 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_at(Eo *obj, Edje_Box_Data *
      return _edje_part_box_append(pd->ed, pd->part, subobj);
 }
 
-EOLIAN static Efl_Gfx_Base *
+EOLIAN static Efl_Gfx *
 _efl_canvas_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, int index)
 {
    if (index < 0) index += efl_content_count(obj);
@@ -141,7 +141,7 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj EINA_UNUS
 
 /* New APIs with Eo */
 
-EOLIAN static Efl_Gfx_Base *
+EOLIAN static Efl_Gfx *
 _efl_canvas_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, int index)
 {
    if (index < 0) index += efl_content_count(obj);
@@ -149,13 +149,13 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UN
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_box_efl_container_content_remove(Eo *obj, Edje_Box_Data *pd EINA_UNUSED, Efl_Gfx_Base *subobj)
+_efl_canvas_layout_internal_box_efl_container_content_remove(Eo *obj, Edje_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj)
 {
    return efl_pack_unpack(obj, subobj);
 }
 
 EOLIAN static int
-_efl_canvas_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, const Efl_Gfx_Base * subobj)
+_efl_canvas_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Edje_Box_Data *pd, const Efl_Gfx * subobj)
 {
    Evas_Object_Box_Option *opt;
    Evas_Object_Box_Data *priv;
@@ -177,7 +177,7 @@ _efl_canvas_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUS
 static Eina_Bool
 _part_item_iterator_next(Part_Item_Iterator *it, void **data)
 {
-   Efl_Gfx_Base *sub;
+   Efl_Gfx *sub;
 
    if (!it->object) return EINA_FALSE;
    if (!eina_iterator_next(it->real_iterator, (void **) &sub))
@@ -305,7 +305,7 @@ _efl_canvas_layout_internal_table_efl_container_content_count(Eo *obj EINA_UNUSE
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_table_efl_container_content_remove(Eo *obj, Edje_Table_Data *pd EINA_UNUSED, Efl_Gfx_Base *content)
+_efl_canvas_layout_internal_table_efl_container_content_remove(Eo *obj, Edje_Table_Data *pd EINA_UNUSED, Efl_Gfx *content)
 {
    return efl_pack_unpack(obj, content);
 }
@@ -323,18 +323,18 @@ _efl_canvas_layout_internal_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Edje_
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx_Base *subobj)
+_efl_canvas_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx *subobj)
 {
    return _edje_part_table_unpack(pd->ed, pd->part, subobj);
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx_Base *subobj, int col, int row, int colspan, int rowspan)
+_efl_canvas_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan)
 {
    return _edje_part_table_pack(pd->ed, pd->part, subobj, col, row, colspan, rowspan);
 }
 
-EOLIAN static Efl_Gfx_Base *
+EOLIAN static Efl_Gfx *
 _efl_canvas_layout_internal_table_efl_pack_grid_grid_content_get(Eo *obj EINA_UNUSED, Edje_Table_Data *pd, int col, int row)
 {
    return _edje_part_table_child_get(pd->ed, pd->part, col, row);
@@ -367,7 +367,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_rows_get(Eo *obj EINA_UNUSE
 static Eina_Bool
 _table_item_iterator_next(Part_Item_Iterator *it, void **data)
 {
-   Efl_Gfx_Base *sub;
+   Efl_Gfx *sub;
 
    if (!it->object) return EINA_FALSE;
    if (!eina_iterator_next(it->real_iterator, (void **) &sub))
@@ -435,7 +435,7 @@ _efl_canvas_layout_internal_table_efl_pack_grid_grid_contents_get(Eo *obj EINA_U
 }
 
 EOLIAN static Eina_Bool
-_efl_canvas_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx_Base * subobj, int *col, int *row, int *colspan, int *rowspan)
+_efl_canvas_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj EINA_UNUSED, Edje_Table_Data *pd, Efl_Gfx * subobj, int *col, int *row, int *colspan, int *rowspan)
 {
    unsigned short c, r, cs, rs;
    Eina_Bool ret;

diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 4ecb521..7009fda 100644 (file)
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -3513,7 +3513,7 @@ _edje_object_text_markup_filter_callback_del_full(Eo *obj EINA_UNUSED, Edje *ed,
 
 EOLIAN Eina_Bool
 _edje_object_efl_container_content_set(Eo *obj EINA_UNUSED, Edje *ed,
-                                       const char *part, Efl_Gfx_Base *obj_swallow)
+                                       const char *part, Efl_Gfx *obj_swallow)
 {
    Edje_Real_Part *rp, *rpcur;
    Edje_User_Defined *eud = NULL;
@@ -3884,7 +3884,7 @@ _edje_object_efl_container_content_remove(Eo *obj EINA_UNUSED, Edje *ed, Evas_Ob
    return EINA_TRUE;
 }
 
-EOLIAN Efl_Gfx_Base *
+EOLIAN Efl_Gfx *
 _edje_object_efl_container_content_get(Eo *obj, Edje *ed, const char *part)
 {
    Edje_Real_Part *rp;
@@ -3917,10 +3917,10 @@ _edje_object_efl_container_content_get(Eo *obj, Edje *ed, const char *part)
 }
 
 /* new in eo */
-EOLIAN Efl_Gfx_Base *
+EOLIAN Efl_Gfx *
 _edje_object_efl_container_content_unset(Eo *obj, Edje *ed EINA_UNUSED, const char *part)
 {
-   Efl_Gfx_Base *content;
+   Efl_Gfx *content;
 
    content = efl_content_get(obj, part);
    if (!content) return NULL;
@@ -3933,7 +3933,7 @@ _edje_object_efl_container_content_unset(Eo *obj, Edje *ed EINA_UNUSED, const ch
 
 /* new in eo */
 EOLIAN const char *
-_edje_object_efl_container_content_part_name_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED, Efl_Gfx_Base *content)
+_edje_object_efl_container_content_part_name_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED, Efl_Gfx *content)
 {
    Edje_Real_Part *rp;
 

diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 074d035..61b62d9 100644 (file)
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -93,7 +93,7 @@ EAPI extern const Eo_Event_Description _EFL_GFX_PATH_CHANGED;
 #define EFL_GFX_CHANGED (&(_EFL_GFX_CHANGED))
 #define EFL_GFX_PATH_CHANGED (&(_EFL_GFX_PATH_CHANGED))
 
-#include "interfaces/efl_gfx_base.eo.h"
+#include "interfaces/efl_gfx.eo.h"
 #include "interfaces/efl_gfx_buffer.eo.h"
 #include "interfaces/efl_gfx_stack.eo.h"
 #include "interfaces/efl_gfx_fill.eo.h"
@@ -129,7 +129,7 @@ static inline void efl_gfx_color16_type_set(Efl_Gfx_Color *color,
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "interfaces/efl_gfx_types.eot.h"
 #include "interfaces/efl_gfx_fill.eo.legacy.h"
-#include "interfaces/efl_gfx_base.eo.legacy.h"
+#include "interfaces/efl_gfx.eo.legacy.h"
 #include "interfaces/efl_image.eo.legacy.h"
 #include "interfaces/efl_image_animated.eo.legacy.h"
 #endif

diff --git a/src/lib/efl/Makefile.am b/src/lib/efl/Makefile.am
index 321152e..17ce1d4 100644 (file)
--- a/src/lib/efl/Makefile.am
+++ b/src/lib/efl/Makefile.am
@@ -5,7 +5,7 @@ include ../../Makefile_Eolian_Subbuild_Helper.am
 # Even though libefl is new, it contains definitions used by legacy APIs
 efl_eolian_legacy_files = \
 interfaces/efl_gfx_fill.eo \
-interfaces/efl_gfx_base.eo \
+interfaces/efl_gfx.eo \
 interfaces/efl_image.eo \
 interfaces/efl_image_animated.eo \
 $(NULL)

diff --git a/src/lib/efl/interfaces/efl_container.eo b/src/lib/efl/interfaces/efl_container.eo
index c31e2c0..9663ebe 100644 (file)
--- a/src/lib/efl/interfaces/efl_container.eo
+++ b/src/lib/efl/interfaces/efl_container.eo
@@ -1,4 +1,4 @@
-interface Efl.Container (Efl.Gfx.Base)
+interface Efl.Container (Efl.Gfx)
 {
    [[API common to all UI container objects.]]
    legacy_prefix: null;
@@ -14,14 +14,14 @@ interface Efl.Container (Efl.Gfx.Base)
             part: const(char)*; [[the part in which to swallow the object]]
          }
          values {
-            content: Efl.Gfx.Base*; [[the object to swallow.]]
+            content: Efl.Gfx*; [[the object to swallow.]]
          }
       }
       @property content_part_name {
          [[The name of the part under which an object is swallowed.]]
          get {}
          keys {
-            content: Efl.Gfx.Base*;
+            content: Efl.Gfx*;
          }
          values {
             name: const(char)*;
@@ -32,18 +32,18 @@ interface Efl.Container (Efl.Gfx.Base)
          params {
             @in name: const(char)* @nullable;
          }
-         return: Efl.Gfx.Base*;
+         return: Efl.Gfx*;
       }
       content_remove {
          [[Unswallow an object from this container.]]
          params {
-            @in content: Efl.Gfx.Base*;
+            @in content: Efl.Gfx*;
          }
          return: bool; [[$false if $content was not a child or can not be removed.]]
       }
       content_iterate {
          [[Begin iterating over this object's contents.]]
-         return: free(own(iterator<Efl.Gfx.Base *> *), eina_iterator_free) @warn_unused;
+         return: free(own(iterator<Efl.Gfx *> *), eina_iterator_free) @warn_unused;
       }
       content_count {
          [[Returns the number of UI elements packed in this container.]]
@@ -51,7 +51,7 @@ interface Efl.Container (Efl.Gfx.Base)
       }
    }
    events {
-      content,added: Efl.Gfx.Base*;    [[Sent after a new item was added.]]
-      content,removed: Efl.Gfx.Base*;  [[Sent after an item was removed, before unref.]]
+      content,added: Efl.Gfx*;    [[Sent after a new item was added.]]
+      content,removed: Efl.Gfx*;  [[Sent after an item was removed, before unref.]]
    }
 }

diff --git a/src/lib/efl/interfaces/efl_gfx_base.eo b/src/lib/efl/interfaces/efl_gfx.eo
similarity index 97%
rename from src/lib/efl/interfaces/efl_gfx_base.eo
rename to src/lib/efl/interfaces/efl_gfx.eo
index 2b757cf..9c47e7b 100644 (file)
--- a/src/lib/efl/interfaces/efl_gfx_base.eo
+++ b/src/lib/efl/interfaces/efl_gfx.eo
@@ -1,6 +1,6 @@
 import efl_gfx_types;
 
-interface Efl.Gfx.Base {
+interface Efl.Gfx {
    legacy_prefix: null;
    eo_prefix: efl_gfx;
    methods {
@@ -72,7 +72,7 @@ interface Efl.Gfx.Base {
       }
       @property color_part {
          set {
-            [[Sets a specifc color of the given Efl.Gfx.Base object to the
+            [[Sets a specifc color of the given Efl.Gfx object to the
               given one.
 
               See also @.color.get (for an example)

diff --git a/src/lib/efl/interfaces/efl_gfx_buffer.eo b/src/lib/efl/interfaces/efl_gfx_buffer.eo
index 8019145..08a92f9 100644 (file)
--- a/src/lib/efl/interfaces/efl_gfx_buffer.eo
+++ b/src/lib/efl/interfaces/efl_gfx_buffer.eo
@@ -59,7 +59,7 @@ interface Efl.Gfx.Buffer ()
               whether or not to use alpha channel data. A value of $true
               makes it use alpha channel data, and $false makes it ignore
               that data. Note that this has nothing to do with an object's
-              color as manipulated by @Efl.Gfx.Base.color.set.
+              color as manipulated by @Efl.Gfx.color.set.
             ]]
          }
          get {

diff --git a/src/lib/efl/interfaces/efl_gfx_filter.eo b/src/lib/efl/interfaces/efl_gfx_filter.eo
index 52267de..b59d857 100644 (file)
--- a/src/lib/efl/interfaces/efl_gfx_filter.eo
+++ b/src/lib/efl/interfaces/efl_gfx_filter.eo
@@ -86,7 +86,7 @@ interface Efl.Gfx.Filter
             name: const(char)*; [[Buffer name as used in the program.]]
          }
          values {
-            source: Efl.Gfx.Base*; [[Object to use as a source of pixels.]]
+            source: Efl.Gfx*; [[Object to use as a source of pixels.]]
          }
       }
       @property filter_data {

diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 14b665b..b3ece1e 100644 (file)
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -13,7 +13,7 @@
 #include "interfaces/efl_text.eo.c"
 #include "interfaces/efl_text_properties.eo.c"
 
-#include "interfaces/efl_gfx_base.eo.c"
+#include "interfaces/efl_gfx.eo.c"
 #include "interfaces/efl_gfx_buffer.eo.c"
 #include "interfaces/efl_gfx_stack.eo.c"
 #include "interfaces/efl_gfx_fill.eo.c"

diff --git a/src/lib/efl/interfaces/efl_pack.eo b/src/lib/efl/interfaces/efl_pack.eo
index 76ffc48..95c60fe 100644 (file)
--- a/src/lib/efl/interfaces/efl_pack.eo
+++ b/src/lib/efl/interfaces/efl_pack.eo
@@ -20,7 +20,7 @@ interface Efl.Pack (Efl.Container)
       unpack {
          [[Removes an existing item from the container, without deleting it.]]
          params {
-            subobj: own(Efl.Gfx.Base *);
+            subobj: own(Efl.Gfx *);
          }
          return: bool; [[$false if $subobj wasn't a child or can't be removed]]
       }
@@ -35,7 +35,7 @@ interface Efl.Pack (Efl.Container)
            failed, the object will be unrefed.
          ]]
          params {
-            subobj: own(Efl.Gfx.Base *);
+            subobj: own(Efl.Gfx *);
          }
          return: bool; [[$false if $subobj could not be packed.]]
       }

diff --git a/src/lib/efl/interfaces/efl_pack_grid.eo b/src/lib/efl/interfaces/efl_pack_grid.eo
index 9b2b184..0e282ba 100644 (file)
--- a/src/lib/efl/interfaces/efl_pack_grid.eo
+++ b/src/lib/efl/interfaces/efl_pack_grid.eo
@@ -8,7 +8,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear)
    methods {
       pack_grid {
          params {
-            subobj: own(Efl.Gfx.Base *);
+            subobj: own(Efl.Gfx *);
             col: int;
             row: int;
             colspan: int @optional; [[0 means 1, -1 means @.grid_columns]]
@@ -18,7 +18,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear)
       }
       grid_contents_get {
          [[Returns all objects at a given position in this grid.]]
-         return: free(own(iterator<Efl.Gfx.Base *> *), eina_iterator_free);
+         return: free(own(iterator<Efl.Gfx *> *), eina_iterator_free);
          params {
             @in col: int;
             @in row: int;
@@ -27,7 +27,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear)
       }
       grid_content_get {
          [[Returns a child at a given position, see @.grid_contents_get.]]
-         return: Efl.Gfx.Base*;
+         return: Efl.Gfx*;
          params {
             @in col: int;
             @in row: int;
@@ -37,7 +37,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear)
          [[position and span of the $subobj in this container, may be modified to move the $subobj]]
          get { return: bool; [[returns false if item is not a child]] }
          keys {
-            subobj: Efl.Gfx.Base*;
+            subobj: Efl.Gfx*;
          }
          values {
             col: int;

diff --git a/src/lib/efl/interfaces/efl_pack_layout.eo b/src/lib/efl/interfaces/efl_pack_layout.eo
index dbae2ee..a20bae3 100644 (file)
--- a/src/lib/efl/interfaces/efl_pack_layout.eo
+++ b/src/lib/efl/interfaces/efl_pack_layout.eo
@@ -37,7 +37,7 @@ interface Efl.Pack_Layout ()
       layout_do @class @protected {
          [[Lay out (resize and move) children objects of $pack.]]
          params {
-            pack: Efl.Gfx.Base*; [[The container to lay out.]]
+            pack: Efl.Gfx*; [[The container to lay out.]]
             data: const(void)* @optional; [[Extra data passed by the caller.]]
          }
       }

diff --git a/src/lib/efl/interfaces/efl_pack_linear.eo b/src/lib/efl/interfaces/efl_pack_linear.eo
index 3ff3f01..d379fee 100644 (file)
--- a/src/lib/efl/interfaces/efl_pack_linear.eo
+++ b/src/lib/efl/interfaces/efl_pack_linear.eo
@@ -13,7 +13,7 @@ interface Efl.Pack_Linear (Efl.Pack)
            This is the same as @.pack_at($subobj, 0).
          ]]
          params {
-            @in subobj: own(Efl.Gfx.Base *); [[Item to pack.]]
+            @in subobj: own(Efl.Gfx *); [[Item to pack.]]
          }
          return: bool; [[$false if $subobj could not be packed]]
       }
@@ -23,15 +23,15 @@ interface Efl.Pack_Linear (Efl.Pack)
            This is the same as @.pack_at($subobj, -1).
          ]]
          params {
-            @in subobj: own(Efl.Gfx.Base *); [[Item to pack.]]
+            @in subobj: own(Efl.Gfx *); [[Item to pack.]]
          }
          return: bool; [[$false if $subobj could not be packed]]
       }
       pack_before {
          [[Prepend item before other sub object.]]
          params {
-            @in subobj:   own(Efl.Gfx.Base *);   [[Item to pack.]]
-            @in existing: const(Efl.Gfx.Base)*;  [[Item to refer to.]]
+            @in subobj:   own(Efl.Gfx *);   [[Item to pack.]]
+            @in existing: const(Efl.Gfx)*;  [[Item to refer to.]]
          }
          return: bool; [[$false if $existing could not be found or $subobj
                          could not be packed]]
@@ -39,8 +39,8 @@ interface Efl.Pack_Linear (Efl.Pack)
       pack_after {
          [[Append item after other sub object.]]
          params {
-            @in subobj:   own(Efl.Gfx.Base *);   [[Item to pack.]]
-            @in existing: const(Efl.Gfx.Base)*;  [[Item to refer to.]]
+            @in subobj:   own(Efl.Gfx *);   [[Item to pack.]]
+            @in existing: const(Efl.Gfx)*;  [[Item to refer to.]]
          }
          return: bool; [[$false if $existing could not be found or $subobj
                          could not be packed]]
@@ -52,7 +52,7 @@ interface Efl.Pack_Linear (Efl.Pack)
             Out of range indices will trigger an append.
           ]]
           params {
-             @in subobj: own(Efl.Gfx.Base *); [[Item to pack.]]
+             @in subobj: own(Efl.Gfx *); [[Item to pack.]]
              @in index:  int;                 [[A position.]]
           }
           return: bool; [[$false if $subobj could not be packed]]
@@ -66,12 +66,12 @@ interface Efl.Pack_Linear (Efl.Pack)
          params {
             index: int;
          }
-         return: Efl.Gfx.Base *; [[The object contained at the given $index.]]
+         return: Efl.Gfx *; [[The object contained at the given $index.]]
       }
       pack_index_get {
          [[Get the index of a child in this container.]]
          params {
-            subobj: const(Efl.Gfx.Base)*; [[An object contained in this pack.]]
+            subobj: const(Efl.Gfx)*; [[An object contained in this pack.]]
          }
          return: int(-1); [[-1 in case of failure, or the index of this item.]]
       }
@@ -83,7 +83,7 @@ interface Efl.Pack_Linear (Efl.Pack)
          params {
             index: int;
          }
-         return: Efl.Gfx.Base*; [[The child item if it could be removed.]]
+         return: Efl.Gfx*; [[The child item if it could be removed.]]
       }
       @property pack_direction {
          [[Primary up/left/right/down orientation. Default is right.]]

diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 157b462..38c3b17 100644 (file)
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -320,7 +320,7 @@ _efl_ui_box_efl_pack_unpack_all(Eo *obj, Efl_Ui_Box_Data *pd)
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx_Base *subobj)
+_efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx *subobj)
 {
    Eina_Bool ret = EINA_FALSE;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -335,13 +335,13 @@ _efl_ui_box_efl_pack_unpack(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Gfx_Base *subobj)
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_pack(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Base *subobj)
+_efl_ui_box_efl_pack_pack(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj)
 {
    return efl_pack_end(obj, subobj);
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Base *subobj)
+_efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx *subobj)
 {
    Eina_Bool ret;
 
@@ -354,7 +354,7 @@ _efl_ui_box_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED, E
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Base *subobj)
+_efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj)
 {
    Eina_Bool ret;
 
@@ -367,7 +367,7 @@ _efl_ui_box_efl_pack_linear_pack_begin(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing)
+_efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
@@ -384,7 +384,7 @@ _efl_ui_box_efl_pack_linear_pack_before(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSE
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing)
+_efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
@@ -402,7 +402,7 @@ _efl_ui_box_efl_pack_linear_pack_after(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
 
 EOLIAN static Eina_Bool
 _efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
-                                        Efl_Gfx_Base *subobj, int index)
+                                        Efl_Gfx *subobj, int index)
 {
    if (!index)
      return efl_pack_begin(obj, subobj);
@@ -428,13 +428,13 @@ _efl_ui_box_efl_pack_linear_pack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
      }
 }
 
-static inline Efl_Gfx_Base *
+static inline Efl_Gfx *
 _box_item(Evas_Object_Box_Option *opt)
 {
    return opt ? opt->obj : NULL;
 }
 
-EOLIAN static Efl_Gfx_Base *
+EOLIAN static Efl_Gfx *
 _efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
                                            int index)
 {
@@ -465,11 +465,11 @@ _efl_ui_box_efl_pack_linear_pack_content_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_U
    return _box_item(eina_list_nth(bd->children, index));
 }
 
-EOLIAN static Efl_Gfx_Base *
+EOLIAN static Efl_Gfx *
 _efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
                                               int index)
 {
-   Efl_Gfx_Base *content;
+   Efl_Gfx *content;
 
    content = efl_pack_content_get(obj, index);
    if (!content) return NULL;
@@ -482,7 +482,7 @@ _efl_ui_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNU
 
 EOLIAN static int
 _efl_ui_box_efl_pack_linear_pack_index_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED,
-                                           const Efl_Gfx_Base *subobj)
+                                           const Efl_Gfx *subobj)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, -1);
    Evas_Object_Box_Data *bd;
@@ -516,7 +516,7 @@ _efl_ui_box_efl_pack_layout_layout_request(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNU
 static Eina_Bool
 _box_item_iterator_next(Box_Item_Iterator *it, void **data)
 {
-   Efl_Gfx_Base *sub;
+   Efl_Gfx *sub;
 
    if (!eina_iterator_next(it->real_iterator, (void **) &sub))
      return EINA_FALSE;

diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index bc13d96..2638dc0 100644 (file)
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -19,7 +19,7 @@ typedef struct _Grid_Item Grid_Item;
 typedef struct _Custom_Table_Data Custom_Table_Data;
 
 static Eina_Bool _subobj_del_cb(void *data, const Eo_Event *event);
-static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj);
+static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj);
 
 #define GRID_ITEM_KEY "__grid_item"
 
@@ -27,7 +27,7 @@ struct _Grid_Item
 {
    EINA_INLIST;
 
-   Efl_Gfx_Base *object;
+   Efl_Gfx *object;
    int col_span, row_span;
    int col, row;
 
@@ -408,7 +408,7 @@ _subobj_del_cb(void *data, const Eo_Event *event)
 }
 
 static Eina_Bool
-_pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj,
+_pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj,
          int col, int row, int colspan, int rowspan, Eina_Bool linear)
 {
    Grid_Item *gi = NULL;
@@ -474,7 +474,7 @@ _pack_at(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj,
 
 EOLIAN static Eina_Bool
 _efl_ui_grid_efl_pack_grid_pack_grid(Eo *obj, Efl_Ui_Grid_Data *pd,
-                                     Efl_Gfx_Base *subobj,
+                                     Efl_Gfx *subobj,
                                      int col, int row, int colspan, int rowspan)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE);
@@ -514,7 +514,7 @@ end:
    return ret;
 }
 
-EOLIAN static Efl_Gfx_Base *
+EOLIAN static Efl_Gfx *
 _efl_ui_grid_efl_pack_grid_grid_content_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED, int col, int row)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
@@ -523,7 +523,7 @@ _efl_ui_grid_efl_pack_grid_grid_content_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_U
 }
 
 static void
-_item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj)
+_item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj)
 {
    Grid_Item *gi = eo_key_data_get(subobj, GRID_ITEM_KEY);
    Grid_Item *gi2, *last = NULL;
@@ -580,7 +580,7 @@ end:
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_grid_efl_pack_unpack(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj)
+_efl_ui_grid_efl_pack_unpack(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
@@ -622,7 +622,7 @@ _efl_ui_grid_efl_pack_layout_layout_request(Eo *obj, Efl_Ui_Grid_Data *pd EINA_U
 static Eina_Bool
 _grid_item_iterator_next(Grid_Item_Iterator *it, void **data)
 {
-   Efl_Gfx_Base *sub;
+   Efl_Gfx *sub;
 
    if (!eina_iterator_next(it->real_iterator, (void **) &sub))
      return EINA_FALSE;
@@ -835,14 +835,14 @@ _efl_ui_grid_efl_pack_grid_grid_rows_get(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_grid_efl_pack_pack(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED, Efl_Gfx_Base *subobj)
+_efl_ui_grid_efl_pack_pack(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED, Efl_Gfx *subobj)
 {
    /* this is just an alias */
    return efl_pack_end(obj, subobj);
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_grid_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx_Base *subobj)
+_efl_ui_grid_efl_pack_linear_pack_end(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE);
 

diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c
index 522b432..c6694cf 100644 (file)
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/elm_layout.c
@@ -1137,7 +1137,7 @@ _elm_layout_efl_container_content_unset(Eo *obj, Elm_Layout_Smart_Data *sd, cons
 
 EOLIAN static Eina_Bool
 _elm_layout_efl_container_content_remove(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED,
-                                         Efl_Gfx_Base *content)
+                                         Efl_Gfx *content)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
@@ -1225,7 +1225,7 @@ _elm_layout_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Elm_Layout_Sma
 EOLIAN static const char *
 _elm_layout_efl_container_content_part_name_get(Eo *eo_obj EINA_UNUSED,
                                                 Elm_Layout_Smart_Data *sd,
-                                                Efl_Gfx_Base *content)
+                                                Efl_Gfx *content)
 {
    Elm_Layout_Sub_Object_Data *sub;
    Eina_List *l;

diff --git a/src/lib/elementary/elm_layout_pack.c b/src/lib/elementary/elm_layout_pack.c
index 13c2727..bbab226 100644 (file)
--- a/src/lib/elementary/elm_layout_pack.c
+++ b/src/lib/elementary/elm_layout_pack.c
@@ -99,7 +99,7 @@ _efl_ui_layout_internal_box_eo_base_destructor(Eo *obj, Efl_Ui_Layout_Box_Data *
 static Eina_Bool
 _part_item_iterator_next(Part_Item_Iterator *it, void **data)
 {
-   Efl_Gfx_Base *sub;
+   Efl_Gfx *sub;
 
    if (!it->object) return EINA_FALSE;
    if (!eina_iterator_next(it->real_iterator, (void **) &sub))
@@ -161,7 +161,7 @@ _efl_ui_layout_internal_box_efl_container_content_count(Eo *obj EINA_UNUSED, Efl
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd EINA_UNUSED, Efl_Gfx_Base *content)
+_efl_ui_layout_internal_box_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Box_Data *pd EINA_UNUSED, Efl_Gfx *content)
 {
    // alias
    return efl_pack_unpack(obj, content);
@@ -180,39 +180,39 @@ _efl_ui_layout_internal_box_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Layo
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj)
+_efl_ui_layout_internal_box_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
 {
    return _elm_layout_box_remove(pd->obj, pd->sd, pd->part, subobj) != NULL;
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj)
+_efl_ui_layout_internal_box_efl_pack_pack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
 {
    return _elm_layout_box_append(pd->obj, pd->sd, pd->part, subobj);
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj)
+_efl_ui_layout_internal_box_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
 {
    return _elm_layout_box_prepend(pd->obj, pd->sd, pd->part, subobj);
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj)
+_efl_ui_layout_internal_box_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj)
 {
    return _elm_layout_box_append(pd->obj, pd->sd, pd->part, subobj);
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing)
+_efl_ui_layout_internal_box_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing)
 {
    return _elm_layout_box_insert_before(pd->obj, pd->sd, pd->part, subobj, existing);
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj, const Efl_Gfx_Base *existing)
+_efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, const Efl_Gfx *existing)
 {
-   const Efl_Gfx_Base *other;
+   const Efl_Gfx *other;
    int index;
 
    index = efl_pack_index_get(pd->pack, existing);
@@ -227,12 +227,12 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, Efl_
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_box_efl_pack_linear_pack_at(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx_Base *subobj, int index)
+_efl_ui_layout_internal_box_efl_pack_linear_pack_at(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, Efl_Gfx *subobj, int index)
 {
    return _elm_layout_box_insert_at(pd->obj, pd->sd, pd->part, subobj, index);
 }
 
-EOLIAN static Efl_Gfx_Base *
+EOLIAN static Efl_Gfx *
 _efl_ui_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, int index)
 {
    Evas_Object_Box_Option *opt;
@@ -244,10 +244,10 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED
    return opt->obj;
 }
 
-EOLIAN static Efl_Gfx_Base *
+EOLIAN static Efl_Gfx *
 _efl_ui_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layout_Box_Data *pd, int index)
 {
-   Efl_Gfx_Base *subobj;
+   Efl_Gfx *subobj;
 
    subobj = efl_pack_content_get(pd->pack, index);
    if (!subobj) return NULL;
@@ -259,7 +259,7 @@ _efl_ui_layout_internal_box_efl_pack_linear_pack_unpack_at(Eo *obj, Efl_Ui_Layou
 }
 
 EOLIAN static int
-_efl_ui_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, const Efl_Gfx_Base *subobj)
+_efl_ui_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd, const Efl_Gfx *subobj)
 {
    return efl_pack_index_get(pd->pack, subobj);
 }
@@ -313,7 +313,7 @@ _efl_ui_layout_internal_table_efl_container_content_count(Eo *obj EINA_UNUSED, E
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd EINA_UNUSED, Efl_Gfx_Base *content)
+_efl_ui_layout_internal_table_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Table_Data *pd EINA_UNUSED, Efl_Gfx *content)
 {
    return efl_pack_unpack(obj, content);
 }
@@ -331,19 +331,19 @@ _efl_ui_layout_internal_table_efl_pack_unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_La
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Base *subobj)
+_efl_ui_layout_internal_table_efl_pack_unpack(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj)
 {
    if (!subobj) return EINA_FALSE;
    return _elm_layout_table_unpack(pd->obj, pd->sd, pd->part, subobj) == subobj;
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Base *subobj, int col, int row, int colspan, int rowspan)
+_efl_ui_layout_internal_table_efl_pack_grid_pack_grid(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx *subobj, int col, int row, int colspan, int rowspan)
 {
    return _elm_layout_table_pack(pd->obj, pd->sd, pd->part, subobj, col, row, colspan, rowspan);
 }
 
-EOLIAN static Efl_Gfx_Base *
+EOLIAN static Efl_Gfx *
 _efl_ui_layout_internal_table_efl_pack_grid_grid_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, int col, int row)
 {
    return evas_object_table_child_get(pd->pack, col, row);
@@ -378,7 +378,7 @@ _efl_ui_layout_internal_table_efl_pack_grid_grid_contents_get(Eo *obj EINA_UNUSE
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx_Base * subobj, int *col, int *row, int *colspan, int *rowspan)
+_efl_ui_layout_internal_table_efl_pack_grid_grid_position_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Table_Data *pd, Efl_Gfx * subobj, int *col, int *row, int *colspan, int *rowspan)
 {
    unsigned short c, r, cs, rs;
    Eina_Bool ret;

diff --git a/src/lib/elementary/elm_win.c b/src/lib/elementary/elm_win.c
index c0f0a25..a9d592b 100644 (file)
--- a/src/lib/elementary/elm_win.c
+++ b/src/lib/elementary/elm_win.c
@@ -4158,7 +4158,7 @@ elm_win_util_dialog_add(Evas_Object *parent, const char *name, const char *title
 }
 
 EOLIAN static Eina_Bool
-_elm_win_efl_pack_pack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx_Base *subobj)
+_elm_win_efl_pack_pack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx *subobj)
 {
    Eina_Bool ret;
 
@@ -4172,7 +4172,7 @@ _elm_win_efl_pack_pack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx_Base *subobj)
 }
 
 EOLIAN static Eina_Bool
-_elm_win_efl_pack_unpack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx_Base *subobj)
+_elm_win_efl_pack_unpack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx *subobj)
 {
    Eina_Bool ret;
 
@@ -4187,7 +4187,7 @@ _elm_win_efl_pack_unpack(Eo *obj, Elm_Win_Data *sd, Efl_Gfx_Base *subobj)
 
 EOLIAN static Eina_Bool
 _elm_win_efl_container_content_remove(Eo *obj, Elm_Win_Data *sd EINA_UNUSED,
-                                      Efl_Gfx_Base *subobj)
+                                      Efl_Gfx *subobj)
 {
    return efl_pack_unpack(obj, subobj);
 }
@@ -4207,7 +4207,7 @@ _elm_win_efl_container_content_count(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
 static Eina_Bool
 _box_item_iterator_next(Box_Item_Iterator *it, void **data)
 {
-   Efl_Gfx_Base *sub;
+   Efl_Gfx *sub;
 
    if (!eina_iterator_next(it->real_iterator, (void **) &sub))
      return EINA_FALSE;

diff --git a/src/lib/evas/canvas/efl_vg_base.eo b/src/lib/evas/canvas/efl_vg_base.eo
index 66ca5e4..85c0e2b 100644 (file)
--- a/src/lib/evas/canvas/efl_vg_base.eo
+++ b/src/lib/evas/canvas/efl_vg_base.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
+abstract Efl.VG.Base (Eo.Base, Efl.Gfx, Efl.Gfx.Stack)
 {
    eo_prefix: efl_vg;
    legacy_prefix: evas_vg_node;
@@ -109,15 +109,15 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
       Eo.Base.parent.set;
       Eo.Base.constructor;
       Eo.Base.destructor;
-      Efl.Gfx.Base.visible.set;
-      Efl.Gfx.Base.visible.get;
-      Efl.Gfx.Base.color.set;
-      Efl.Gfx.Base.color.get;
-      Efl.Gfx.Base.color_part.set;
-      Efl.Gfx.Base.color_part.get;
-      Efl.Gfx.Base.size.get;
-      Efl.Gfx.Base.position.set;
-      Efl.Gfx.Base.position.get;
+      Efl.Gfx.visible.set;
+      Efl.Gfx.visible.get;
+      Efl.Gfx.color.set;
+      Efl.Gfx.color.get;
+      Efl.Gfx.color_part.set;
+      Efl.Gfx.color_part.get;
+      Efl.Gfx.size.get;
+      Efl.Gfx.position.set;
+      Efl.Gfx.position.get;
       Efl.Gfx.Stack.below.get;
       Efl.Gfx.Stack.above.get;
       Efl.Gfx.Stack.stack_below;

diff --git a/src/lib/evas/canvas/efl_vg_shape.eo b/src/lib/evas/canvas/efl_vg_shape.eo
index 10abbff..bee31b0 100644 (file)
--- a/src/lib/evas/canvas/efl_vg_shape.eo
+++ b/src/lib/evas/canvas/efl_vg_shape.eo
@@ -31,8 +31,8 @@ class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape)
       }
    }
    implements {
-      Efl.Gfx.Base.color_part.set;
-      Efl.Gfx.Base.color_part.get;
+      Efl.Gfx.color_part.set;
+      Efl.Gfx.color_part.get;
       Efl.VG.Base.bounds_get;
       Efl.VG.Base.interpolate;
       Efl.VG.Base.dup;

diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 6461776..4529d7b 100644 (file)
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -409,7 +409,7 @@ _evas_filter_efl_gfx_filter_filter_program_get(Eo *eo_obj EINA_UNUSED, Evas_Filt
 
 EOLIAN static void
 _evas_filter_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd,
-                                              const char *name, Efl_Gfx_Base *eo_source)
+                                              const char *name, Efl_Gfx *eo_source)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
    Evas_Filter_Proxy_Binding *pb, *pb_old = NULL;
@@ -490,7 +490,7 @@ update:
    evas_filter_dirty(eo_obj);
 }
 
-EOLIAN static Efl_Gfx_Base *
+EOLIAN static Efl_Gfx *
 _evas_filter_efl_gfx_filter_filter_source_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
                                               const char * name)
 {

diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index 65020c8..285ba6b 100644 (file)
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -1,6 +1,6 @@
 import evas_types;
 
-abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stack, Efl.Animator)
+abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator)
 {
    eo_prefix: evas_obj;
    data: Evas_Object_Protected_Data;
@@ -1225,16 +1225,16 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stac
       Eo.Base.destructor;
       Eo.Base.dbg_info_get;
       Evas.Common_Interface.evas.get;
-      Efl.Gfx.Base.visible.set;
-      Efl.Gfx.Base.visible.get;
-      Efl.Gfx.Base.position.set;
-      Efl.Gfx.Base.position.get;
-      Efl.Gfx.Base.color.set;
-      Efl.Gfx.Base.color.get;
-      Efl.Gfx.Base.color_part.set;
-      Efl.Gfx.Base.color_part.get;
-      Efl.Gfx.Base.size.set;
-      Efl.Gfx.Base.size.get;
+      Efl.Gfx.visible.set;
+      Efl.Gfx.visible.get;
+      Efl.Gfx.position.set;
+      Efl.Gfx.position.get;
+      Efl.Gfx.color.set;
+      Efl.Gfx.color.get;
+      Efl.Gfx.color_part.set;
+      Efl.Gfx.color_part.get;
+      Efl.Gfx.size.set;
+      Efl.Gfx.size.get;
       Efl.Gfx.Stack.layer.set;
       Efl.Gfx.Stack.layer.get;
       Efl.Gfx.Stack.below.get;

diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index ae8cc04..83a85bf 100644 (file)
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -849,7 +849,7 @@ evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 }
 
 EOLIAN static void
-_evas_object_efl_gfx_base_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
+_evas_object_efl_gfx_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
                                        Evas_Coord x, Evas_Coord y)
 {
 
@@ -940,7 +940,7 @@ evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
 }
 
 EOLIAN static void
-_evas_object_efl_gfx_base_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
+_evas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
                                    Evas_Coord w, Evas_Coord h)
 {
    Eina_Bool is, was = EINA_FALSE;
@@ -1030,7 +1030,7 @@ evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y
 }
 
 EOLIAN static void
-_evas_object_efl_gfx_base_position_get(Eo *obj EINA_UNUSED,
+_evas_object_efl_gfx_position_get(Eo *obj EINA_UNUSED,
                                        Evas_Object_Protected_Data *pd,
                                        Evas_Coord *x, Evas_Coord *y)
 {
@@ -1045,7 +1045,7 @@ _evas_object_efl_gfx_base_position_get(Eo *obj EINA_UNUSED,
 }
 
 EOLIAN static void
-_evas_object_efl_gfx_base_size_get(Eo *obj EINA_UNUSED,
+_evas_object_efl_gfx_size_get(Eo *obj EINA_UNUSED,
                                    Evas_Object_Protected_Data *pd,
                                    Evas_Coord *w, Evas_Coord *h)
 {
@@ -1310,7 +1310,7 @@ evas_object_visible_get(const Evas_Object *obj)
 }
 
 static void
-_evas_object_efl_gfx_base_visible_set(Eo *eo_obj,
+_evas_object_efl_gfx_visible_set(Eo *eo_obj,
                                       Evas_Object_Protected_Data *obj,
                                       Eina_Bool visible)
 {
@@ -1488,7 +1488,7 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
 }
 
 static Eina_Bool
-_evas_object_efl_gfx_base_visible_get(Eo *eo_obj EINA_UNUSED,
+_evas_object_efl_gfx_visible_get(Eo *eo_obj EINA_UNUSED,
                                          Evas_Object_Protected_Data *obj)
 {
    if (obj->delete_me) return EINA_FALSE;
@@ -1502,7 +1502,7 @@ evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a)
 }
 
 EOLIAN static void
-_evas_object_efl_gfx_base_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
+_evas_object_efl_gfx_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
                                     int r, int g, int b, int a)
 {
    if (obj->delete_me) return;
@@ -1559,13 +1559,13 @@ _evas_object_efl_gfx_base_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
 }
 
 EOLIAN static Eina_Bool
-_evas_object_efl_gfx_base_color_part_set(Eo *obj, Evas_Object_Protected_Data *pd,
+_evas_object_efl_gfx_color_part_set(Eo *obj, Evas_Object_Protected_Data *pd,
                                          const char *part,
                                          int r, int g, int b, int a)
 {
    if (part) return EINA_FALSE;
 
-   _evas_object_efl_gfx_base_color_set(obj, pd, r, g, b, a);
+   _evas_object_efl_gfx_color_set(obj, pd, r, g, b, a);
    return EINA_TRUE;
 }
 
@@ -1576,7 +1576,7 @@ evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a)
 }
 
 EOLIAN static void
-_evas_object_efl_gfx_base_color_get(Eo *eo_obj EINA_UNUSED,
+_evas_object_efl_gfx_color_get(Eo *eo_obj EINA_UNUSED,
                                     Evas_Object_Protected_Data *obj,
                                     int *r, int *g, int *b, int *a)
 {
@@ -1592,14 +1592,14 @@ _evas_object_efl_gfx_base_color_get(Eo *eo_obj EINA_UNUSED,
 }
 
 EOLIAN static Eina_Bool
-_evas_object_efl_gfx_base_color_part_get(Eo *obj,
+_evas_object_efl_gfx_color_part_get(Eo *obj,
                                          Evas_Object_Protected_Data *pd,
                                          const char *part,
                                          int *r, int *g, int *b, int *a)
 {
    if (part) return EINA_FALSE;
 
-   _evas_object_efl_gfx_base_color_get(obj, pd, r, g, b, a);
+   _evas_object_efl_gfx_color_get(obj, pd, r, g, b, a);
    return EINA_TRUE;
 }
 

diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 186200e..7e55f40 100644 (file)
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -972,7 +972,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t
 }
 
 EOLIAN static void
-_evas_text_efl_gfx_base_size_set(Eo *eo_obj, Evas_Text_Data *o, int w, int h)
+_evas_text_efl_gfx_size_set(Eo *eo_obj, Evas_Text_Data *o, int w, int h)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
 

diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 9e326a2..9c86ff3 100644 (file)
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -253,7 +253,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties, Evas.Filter)
       Eo.Base.constructor;
       Eo.Base.destructor;
       Eo.Base.dbg_info_get;
-      Efl.Gfx.Base.size.set;
+      Efl.Gfx.size.set;
       Efl.Text.text.set;
       Efl.Text.text.get;
       Efl.Text_Properties.font.get;

diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 10aa752..c120cf7 100644 (file)
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -87,7 +87,7 @@ _efl_vg_base_origin_get(Eo *obj EINA_UNUSED,
 }
 
 static void
-_efl_vg_base_efl_gfx_base_position_set(Eo *obj EINA_UNUSED,
+_efl_vg_base_efl_gfx_position_set(Eo *obj EINA_UNUSED,
                                        Efl_VG_Base_Data *pd,
                                        int x, int y)
 {
@@ -98,7 +98,7 @@ _efl_vg_base_efl_gfx_base_position_set(Eo *obj EINA_UNUSED,
 }
 
 static void
-_efl_vg_base_efl_gfx_base_position_get(Eo *obj EINA_UNUSED,
+_efl_vg_base_efl_gfx_position_get(Eo *obj EINA_UNUSED,
                                        Efl_VG_Base_Data *pd,
                                        int *x, int *y)
 {
@@ -107,7 +107,7 @@ _efl_vg_base_efl_gfx_base_position_get(Eo *obj EINA_UNUSED,
 }
 
 static void
-_efl_vg_base_efl_gfx_base_visible_set(Eo *obj EINA_UNUSED,
+_efl_vg_base_efl_gfx_visible_set(Eo *obj EINA_UNUSED,
                                       Efl_VG_Base_Data *pd, Eina_Bool v)
 {
    pd->visibility = v;
@@ -117,14 +117,14 @@ _efl_vg_base_efl_gfx_base_visible_set(Eo *obj EINA_UNUSED,
 
 
 static Eina_Bool
-_efl_vg_base_efl_gfx_base_visible_get(Eo *obj EINA_UNUSED,
+_efl_vg_base_efl_gfx_visible_get(Eo *obj EINA_UNUSED,
                                       Efl_VG_Base_Data *pd)
 {
    return pd->visibility;
 }
 
 static void
-_efl_vg_base_efl_gfx_base_color_set(Eo *obj EINA_UNUSED,
+_efl_vg_base_efl_gfx_color_set(Eo *obj EINA_UNUSED,
                                     Efl_VG_Base_Data *pd,
                                     int r, int g, int b, int a)
 {
@@ -157,18 +157,18 @@ _efl_vg_base_efl_gfx_base_color_set(Eo *obj EINA_UNUSED,
 }
 
 static Eina_Bool
-_efl_vg_base_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Base_Data *pd,
+_efl_vg_base_efl_gfx_color_part_set(Eo *obj, Efl_VG_Base_Data *pd,
                                          const char *part,
                                          int r, int g, int b, int a)
 {
    if (part) return EINA_FALSE;
 
-   _efl_vg_base_efl_gfx_base_color_set(obj, pd, r, g, b, a);
+   _efl_vg_base_efl_gfx_color_set(obj, pd, r, g, b, a);
    return EINA_TRUE;
 }
 
 static void
-_efl_vg_base_efl_gfx_base_color_get(Eo *obj EINA_UNUSED,
+_efl_vg_base_efl_gfx_color_get(Eo *obj EINA_UNUSED,
                                     Efl_VG_Base_Data *pd,
                                     int *r, int *g, int *b, int *a)
 {
@@ -179,13 +179,13 @@ _efl_vg_base_efl_gfx_base_color_get(Eo *obj EINA_UNUSED,
 }
 
 static Eina_Bool
-_efl_vg_base_efl_gfx_base_color_part_get(Eo *obj, Efl_VG_Base_Data *pd,
+_efl_vg_base_efl_gfx_color_part_get(Eo *obj, Efl_VG_Base_Data *pd,
                                          const char *part,
                                          int *r, int *g, int *b, int *a)
 {
    if (part) return EINA_FALSE;
 
-   _efl_vg_base_efl_gfx_base_color_get(obj, pd, r, g, b, a);
+   _efl_vg_base_efl_gfx_color_get(obj, pd, r, g, b, a);
    return EINA_TRUE;
 }
 
@@ -209,7 +209,7 @@ _efl_vg_base_mask_get(Eo *obj EINA_UNUSED, Efl_VG_Base_Data *pd)
 }
 
 static void
-_efl_vg_base_efl_gfx_base_size_get(Eo *obj,
+_efl_vg_base_efl_gfx_size_get(Eo *obj,
                                    Efl_VG_Base_Data *pd EINA_UNUSED,
                                    int *w, int *h)
 {

diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 1123fdf..0651c8c 100644 (file)
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -45,7 +45,7 @@ _efl_vg_shape_fill_get(Eo *obj EINA_UNUSED, Efl_VG_Shape_Data *pd)
 }
 
 static Eina_Bool
-_efl_vg_shape_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
+_efl_vg_shape_efl_gfx_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
                                           const char * part,
                                           int r, int g, int b, int a)
 {
@@ -63,7 +63,7 @@ _efl_vg_shape_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UN
 }
 
 static Eina_Bool
-_efl_vg_shape_efl_gfx_base_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
+_efl_vg_shape_efl_gfx_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
                                           const char * part,
                                           int *r, int *g, int *b, int *a)
 {