From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Thu, 15 Feb 2018 02:14:52 +0000 (-0500)
Subject: evas_grid: size -> grid_size
X-Git-Tag: upstream/1.21.0~1962
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb037e7d4ea51b0e0906e16a79f97b712f4e4884;p=platform%2Fupstream%2Fefl.git

evas_grid: size -> grid_size

this conflicted with efl_ui_base.size
---

diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index a314110..f1b32c7 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -4,18 +4,20 @@ class Evas.Grid (Efl.Canvas.Group)
    legacy_prefix: evas_object_grid;
    eo_prefix: evas_obj_grid;
    methods {
-      @property size {
+      @property grid_size {
          set {
             [[Set the virtual resolution for the grid
 
               @since 1.1]]
+            legacy: evas_object_grid_size_set;
          }
          get {
             [[Get the current virtual resolution
 
-              See also @.size.set
+              See also @.grid_size.set
 
               @since 1.1]]
+            legacy: evas_object_grid_size_get;
          }
          values {
             w: int; [[The virtual horizontal size (resolution) in integer units.]]
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 5c4cda9..fccc135 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -302,7 +302,7 @@ _evas_grid_add_to(Eo *parent, Evas_Grid_Data *_pd EINA_UNUSED)
 }
 
 EOLIAN static void
-_evas_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h)
+_evas_grid_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h)
 {
    if ((priv->size.w == w) && (priv->size.h == h)) return;
    priv->size.w = w;
@@ -311,7 +311,7 @@ _evas_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h)
 }
 
 EOLIAN static void
-_evas_grid_size_get(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, int *w, int *h)
+_evas_grid_grid_size_get(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, int *w, int *h)
 {
    if (w) *w = priv->size.w;
    if (h) *h = priv->size.h;