Adjusted code to use the Eo2 API.

8 files changed, 14 insertions, 24 deletions

diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 0ec50ca..6a9e9c2 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
         eo_do(o_images[i], evas_obj_position_set(x, y),
                            evas_obj_size_set(w, h),
                            evas_obj_image_fill_set(0, 0, w, h),
-                           evas_obj_image_data_get(1, (void **) &data),
-                           evas_obj_image_stride_get(&st));
+                           data = evas_obj_image_data_get(1),
+                           st = evas_obj_image_stride_get());
         st = st >> 2;
         p = data;
         for (y = 0; y < h; y++)
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 39211a7..1a1087a 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
         eo_do(o_images[i], evas_obj_position_set(x, y),
                            evas_obj_size_set(w, h),
                            evas_obj_image_fill_set(0, 0, w, h),
-                           evas_obj_image_data_get(1, (void **) &data),
-                           evas_obj_image_stride_get(&st));
+                           data = evas_obj_image_data_get(1),
+                           st = evas_obj_image_stride_get());
         st = st >> 2;
         p = data;
         for (y = 0; y < h; y++)
diff --git a/src/bin/main.c b/src/bin/main.c
index 432cceb..cbfc203 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1390,12 +1390,10 @@ main(int argc, char **argv)
         ui_loop();
         if (async_render)
           {
-             Eina_Bool ret = EINA_FALSE;
-
              if (evas)
                eo_do(evas,
                      evas_canvas_sync(),
-                     evas_canvas_render_async(&ret));
+                     evas_canvas_render_async());
           }
         else
           {
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index 72a8af3..d539255 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -36,7 +36,7 @@ static void _setup(void)
         o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         o_images[i] = o;
         if (o)
-        eo_do(o, evas_obj_image_source_set(src, NULL),
+        eo_do(o, evas_obj_image_source_set(src),
                  evas_obj_size_set(120, 160),
                  evas_obj_image_fill_set(0,0,120,160),
                  evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 15fef33..3b8d8c8 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -49,7 +49,7 @@ static void _setup(void)
         o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         o_texts[i] = o;
         if (o)
-        eo_do(o, evas_obj_image_source_set(s, NULL));
+        eo_do(o, evas_obj_image_source_set(s));
         /* FIXME s == NULL*/
         if (s)
         eo_do(s, evas_obj_size_get(&w, &h));
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 5b7790b..812ba2f 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -58,7 +58,7 @@ static void _setup(void)
         o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         o_texts[i] = o;
         if (o)
-        eo_do(o, evas_obj_image_source_set(o_texts[0], NULL));
+        eo_do(o, evas_obj_image_source_set(o_texts[0]));
         if (o_texts[0])
         eo_do(o_texts[0], evas_obj_size_get(&w, &h));
         if (o)
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index 00c4c6b..54a70c8 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -117,7 +117,7 @@ static void _loop(double t, int f)
    Evas_Textblock_Cursor *cur;
    static Evas_Textblock_Cursor *cur2;
    if (o_text)
-        eo_do(o_text, evas_obj_textblock_cursor_get(&cur));
+        eo_do(o_text, cur = evas_obj_textblock_cursor_get());
    evas_textblock_cursor_text_append(cur, "*");
    evas_textblock_cursor_char_delete(cur);
 
@@ -125,7 +125,7 @@ static void _loop(double t, int f)
    if (!cur2)
      {
         if (o_text)
-        eo_do(o_text, evas_obj_textblock_cursor_new(&cur2));
+        eo_do(o_text, cur2 = evas_obj_textblock_cursor_new());
         evas_textblock_cursor_paragraph_last(cur2);
         evas_textblock_cursor_paragraph_char_first(cur2);
      }
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 68c025a..b5a28a4 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -276,12 +276,10 @@ _ui_all(void)
              ui_loop();
              if (async_render)
                {
-                  Eina_Bool ret = EINA_FALSE;
-
                   if (evas)
                     eo_do(evas,
                           evas_canvas_sync(),
-                          evas_canvas_render_async(&ret));
+                          evas_canvas_render_async());
                }
              else
                {
@@ -293,12 +291,10 @@ _ui_all(void)
            counted at all. */
         if (async_render)
           {
-             Eina_Bool ret = EINA_FALSE;
-
              if (evas)
                eo_do(evas,
                      evas_canvas_sync(),
-                     evas_canvas_render_async(&ret));
+                     evas_canvas_render_async());
           }
         else
           {
@@ -415,12 +411,10 @@ _ui_num(int n)
              engine_loop();
              if (async_render)
                {
-                  Eina_Bool ret = EINA_FALSE;
-
                   if (evas)
                     eo_do(evas,
                           evas_canvas_sync(),
-                          evas_canvas_render_async(&ret));
+                          evas_canvas_render_async());
                }
              else
                {
@@ -432,12 +426,10 @@ _ui_num(int n)
            counted at all. */
         if (async_render)
           {
-             Eina_Bool ret = EINA_FALSE;
-
              if (evas)
                eo_do(evas,
                      evas_canvas_sync(),
-                     evas_canvas_render_async(&ret));
+                     evas_canvas_render_async());
           }
         else
           {