cedric pushed a commit to branch master.
http://git.enlightenment.org/tools/expedite.git/commit/?id=051a4ec0cf9245d086e8df9d426e57b1805a3d37
commit 051a4ec0cf9245d086e8df9d426e57b1805a3d37
Author: Cedric BAIL <ced...@osg.samsung.com>
Date: Thu Mar 17 16:53:27 2016 -0700
migrate to new efl api.
---
src/bin/image_blend_border.c | 2 +-
src/bin/image_blend_border_recolor.c | 2 +-
src/bin/image_blend_solid_border.c | 2 +-
src/bin/image_blend_solid_middle_border.c | 4 ++--
src/bin/image_blend_solid_middle_unscaled.c | 4 ++--
src/bin/ui.c | 2 +-
src/bin/widgets_list_1.c | 4 ++--
src/bin/widgets_list_1_grouped.c | 4 ++--
src/bin/widgets_list_2.c | 4 ++--
src/bin/widgets_list_2_grouped.c | 4 ++--
src/bin/widgets_list_3.c | 8 ++++----
src/bin/widgets_list_3_grouped.c | 8 ++++----
src/bin/widgets_list_4.c | 8 ++++----
src/bin/widgets_list_4_grouped.c | 8 ++++----
14 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 9cff6df..9056755 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("bar.png"), NULL);
- evas_obj_image_border_set(o, 6, 6, 6, 6);
+ efl_image_border_set(o, 6, 6, 6, 6);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
diff --git a/src/bin/image_blend_border_recolor.c
b/src/bin/image_blend_border_recolor.c
index 806cab7..37a8304 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -27,7 +27,7 @@ static void _setup(void)
o_images[i] = o;
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_color_set(o, 64, 64, 64, 255);
- evas_obj_image_border_set(o, 3, 3, 3, 3);
+ efl_image_border_set(o, 3, 3, 3, 3);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
diff --git a/src/bin/image_blend_solid_border.c
b/src/bin/image_blend_solid_border.c
index 15430dc..b58670f 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("frame.png"), NULL);
- evas_obj_image_border_set(o, 8, 8, 8, 8);
+ efl_image_border_set(o, 8, 8, 8, 8);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
diff --git a/src/bin/image_blend_solid_middle_border.c
b/src/bin/image_blend_solid_middle_border.c
index bf5636f..b80e615 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -26,8 +26,8 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
efl_file_set(o, build_path("bar.png"), NULL);
- evas_obj_image_border_set(o, 6, 6, 6, 6);
- evas_obj_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
+ efl_image_border_set(o, 6, 6, 6, 6);
+ efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
diff --git a/src/bin/image_blend_solid_middle_unscaled.c
b/src/bin/image_blend_solid_middle_unscaled.c
index d607b25..8a2aecd 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -28,8 +28,8 @@ static void _setup(void)
efl_file_set(o, build_path("logo.png"), NULL);
efl_gfx_fill_set(o, 0, 0, 120, 160);
efl_gfx_size_set(o, 120, 160);
- evas_obj_image_border_set(o, 43, 48, 48, 83);
- evas_obj_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
+ efl_image_border_set(o, 43, 48, 48, 83);
+ efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
efl_gfx_visible_set(o, EINA_TRUE);
}
done = 0;
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 75c6ec0..94a9bdc 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -458,7 +458,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
efl_file_set(o, build_path("text_sel.png"), NULL);
efl_gfx_size_set(o, 96, 32);
efl_gfx_fill_set(o, 0, 0, 96, 32);
- evas_obj_image_border_set(o, 7, 7, 7, 7);
+ efl_image_border_set(o, 7, 7, 7, 7);
o_menu_text_sel = o;
o = eo_add(EVAS_TEXT_CLASS, evas);
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index b0e9085..526d888 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -64,8 +64,8 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index 07c9d87..1c8ab3c 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -64,8 +64,8 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index e232d7d..6785d27 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -64,8 +64,8 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index c3da64a..1568c3e 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -64,8 +64,8 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index 8e6af2c..cd388a1 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -85,16 +85,16 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
efl_gfx_visible_set(o, EINA_TRUE);
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_icons[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path(icons[i % 13]), NULL);
efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index dda2692..7d6eb8b 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -85,16 +85,16 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
efl_gfx_visible_set(o, EINA_TRUE);
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_icons[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path(icons[i % 13]), NULL);
efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index 2779b63..52f2eb4 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -85,16 +85,16 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
efl_gfx_visible_set(o, EINA_TRUE);
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_icons[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path(icons[i % 13]), NULL);
efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
efl_gfx_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 8283151..377c27a 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -85,16 +85,16 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path("pan.png"), NULL);
efl_gfx_size_set(o, win_w, ICON_SIZE);
efl_gfx_visible_set(o, EINA_TRUE);
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_icons[i] = o;
- evas_obj_image_filled_set(o, 1);
- evas_obj_image_border_set(o, 2, 2, 2, 2);
+ efl_gfx_fill_filled_set(o, 1);
+ efl_image_border_set(o, 2, 2, 2, 2);
efl_file_set(o, build_path(icons[i % 13]), NULL);
efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8);
efl_gfx_visible_set(o, EINA_TRUE);
--
