aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-17 14:57:31 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-17 19:25:48 +0900
commit42b63f55074fe63066a8046c6211dbb82dbe36cb (patch)
treeccaaf90810b2193102d5fd6f87233c2a32ce2780 /src/lib/emotion
parentEvas: Move smart_members_get to legacy (diff)
downloadefl-42b63f55074fe63066a8046c6211dbb82dbe36cb.tar.gz
Evas: Add smart_ prefix to all smart functions (eo)
This is a first step at separating legacy smart object features away from standard efl interfaces.
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/emotion_object.eo18
-rw-r--r--src/lib/emotion/emotion_smart.c18
2 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/emotion/emotion_object.eo b/src/lib/emotion/emotion_object.eo
index 5194cd7439..8ebdbedd89 100644
--- a/src/lib/emotion/emotion_object.eo
+++ b/src/lib/emotion/emotion_object.eo
@@ -54,15 +54,15 @@ class Emotion.Object (Evas.Object.Smart, Efl.File, Efl.Player, Efl.Image, Efl.Im
}
implements {
Eo.Base.constructor;
- Evas.Object.Smart.add;
- Evas.Object.Smart.del;
- Evas.Object.Smart.move;
- Evas.Object.Smart.resize;
- Evas.Object.Smart.show;
- Evas.Object.Smart.hide;
- Evas.Object.Smart.color.set;
- Evas.Object.Smart.clip.set;
- Evas.Object.Smart.clip_unset;
+ Evas.Object.Smart.smart_add;
+ Evas.Object.Smart.smart_del;
+ Evas.Object.Smart.smart_move;
+ Evas.Object.Smart.smart_resize;
+ Evas.Object.Smart.smart_show;
+ Evas.Object.Smart.smart_hide;
+ Evas.Object.Smart.smart_color.set;
+ Evas.Object.Smart.smart_clip.set;
+ Evas.Object.Smart.smart_clip_unset;
Efl.File.file.set;
Efl.File.file.get;
Efl.Player.play.set;
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 7bfa18a94e..3df5b60846 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -1829,7 +1829,7 @@ _pixels_get(void *data, Evas_Object *obj)
/*******************************************/
EOLIAN static void
-_emotion_object_evas_object_smart_add(Evas_Object *obj, Emotion_Object_Data *sd)
+_emotion_object_evas_object_smart_smart_add(Evas_Object *obj, Emotion_Object_Data *sd)
{
unsigned int *pixel;
@@ -1864,7 +1864,7 @@ _emotion_object_evas_object_smart_add(Evas_Object *obj, Emotion_Object_Data *sd)
}
EOLIAN static void
-_emotion_object_evas_object_smart_del(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_evas_object_smart_smart_del(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
if (!sd) return;
if (sd->engine_instance)
@@ -1895,7 +1895,7 @@ _emotion_object_evas_object_smart_del(Evas_Object *obj EINA_UNUSED, Emotion_Obje
}
EOLIAN static void
-_emotion_object_evas_object_smart_move(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord x, Evas_Coord y)
+_emotion_object_evas_object_smart_smart_move(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord x, Evas_Coord y)
{
int w, h;
@@ -1905,14 +1905,14 @@ _emotion_object_evas_object_smart_move(Evas_Object *obj, Emotion_Object_Data *sd
}
EOLIAN static void
-_emotion_object_evas_object_smart_resize(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord w, Evas_Coord h)
+_emotion_object_evas_object_smart_smart_resize(Evas_Object *obj, Emotion_Object_Data *sd, Evas_Coord w, Evas_Coord h)
{
_emotion_object_aspect_border_apply(obj, sd, w, h);
evas_object_resize(sd->bg, w, h);
}
EOLIAN static void
-_emotion_object_evas_object_smart_show(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_evas_object_smart_smart_show(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
int a;
@@ -1924,7 +1924,7 @@ _emotion_object_evas_object_smart_show(Evas_Object *obj EINA_UNUSED, Emotion_Obj
}
EOLIAN static void
-_emotion_object_evas_object_smart_hide(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_evas_object_smart_smart_hide(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
evas_object_hide(sd->obj);
if (sd->crop.clipper) evas_object_hide(sd->crop.clipper);
@@ -1932,14 +1932,14 @@ _emotion_object_evas_object_smart_hide(Evas_Object *obj EINA_UNUSED, Emotion_Obj
}
EOLIAN static void
-_emotion_object_evas_object_smart_color_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, int r, int g, int b, int a)
+_emotion_object_evas_object_smart_smart_color_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, int r, int g, int b, int a)
{
evas_object_color_set(sd->obj, r, g, b, a);
evas_object_color_set(sd->crop.clipper, r, g, b, a);
}
EOLIAN static void
-_emotion_object_evas_object_smart_clip_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, Evas_Object * clip)
+_emotion_object_evas_object_smart_smart_clip_set(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd, Evas_Object * clip)
{
if (sd->crop.clipper) evas_object_clip_set(sd->crop.clipper, clip);
else evas_object_clip_set(sd->obj, clip);
@@ -1947,7 +1947,7 @@ _emotion_object_evas_object_smart_clip_set(Evas_Object *obj EINA_UNUSED, Emotion
}
EOLIAN static void
-_emotion_object_evas_object_smart_clip_unset(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
+_emotion_object_evas_object_smart_smart_clip_unset(Evas_Object *obj EINA_UNUSED, Emotion_Object_Data *sd)
{
if (sd->crop.clipper) evas_object_clip_unset(sd->crop.clipper);
else evas_object_clip_unset(sd->obj);