From 5974ff017525024fbcdb124148159a8f80f69323 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Thu, 16 Jun 2016 17:45:29 +0900
Subject: [PATCH] Evas: Move smart_clipped_clipper to its class

It was in Evas.Object, probably to make it work without any ERR
message on invalid objects. Not worth it right now...
---
 src/lib/evas/canvas/evas_object.eo              | 10 ----------
 src/lib/evas/canvas/evas_object_smart_clipped.c |  8 +++-----
 src/lib/evas/canvas/evas_smart_clipped.eo       | 13 +++++++++++++
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index 3cadac8c01..df19118a8f 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -467,16 +467,6 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack,
                                 $false otherwise.]]
          }
       }
-      @property smart_clipped_clipper {
-         get {
-            [[Get the clipper object for the given clipped smart object.
-
-              Use this function if you want to change any of this clipper's
-              properties, like colors.
-            ]]
-            return: Evas.Object @warn_unused;
-         }
-      }
       @property clipees {
          get {
             [[Return a list of objects currently clipped by $obj.
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index 8584223f73..d8061de897 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -35,12 +35,10 @@ _evas_object_smart_move_children_relative(Eo *eo_obj, Evas_Object_Protected_Data
      }
 }
 
-EOLIAN Evas_Object *
-_evas_object_smart_clipped_clipper_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED)
+static EOLIAN Evas_Object *
+_evas_object_smart_clipped_smart_clipped_clipper_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Smart_Clipped_Data *obj)
 {
-   CSO_DATA_GET(eo_obj, cso)
-   if (!cso) return NULL;
-   else return cso->clipper;
+   return obj->clipper;
 }
 
 static void
diff --git a/src/lib/evas/canvas/evas_smart_clipped.eo b/src/lib/evas/canvas/evas_smart_clipped.eo
index 4f0b93a840..42aae3d001 100644
--- a/src/lib/evas/canvas/evas_smart_clipped.eo
+++ b/src/lib/evas/canvas/evas_smart_clipped.eo
@@ -7,6 +7,19 @@ class Evas.Smart.Clipped (Evas.Object.Smart)
    eo_prefix: evas_obj_smart_clipped;
    data: Evas_Object_Smart_Clipped_Data;
 
+   methods {
+      @property smart_clipped_clipper {
+         get {
+            [[Get the clipper object for the given clipped smart object.
+
+              Use this function if you want to change any of this clipper's
+              properties, like colors.
+            ]]
+            return: Evas.Object @warn_unused;
+         }
+      }
+   }
+
    implements {
       Eo.Base.constructor;
       Evas.Object.Smart.hide;