cleanup, remove warning, useless if and tab .

src/bin/about.c

@@ -9,7 +9,6 @@ _setup(void)
    Evas_Textblock_Style *st;
 
    o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
-   if (o)
    eo_do(o, evas_obj_position_set(10, 40),
          evas_obj_size_set(win_w - 20, win_h - 50),
          evas_obj_visibility_set(EINA_TRUE));
@@ -22,7 +21,6 @@ _setup(void)
       "p='+ font=Vera font_size=10 align=left'"
       "/p='- \n \n'"
       );
-   if (o)
    eo_do(o, evas_obj_textblock_style_set(st),
          evas_obj_textblock_clear(),
          evas_obj_textblock_text_markup_set
@@ -57,7 +55,8 @@ _cleanup(void)
 }
 
 static void
-_loop(double t __UNUSED__, int f __UNUSED__)
+_loop(double t EINA_UNUSED,
+      int f EINA_UNUSED)
 {
 }
 

src/bin/image_blend_border.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
+              evas_obj_image_file_set(build_path("bar.png"), NULL),
               evas_obj_image_border_set(6, 6, 6, 6),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -55,8 +55,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_border_recolor.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("pan.png"), NULL),
+              evas_obj_image_file_set(build_path("pan.png"), NULL),
               evas_obj_color_set(64, 64, 64, 255),
               evas_obj_image_border_set(3, 3, 3, 3),
               evas_obj_visibility_set(EINA_TRUE));
@@ -56,8 +56,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_fade_pow2_unscaled.c

@@ -27,14 +27,14 @@ static void _setup(void)
 
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_color_set(a, a, a, a),
+              evas_obj_color_set(a, a, a, a),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
@@ -60,7 +60,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/image_blend_fade_unscaled.c

@@ -26,13 +26,12 @@ static void _setup(void)
         int a;
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
-                 evas_obj_image_fill_set(0, 0, 120, 160),
-                 evas_obj_size_set(120, 160));
         a = rnd()&0xff;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_color_set(a, a, a, a),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160),
+              evas_obj_color_set(a, a, a, a),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
@@ -58,7 +57,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/image_blend_many_smooth_same_scaled.c

@@ -30,7 +30,6 @@ static void _setup(void)
         n = rnd() % 100;
         w = 3 + ((n * (60 - 3)) / 100);
         h = 4 + ((n * (80 - 4)) / 100);
-        if (o)
         eo_do(o,
               evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_smooth_scale_set(1),
@@ -60,7 +59,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/image_blend_nearest_same_scaled.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -55,8 +55,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_nearest_scaled.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -55,8 +55,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_nearest_solid_same_scaled.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -55,8 +55,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_nearest_solid_scaled.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_smooth_scale_set(0),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -55,8 +55,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_occlude1.c

@@ -28,22 +28,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -72,7 +70,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_occlude1_few.c

@@ -31,22 +31,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -75,7 +73,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_occlude1_many.c

@@ -31,22 +31,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -75,7 +73,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_occlude1_very_many.c

@@ -31,22 +31,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i < (OBNUM / 2))
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -75,7 +73,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_occlude2.c

@@ -28,22 +28,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -72,7 +70,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_occlude2_few.c

@@ -31,22 +31,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -75,7 +73,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_occlude2_many.c

@@ -31,22 +31,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -75,7 +73,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_occlude2_very_many.c

@@ -31,22 +31,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i & 0x1)
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -75,7 +73,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_occlude3.c

@@ -28,22 +28,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -72,7 +70,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_occlude3_few.c

@@ -31,22 +31,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -75,7 +73,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_occlude3_many.c

@@ -31,22 +31,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -75,7 +73,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_occlude3_very_many.c

@@ -31,22 +31,20 @@ static void _setup(void)
         o_images[i] = o;
         if (i > (OBNUM / 2))
           {
-             if (o)
              eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
           }
         else
           {
              Evas_Coord x, y;
 
-             if (o)
-               eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
              x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
              y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
-             if (o)
+             eo_do(o,
-               eo_do(o, evas_obj_position_set(x, y));
+                   evas_obj_image_file_set(build_path("image.png"), NULL),
+                   evas_obj_position_set(x, y));
           }
-        if (o)
+        eo_do(o,
-          eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -75,7 +73,6 @@ static void _loop(double t, int f)
              x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
              y = (win_h / 2) - (h / 2);
              y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_position_set(x, y));
           }
      }

src/bin/image_blend_smooth_same_scaled.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_smooth_scale_set(1),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -55,8 +55,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_smooth_scaled.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_smooth_scale_set(1),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -55,8 +55,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_smooth_solid_same_scaled.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_smooth_scale_set(1),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -55,8 +55,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_smooth_solid_scaled.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_smooth_scale_set(1),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -55,8 +55,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_solid_border.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("frame.png"), NULL),
+              evas_obj_image_file_set(build_path("frame.png"), NULL),
               evas_obj_image_border_set(8, 8, 8, 8),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -55,8 +55,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_solid_fade_pow2_unscaled.c

@@ -27,14 +27,14 @@ static void _setup(void)
 
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160));
         a = 256 - (1 << ((rnd() % 8) + 1));
         if (a < 128) a = 128;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_color_set(a, a, a, a),
+              evas_obj_color_set(a, a, a, a),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
@@ -60,7 +60,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/image_blend_solid_fade_unscaled.c

@@ -27,13 +27,13 @@ static void _setup(void)
 
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160));
         a = rnd()&0xff;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_color_set(a, a, a, a),
+              evas_obj_color_set(a, a, a, a),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
@@ -59,7 +59,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/image_blend_solid_middle_border.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
+              evas_obj_image_file_set(build_path("bar.png"), NULL),
               evas_obj_image_border_set(6, 6, 6, 6),
               evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
               evas_obj_visibility_set(EINA_TRUE));
@@ -56,8 +56,8 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h));
      }

src/bin/image_blend_solid_middle_unscaled.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_image_border_set(43, 48, 48, 83),
@@ -56,7 +56,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/image_blend_solid_unscaled.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
@@ -54,7 +54,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/image_blend_unscaled.c

@@ -25,8 +25,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
@@ -54,7 +54,6 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/image_crossfade.c

@@ -24,16 +24,16 @@ static void _setup(void)
 
    o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_images[0] = o;
-   if (o)
+   eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("im1.png"), NULL),
+         evas_obj_image_file_set(build_path("im1.png"), NULL),
          evas_obj_image_fill_set(0, 0, 720, 420),
          evas_obj_size_set(720, 420),
          evas_obj_visibility_set(EINA_TRUE));
 
    o = eo_add(EVAS_IMAGE_CLASS, evas);
    o_images[1] = o;
-   if (o)
+   eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("im2.png"), NULL),
+         evas_obj_image_file_set(build_path("im2.png"), NULL),
          evas_obj_image_fill_set(0, 0, 720, 420),
          evas_obj_size_set(720, 420),
          evas_obj_visibility_set(EINA_TRUE));
@@ -55,7 +55,6 @@ static void _loop(double t, int f)
 
    a = f & 0x1f;
    a = ((a << 3) | (a >> 2)) & 0xff;
-   if (o_images[1])
    eo_do(o_images[1], evas_obj_color_set(a, a, a, a));
    FPS_STD(NAME);
 }

src/bin/image_data_argb.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
               evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
               evas_obj_image_size_set(640, 480),
               evas_obj_image_alpha_set(0),
@@ -58,8 +58,8 @@ static void _loop(double t, int f)
         h = 480;
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h),
               data = evas_obj_image_data_get(1),
@@ -75,8 +75,8 @@ static void _loop(double t, int f)
                }
              p += (st - w);
           }
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_image_data_set(data),
+              evas_obj_image_data_set(data),
               evas_obj_image_data_update_add( 0, 0, w, h));
      }
    FPS_STD(NAME);

src/bin/image_data_argb_alpha.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
               evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
               evas_obj_image_size_set(640, 480),
               evas_obj_image_alpha_set(1),
@@ -58,8 +58,8 @@ static void _loop(double t, int f)
         h = 480;
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h),
               data = evas_obj_image_data_get(1),
@@ -86,8 +86,8 @@ static void _loop(double t, int f)
                }
              p += (st - w);
           }
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_image_data_set(data),
+              evas_obj_image_data_set(data),
               evas_obj_image_data_update_add( 0, 0, w, h));
      }
    FPS_STD(NAME);

src/bin/image_data_ycbcr601pl.c

@@ -23,15 +23,14 @@ static void _setup(void)
 {
    int i, y;
    FILE *f;
-   size_t r;
    unsigned char **data, **lp;
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
               evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
               evas_obj_image_size_set(640, 480),
               evas_obj_image_alpha_set(0),
@@ -44,9 +43,9 @@ static void _setup(void)
         f = fopen(build_path("tp.yuv"), "rb");
         if (f)
           {
-             r = fread(yp, 640 * 480, 1, f);
+             fread(yp, 640 * 480, 1, f);
-             r = fread(up, 320 * 240, 1, f);
+             fread(up, 320 * 240, 1, f);
-             r = fread(vp, 320 * 240, 1, f);
+             fread(vp, 320 * 240, 1, f);
              fclose(f);
           }
         data = evas_object_image_data_get(o_images[i], 1);
@@ -66,7 +65,6 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
@@ -93,8 +91,8 @@ static void _loop(double t, int f)
         h = 480;
         x = (win_w / 2) - (w / 2);
         y = (win_h / 2) - (h / 2);
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              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_update_add( 0, 0, 640, 480));

src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c

@@ -24,14 +24,13 @@ static void _setup(void)
    int i, y;
    FILE *f;
    unsigned char **data, **lp;
-   size_t r;
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
               evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
               evas_obj_image_size_set(640, 480),
               evas_obj_image_alpha_set(0),
@@ -45,9 +44,9 @@ static void _setup(void)
         f = fopen(build_path("tp.yuv"), "rb");
         if (f)
           {
-             r = fread(yp, 640 * 480, 1, f);
+             fread(yp, 640 * 480, 1, f);
-             r = fread(up, 320 * 240, 1, f);
+             fread(up, 320 * 240, 1, f);
-             r = fread(vp, 320 * 240, 1, f);
+             fread(vp, 320 * 240, 1, f);
              fclose(f);
           }
         data = evas_object_image_data_get(o_images[i], 1);
@@ -67,7 +66,6 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
@@ -102,8 +100,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_data_ycbcr601pl_map_solid_rotate.c

@@ -24,14 +24,13 @@ static void _setup(void)
    int i, y;
    FILE *f;
    unsigned char **data, **lp;
-   size_t r;
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
               evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
               evas_obj_image_size_set(640, 480),
               evas_obj_image_alpha_set(0),
@@ -44,9 +43,9 @@ static void _setup(void)
         f = fopen(build_path("tp.yuv"), "rb");
         if (f)
           {
-             r = fread(yp, 640 * 480, 1, f);
+             fread(yp, 640 * 480, 1, f);
-             r = fread(up, 320 * 240, 1, f);
+             fread(up, 320 * 240, 1, f);
-             r = fread(vp, 320 * 240, 1, f);
+             fread(vp, 320 * 240, 1, f);
              fclose(f);
           }
         data = evas_object_image_data_get(o_images[i], 1);
@@ -66,7 +65,6 @@ static void _setup(void)
              *lp = vp + (y * 320);
              lp++;
           }
-        if (o_images[i])
         eo_do(o_images[i], evas_obj_image_data_set(data));
      }
    done = 0;
@@ -100,8 +98,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_data_ycbcr601pl_wide_stride.c

@@ -23,15 +23,14 @@ static void _setup(void)
 {
    int i, y;
    FILE *f;
-   size_t r;
    unsigned char **data, **lp;
    Evas_Object *o;
    for (i = 0; i < 1; i++)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+              evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
               evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
               evas_obj_image_size_set(320, 480),
               evas_obj_image_alpha_set(0),
@@ -44,9 +43,9 @@ static void _setup(void)
         f = fopen(build_path("tp.yuv"), "rb");
         if (f)
           {
-             r = fread(yp, 640 * 480, 1, f);
+             fread(yp, 640 * 480, 1, f);
-             r = fread(up, 320 * 240, 1, f);
+             fread(up, 320 * 240, 1, f);
-             r = fread(vp, 320 * 240, 1, f);
+             fread(vp, 320 * 240, 1, f);
              fclose(f);
           }
         data = evas_object_image_data_get(o_images[i], 1);
@@ -68,8 +67,8 @@ static void _setup(void)
                   *lp = vp + (y * 320);
                   lp++;
                }
-             if (o_images[i])
+             eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_image_data_set(data),
+                   evas_obj_image_data_set(data),
                    evas_obj_image_data_update_add( 0, 0, 320, 480));
           }
      }
@@ -99,12 +98,10 @@ static void _loop(double t, int f)
 	h = 480;
 	x = (win_w / 2) - (w / 2);
 	y = (win_h / 2) - (h / 2);
-	if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y));
+              evas_obj_position_set(x, y),
-	if (o_images[i])
+              evas_obj_size_set(w, h),
-	eo_do(o_images[i], evas_obj_size_set(w, h));
+              evas_obj_image_fill_set(0, 0, w, h));
-	if (o_images[i])
-	eo_do(o_images[i], evas_obj_image_fill_set(0, 0, w, h));
 
 	w = 320 - 16 + f;
 	if (w < 1) w = 1;
@@ -112,7 +109,6 @@ static void _loop(double t, int f)
 
 	w &= ~0x1;
 
-	if (o_images[i])
 	eo_do(o_images[i], evas_obj_image_size_set(w, 480));
 	data = evas_object_image_data_get(o_images[i], 1);
 	if (data)
@@ -133,10 +129,9 @@ static void _loop(double t, int f)
 		  *lp = vp + (y * 320);
 		  lp++;
 	       }
-	     if (o_images[i])
+             eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_image_data_set(data));
+                   evas_obj_image_data_set(data),
-	     if (o_images[i])
+                   evas_obj_image_data_update_add( 0, 0, w, 480));
-	eo_do(o_images[i], evas_obj_image_data_update_add( 0, 0, w, 480));
 	  }
      }
    FPS_STD(NAME);

src/bin/image_map_3d_1.c

@@ -57,8 +57,8 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
               evas_obj_image_smooth_scale_set(0),
@@ -131,14 +131,15 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
         if (evas_map_util_clockwise_get(m))
           {
-             if (c->side[i].o)
+             eo_do(c->side[i].o,
-	eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+                   evas_obj_map_enable_set(1),
                    evas_obj_map_set(m),
                    evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          if (c->side[i].o)
+          {
              eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          }
 
         order[i] = i;
         for (j = 0; j < 4; j++)
@@ -162,10 +163,8 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
    eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
      eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 

src/bin/image_map_3d_2.c

@@ -57,8 +57,8 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
               evas_obj_visibility_set(EINA_TRUE));
@@ -129,14 +129,15 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
         if (evas_map_util_clockwise_get(m))
           {
-             if (c->side[i].o)
+             eo_do(c->side[i].o,
-	eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+                   evas_obj_map_enable_set(1),
                    evas_obj_map_set(m),
                    evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          if (c->side[i].o)
+          {
              eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          }
 
         order[i] = i;
         for (j = 0; j < 4; j++)
@@ -160,10 +161,8 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
    eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
      eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 

src/bin/image_map_3d_3.c

@@ -57,8 +57,8 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
               evas_obj_image_smooth_scale_set(0),
@@ -129,8 +129,8 @@ _cube_pos(Cube *c,
                                   255, 255, 255,
                                   20, 20, 20);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
-        if (c->side[i].o)
+        eo_do(c->side[i].o,
-	eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
 
         order[i] = i;
@@ -155,10 +155,8 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
    eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
      eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 

src/bin/image_map_3d_4.c

@@ -57,8 +57,8 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
               evas_obj_visibility_set(EINA_TRUE));
@@ -127,8 +127,8 @@ _cube_pos(Cube *c,
                                   255, 255, 255,
                                   20, 20, 20);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
-        if (c->side[i].o)
+        eo_do(c->side[i].o,
-	eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
 
         order[i] = i;
@@ -153,10 +153,8 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
    eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
      eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 

src/bin/image_map_3d_5.c

@@ -57,8 +57,8 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 720, 420),
               evas_obj_size_set(720, 420),
               evas_obj_image_smooth_scale_set(0),
@@ -131,14 +131,15 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
         if (evas_map_util_clockwise_get(m))
           {
-             if (c->side[i].o)
+             eo_do(c->side[i].o,
-	eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+                   evas_obj_map_enable_set(1),
                    evas_obj_map_set(m),
                    evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          if (c->side[i].o)
+          {
              eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          }
 
         order[i] = i;
         for (j = 0; j < 4; j++)
@@ -162,10 +163,8 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
    eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
      eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 

src/bin/image_map_3d_6.c

@@ -57,8 +57,8 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         c->side[i].o = o;
         snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 720, 420),
               evas_obj_size_set(720, 420),
               evas_obj_image_smooth_scale_set(0),
@@ -128,14 +128,15 @@ _cube_pos(Cube *c,
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
         if (evas_map_util_clockwise_get(m))
           {
-             if (c->side[i].o)
+             eo_do(c->side[i].o,
-	eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+                   evas_obj_map_enable_set(1),
                    evas_obj_map_set(m),
                    evas_obj_visibility_set(EINA_TRUE));
           }
         else
-          if (c->side[i].o)
+          {
              eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+          }
 
         order[i] = i;
         for (j = 0; j < 4; j++)
@@ -159,10 +160,8 @@ _cube_pos(Cube *c,
      }
    while (!sorted);
 
-   if (c->side[order[0]].o)
    eo_do(c->side[order[0]].o, evas_obj_raise());
    for (i = 1; i < 6; i++)
-     if (c->side[order[i]].o)
      eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
 }
 

src/bin/image_map_3d_flow.c

@@ -32,8 +32,8 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
               evas_obj_image_smooth_scale_set(0),
@@ -42,8 +42,8 @@ static void _setup(void)
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_reflec[i] = o;
         snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+              evas_obj_image_file_set(build_path(buf), NULL),
               evas_obj_image_fill_set(0, 0, 256, 256),
               evas_obj_size_set(256, 256),
               evas_obj_image_smooth_scale_set(0),
@@ -56,8 +56,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < CNUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < CNUM; i++)
-   for (i = 0; i < CNUM; i++) eo_del(o_reflec[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_reflec[i]);
+     }
 }
 
 /* loop - do things */
@@ -127,16 +130,12 @@ static void _loop(double t, int f)
 
         if (c <= 0)
           {
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_raise());
-             if (o_reflec[i])
              eo_do(o_reflec[i], evas_obj_raise());
           }
         else
           {
-             if (o_images[i])
              eo_do(o_images[i], evas_obj_lower());
-             if (o_reflec[i])
              eo_do(o_reflec[i], evas_obj_lower());
           }
 
@@ -160,8 +159,8 @@ static void _loop(double t, int f)
                                 x + (w / 2), y + (h / 2), 0);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
 
         evas_map_point_coord_set   (m, 0, x, yy, -z);
@@ -184,8 +183,8 @@ static void _loop(double t, int f)
                                 x + (w / 2), y + (h / 2), 0);
         evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
 
-        if (o_reflec[i])
+        eo_do(o_reflec[i],
-	eo_do(o_reflec[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
 

src/bin/image_map_color_alpha_nearest_rotate.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_image_smooth_scale_set(0),
@@ -69,8 +69,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_map_color_alpha_nearest_solid_rotate.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_image_smooth_scale_set(0),
@@ -69,8 +69,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_map_color_alpha_rotate.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
@@ -67,8 +67,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_map_color_alpha_solid_rotate.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
@@ -66,8 +66,8 @@ static void _loop(double t, int f)
         evas_map_point_color_set(m, 3, 0, 0, 0, 0);
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_map_color_nearest_rotate.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_image_smooth_scale_set(0),
@@ -69,8 +69,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_map_color_nearest_solid_rotate.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_image_smooth_scale_set(0),
@@ -69,8 +69,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_map_color_rotate.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
@@ -67,8 +67,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_map_color_solid_rotate.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
@@ -67,8 +67,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_map_nearest_rotate.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+              evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_image_smooth_scale_set(0),
@@ -64,8 +64,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_map_nearest_solid_rotate.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_image_smooth_scale_set(0),
@@ -64,8 +64,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_map_rotate.c

@@ -26,7 +26,6 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-        if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
@@ -62,7 +61,6 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
 	eo_do(o_images[i], evas_obj_map_enable_set(1),
                            evas_obj_map_set(m));
      }

src/bin/image_map_solid_rotate.c

@@ -26,8 +26,8 @@ static void _setup(void)
      {
 	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
-        if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+              evas_obj_image_file_set(build_path("image.png"), NULL),
               evas_obj_image_fill_set(0, 0, 120, 160),
               evas_obj_size_set(120, 160),
               evas_obj_visibility_set(EINA_TRUE));
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
 
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
 
-        if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_map_enable_set(1),
+              evas_obj_map_enable_set(1),
               evas_obj_map_set(m));
      }
    FPS_STD(NAME);

src/bin/image_quality_scale.c

@@ -26,7 +26,6 @@ static void _setup(void)
      {
 	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
-        if (o)
 	eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
 	         evas_obj_image_fill_set(0, 0, 640, 480),
 	         evas_obj_size_set(640, 480),
@@ -55,7 +54,6 @@ static void _loop(double t, int f)
 	h *= (f / 100.0) * 4.0;
 	x = (win_w / 2) - (w / 2);
 	y = (win_h / 2) - (h / 2);
-	if (o_images[i])
 	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));

src/bin/proxy_image.c

@@ -23,8 +23,8 @@ static void _setup(void)
    Evas_Object *o,*src;
 
    o = eo_add(EVAS_IMAGE_CLASS, evas);
-   if (o)
+   eo_do(o,
-	eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+         evas_obj_image_file_set(build_path("logo.png"), NULL),
          evas_obj_image_fill_set(0, 0, 120, 160),
          evas_obj_size_set(120, 160),
          evas_obj_visibility_set(EINA_TRUE));
@@ -35,8 +35,8 @@ static void _setup(void)
      {
 	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_images[i] = o;
-	if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_image_source_set(src),
+              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));
@@ -64,7 +64,6 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	if (o_images[i])
         eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/proxy_image_offscreen.c

@@ -27,7 +27,6 @@ static void _setup(void)
    Evas_Object *o,*src;
 
    o = eo_add(EVAS_IMAGE_CLASS, evas);
-   if (o)
    eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
          evas_obj_image_fill_set(0, 0, 120, 160),
          evas_obj_size_set(120, 160),
@@ -38,7 +37,6 @@ static void _setup(void)
      {
         o = eo_add(EVAS_IMAGE_CLASS, evas);
         o_images[i] = o;
-	if (o)
         eo_do(o, evas_obj_image_source_set(src, NULL),
               evas_obj_size_set(120, 160),
               evas_obj_image_fill_set(0,0,120,160),
@@ -67,7 +65,6 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-	if (o_images[i])
 	eo_do(o_images[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/proxy_text_fixed.c

@@ -29,8 +29,8 @@ static void _setup(void)
      {
 	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
-	if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
+              evas_obj_text_font_set("Vera-Bold", 20),
               evas_obj_text_set("This is a test string"),
               evas_obj_text_style_set(st),
               evas_obj_color_set(255, 255, 255, 255),
@@ -48,13 +48,11 @@ static void _setup(void)
 	s = o_texts[i % st];
 	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_texts[i] = o;
-	if (o)
         eo_do(o, evas_obj_image_source_set(s));
         /* FIXME s == NULL*/
-	if (s)
         eo_do(s, evas_obj_size_get(&w, &h));
-	if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_size_set(w, h),
+              evas_obj_size_set(w, h),
               evas_obj_image_fill_set(0, 0, w, h),
               evas_obj_visibility_set(EINA_TRUE));
      }
@@ -76,13 +74,11 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (o_texts[i])
 	eo_do(o_texts[i], evas_obj_size_get(&w, &h));
 	x = (win_w / 2) - (w / 2);
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
-	if (o_texts[i])
 	eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/proxy_text_random.c

@@ -32,43 +32,37 @@ static void _setup(void)
    srnd();
    o = eo_add(EVAS_TEXT_CLASS, evas);
    o_texts[0] = o;
-   if (o)
-	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
    snprintf(buf, sizeof(buf), "%s %s %s %s.",
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
             strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-   if (o)
+
-	eo_do(o, evas_obj_text_set(buf));
+   eo_do(o,
-   if (o)
+         evas_obj_text_font_set("Vera-Bold", 20),
-	eo_do(o, evas_obj_color_set(0, 0, 0, 255));
+         evas_obj_text_set(buf),
-   if (o)
+         evas_obj_color_set(0, 0, 0, 255),
-	eo_do(o, evas_obj_size_get(&w, &h));
+         evas_obj_size_get(&w, &h));
    x = (win_w / 2) - (w / 2);
    x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
    y = (win_h / 2) - (h / 2);
    y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
-   if (o)
+   eo_do(o,
-	eo_do(o, evas_obj_position_set(x, y));
+         evas_obj_position_set(x, y),
-   if (o)
+         evas_obj_visibility_set(EINA_TRUE));
-	eo_do(o, evas_obj_visibility_set(EINA_TRUE));
    for (i = 1  ; i < OBNUM ; i ++)
      {
 	o = eo_add(EVAS_IMAGE_CLASS, evas);
 	o_texts[i] = o;
-	if (o)
+	eo_do(o,
-	eo_do(o, evas_obj_image_source_set(o_texts[0]));
+              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)
 	eo_do(o, evas_obj_size_set(w, h),
 	         evas_obj_image_fill_set(0, 0, w, h));
 	x = (win_w / 2) - (w / 2);
 	x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
-	if (o)
 	eo_do(o, evas_obj_position_set(x, y),
                  evas_obj_visibility_set(EINA_TRUE));
      }
@@ -98,16 +92,14 @@ static void _loop(double t, int f)
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
             strs[rnd() % (sizeof(strs) / sizeof(char *))],
             strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-   if (o_texts[0])
+   eo_do(o_texts[0],
-	eo_do(o_texts[0], evas_obj_text_set(buf));
+         evas_obj_text_set(buf),
-   if (o_texts[0])
+         evas_obj_size_get(&w, &h));
-	eo_do(o_texts[0], evas_obj_size_get(&w, &h));
    for (i = 1; i < OBNUM; i++)
      {
-        if (o_texts[i])
+        eo_do(o_texts[i],
-	eo_do(o_texts[i], evas_obj_size_set(w,h));
+              evas_obj_size_set(w,h),
-        if (o_texts[i])
+              evas_obj_image_fill_set(0,0,w,h));
-	eo_do(o_texts[i], evas_obj_image_fill_set(0,0,w,h));
      }
    FPS_STD(NAME);
 }

src/bin/rect_blend.c

@@ -32,8 +32,8 @@ static void _setup(void)
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_color_set(r, g, b, a),
+              evas_obj_color_set(r, g, b, a),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);

src/bin/rect_blend_few.c

@@ -35,7 +35,6 @@ static void _setup(void)
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	if (o)
 	eo_do(o, evas_obj_color_set(r, g, b, a),
 	         evas_obj_visibility_set(EINA_TRUE));
      }
@@ -64,7 +63,6 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
-	if (o_images[i])
 	eo_do(o_images[i], evas_obj_position_set(x, y),
 	                   evas_obj_size_set(w, h));
      }

src/bin/rect_blend_pow2.c

@@ -33,8 +33,8 @@ static void _setup(void)
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_color_set(r, g, b, a),
+              evas_obj_color_set(r, g, b, a),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);

src/bin/rect_blend_pow2_few.c

@@ -36,7 +36,6 @@ static void _setup(void)
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	if (o)
 	eo_do(o, evas_obj_color_set(r, g, b, a),
 	         evas_obj_visibility_set(EINA_TRUE));
      }
@@ -65,7 +64,6 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
-	if (o_images[i])
 	eo_do(o_images[i], evas_obj_position_set(x, y),
 	                   evas_obj_size_set(w, h));
      }

src/bin/rect_solid.c

@@ -32,8 +32,8 @@ static void _setup(void)
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_color_set(r, g, b, a),
+              evas_obj_color_set(r, g, b, a),
               evas_obj_visibility_set(EINA_TRUE));
      }
    done = 0;
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-	if (o_images[i])
+        eo_do(o_images[i],
-	eo_do(o_images[i], evas_obj_position_set(x, y),
+              evas_obj_position_set(x, y),
               evas_obj_size_set(w, h));
      }
    FPS_STD(NAME);

src/bin/rect_solid_few.c

@@ -35,7 +35,6 @@ static void _setup(void)
 	r = ((rnd()&0xff) * a) / 255;
 	g = ((rnd()&0xff) * a) / 255;
 	b = ((rnd()&0xff) * a) / 255;
-	if (o)
 	eo_do(o, evas_obj_color_set(r, g, b, a),
 	         evas_obj_visibility_set(EINA_TRUE));
      }
@@ -64,7 +63,6 @@ static void _loop(double t, int f)
 	x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
-	if (o_images[i])
 	eo_do(o_images[i], evas_obj_position_set(x, y),
 	                   evas_obj_size_set(w, h));
      }

src/bin/text_basic.c

@@ -27,7 +27,6 @@ static void _setup(void)
      {
         o = eo_add(EVAS_TEXT_CLASS, evas);
         o_texts[i] = o;
-	if (o)
         eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
               evas_obj_text_set("This is a test string"),
               evas_obj_color_set(0, 0, 0, 255),
@@ -50,13 +49,11 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (o_texts[i])
         eo_do(o_texts[i], evas_obj_size_get(&w, &h));
         x = (win_w / 2) - (w / 2);
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
         y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
-	if (o_texts[i])
         eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/text_change.c

@@ -34,14 +34,12 @@ static void _setup(void)
      {
 	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
-	if (o)
 	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
         snprintf(buf, sizeof(buf), "%s %s %s %s.",
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-	if (o)
 	eo_do(o, evas_obj_text_set(buf),
 	         evas_obj_color_set(0, 0, 0, 255),
 	         evas_obj_size_get(&w, &h));
@@ -49,7 +47,6 @@ static void _setup(void)
 	x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
-	if (o)
 	eo_do(o, evas_obj_position_set(x, y),
 	         evas_obj_visibility_set(EINA_TRUE));
      }
@@ -80,7 +77,6 @@ static void _loop(double t, int f)
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-	if (o_texts[i])
 	eo_do(o_texts[i], evas_obj_text_set(buf));
      }
    FPS_STD(NAME);

src/bin/text_styles.c

@@ -29,8 +29,8 @@ static void _setup(void)
      {
 	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
-	if (o)
+        eo_do(o,
-	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
+              evas_obj_text_font_set("Vera-Bold", 20),
               evas_obj_text_set("This is a test string"),
               evas_obj_text_style_set(st),
               evas_obj_color_set(255, 255, 255, 255),
@@ -59,13 +59,11 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (o_texts[i])
         eo_do(o_texts[i], evas_obj_size_get(&w, &h));
 	x = (win_w / 2) - (w / 2);
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
-	if (o_texts[i])
         eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/text_styles_different_strings.c

@@ -36,14 +36,12 @@ static void _setup(void)
      {
 	o = eo_add(EVAS_TEXT_CLASS, evas);
 	o_texts[i] = o;
-	if (o)
 	eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
 	snprintf(buf, sizeof(buf), "%s %s %s %s.",
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))],
 		 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
-	if (o)
 	eo_do(o, evas_obj_text_set(buf),
 	         evas_obj_text_style_set(st),
 	         evas_obj_color_set(255, 255, 255, 255),
@@ -72,13 +70,11 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h;
    for (i = 0; i < OBNUM; i++)
      {
-	if (o_texts[i])
 	eo_do(o_texts[i], evas_obj_size_get(&w, &h));
 	x = (win_w / 2) - (w / 2);
 	x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
 	y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
-	if (o_texts[i])
 	eo_do(o_texts[i], evas_obj_position_set(x, y));
      }
    FPS_STD(NAME);

src/bin/textblock_auto_align.c

@@ -30,14 +30,10 @@ static void _setup(void)
      (st,
       "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'"
       );
-   if (o)
+   eo_do(o,
-	eo_do(o, evas_obj_textblock_style_set(st));
+         evas_obj_textblock_style_set(st),
-   evas_textblock_style_free(st);
+         evas_obj_textblock_clear(),
-   if (o)
+         evas_obj_textblock_text_markup_set(
-	eo_do(o, evas_obj_textblock_clear());
-
-   if (o)
-	eo_do(o, evas_obj_textblock_text_markup_set(
       "This is a test of auto alignment in Evas<ps/>"
       "<br/>"
       "This text should be left aligned<ps/>"
@@ -55,10 +51,9 @@ static void _setup(void)
       "words should appear in the following order: 'דוגמה' first, 'of' second,<br/>"
       "‎'טקסט' third, 'english' fourth and 'in' fifth, counting from right to left<ps/>"
       "דוגמה of טקסט in english."
-      ));
+      ),
-
+         evas_obj_visibility_set(EINA_TRUE));
-   if (o)
+   evas_textblock_style_free(st);
-	eo_do(o, evas_obj_visibility_set(EINA_TRUE));
 
    done = 0;
 }
@@ -75,17 +70,15 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h, w0, h0;
    int i = 0;
 
-   if (o_text)
    eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
    w = w0;
    h = h0;
    w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0);
    x = (win_w / 2) - (w / 2);
    y = (win_h / 2) - (h0 / 2);
-   if (o_text)
+   eo_do(o_text,
-	eo_do(o_text, evas_obj_position_set(x, y));
+         evas_obj_position_set(x, y),
-   if (o_text)
+         evas_obj_size_set(w, h));
-	eo_do(o_text, evas_obj_size_set(w, h));
 
    FPS_STD(NAME);
 }

src/bin/textblock_basic.c

@@ -39,14 +39,10 @@ static void _setup(void)
       "p='+ font=Vera,Kochi font_size=10 align=left'"
       "/p='- \n'"
       );
-   if (o)
+   eo_do(o,
-	eo_do(o, evas_obj_textblock_style_set(st));
+         evas_obj_textblock_style_set(st),
-   evas_textblock_style_free(st);
+         evas_obj_textblock_clear(),
-   if (o)
+         evas_obj_textblock_text_markup_set(
-	eo_do(o, evas_obj_textblock_clear());
-
-   if (o)
-	eo_do(o, evas_obj_textblock_text_markup_set(
       "<center><h1>Title</h1></center><br/>"
       "<p><tab>A pragraph here <red>red text</red> and stuff.</p>"
       "<p>And escaping &lt; and &gt; as well as &amp; as <h1>normal.</h1></p>"
@@ -115,10 +111,10 @@ static void _setup(void)
       "Heizölrückstoßabdämpfung fløde pingüino kilómetros cœur déçu l'âme "
       "plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava Ádhaim"
       "</blockquote>"
-      ));
+      ),
+         evas_obj_visibility_set(EINA_TRUE));
 
-   if (o)
+   evas_textblock_style_free(st);
-	eo_do(o, evas_obj_visibility_set(EINA_TRUE));
 
    done = 0;
 }
@@ -143,10 +139,9 @@ static void _loop(double t, int f)
    x += sin((double)(f + (i * 13)) / (86.7 * SLOW)) * (w0 / 2);
    y = (win_h / 2) - (h / 2);
    y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2);
-   if (o_text)
+   eo_do(o_text,
-	eo_do(o_text, evas_obj_position_set(x, y));
+         evas_obj_position_set(x, y),
-   if (o_text)
+         evas_obj_size_set(w, 5000));
-	eo_do(o_text, evas_obj_size_set(w, 5000));
 
    FPS_STD(NAME);
 }

src/bin/textblock_intl.c

@@ -30,14 +30,10 @@ static void _setup(void)
      (st,
       "DEFAULT='font=Sans font_size=10 align=left color=#000000 wrap=word'"
       );
-   if (o)
+   eo_do(o,
-	eo_do(o, evas_obj_textblock_style_set(st));
+         evas_obj_textblock_style_set(st),
-   evas_textblock_style_free(st);
+         evas_obj_textblock_clear(),
-   if (o)
+         evas_obj_textblock_text_markup_set(
-	eo_do(o, evas_obj_textblock_clear());
-
-   if (o)
-	eo_do(o, evas_obj_textblock_text_markup_set(
       "This is a test of International test rendering in Evas<br/>"
       "<br/>"
       "Danish: 'Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen'<br/>"
@@ -86,10 +82,10 @@ static void _setup(void)
       "Thai: 'ยูนืโคด'<br/>"
       "Tibetan: 'ཨུ་ནི་ཀོཌྲ།'<br/>"
       "Yiddish: 'יוניקאָד'<br/>"
-      ));
+      ),
+         evas_obj_visibility_set(EINA_TRUE));
 
-   if (o)
+   evas_textblock_style_free(st);
-	eo_do(o, evas_obj_visibility_set(EINA_TRUE));
 
    done = 0;
 }
@@ -106,7 +102,6 @@ static void _loop(double t, int f)
    Evas_Coord x, y, w, h, w0, h0;
    int i = 0;
 
-   if (o_text)
    eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
    w = w0;
    h = h0;
@@ -114,10 +109,9 @@ static void _loop(double t, int f)
    x += sin((double)(f + (i * 13)) / (31.1 * SLOW)) * (w0 / (2 * 2));
    y = (win_h / 2) - (h / 2);
    y += cos((double)(f + (i * 28)) / (19.6 * SLOW)) * (h0 / (2 * 2));
-   if (o_text)
+   eo_do(o_text,
-	eo_do(o_text, evas_obj_position_set(x, y));
+         evas_obj_position_set(x, y),
-   if (o_text)
+         evas_obj_size_set(w, h));
-	eo_do(o_text, evas_obj_size_set(w, h));
 
    FPS_STD(NAME);
 }

src/bin/textblock_text_append.c

@@ -30,11 +30,9 @@ static void _setup(void)
      (st,
       "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'"
       );
-   if (o)
+   eo_do(o,
-	eo_do(o, evas_obj_textblock_style_set(st));
+         evas_obj_textblock_style_set(st),
-   evas_textblock_style_free(st);
+         evas_obj_textblock_clear(),
-   if (o)
-	eo_do(o, evas_obj_textblock_clear(),
          evas_obj_textblock_text_markup_set(
       "This test just appends and removes text from different paragraphs, it's "
       "not a very visual test, it's included for benchmarking purposes."
@@ -94,13 +92,12 @@ static void _setup(void)
 "Graphics"
 "<ps/>"
 "Enlightenment is built by designers and programmers who want others to be able to do more with less. Some of Enlightenment's libraries do not do anything with graphics at all, but it is the ones that do that are the shining stars of the Enlightenment world.<ps/>Evas is the canvas layer. It is not a drawing library. It is not like OpenGL, Cairo, XRender, GDI, DirectFB etc. It is a scene graph library that retains state of all objects in it. They are created then manipulated until they are no longer needed, at which point they are deleted. This allows the programmer to work in terms that a designer thinks of. It is direct mapping, as opposed to having to convert the concepts into drawing commands in the right order, calculate minimum drawing calls needed to get the job done etc.<ps/>Evas also handles abstracting the rendering mechanism. With zero changes the same application can move from software to OpenGL rendering, as they all use an abstracted scene graph to describe the world (canvas) to Evas. Evas supports multiple targets, but the most useful are the high-speed software rendering engines and OpenGL (as well as OpenGL-ES 2.0).<ps/>Evas not only does quality rendering and compositing, but also can scale, rotate and fully 3D transform objects, allowing for sought-after 3D effects in your interfaces. It supplies these abilities in both software and OpenGL rendering, so you are never caught with unexpected loss of features. The software rendering is even fast enough to provide the 3D without any acceleration on devices for simple uses.<ps/>Edje is a meta-object design library that is somewhere between Flash, PSD, SVG and HTML+CSS. It separates design out from code and into a dynamically loaded data file. This file is compressed and loaded very quickly, along with being cached and shared betweeen instances.<ps/>This allows design to be provided at runtime by different design (EDJ) files, leaving the programmer to worry about overall application implementation and coarse grained UI as opposed to needing to worry about all the little details that the artists may vary even until the day before shipping the product.<br/>"
-      ));
+      ),
-   if (o_text)
+         evas_obj_position_set(0, 0),
-	eo_do(o_text, evas_obj_position_set(0, 0),
+         evas_obj_size_set(win_w, win_h),
-                 evas_obj_size_set(win_w, win_h));
+         evas_obj_visibility_set(EINA_TRUE));
 
-   if (o)
+   evas_textblock_style_free(st);
-	eo_do(o, evas_obj_visibility_set(EINA_TRUE));
 
    done = 0;
 }
@@ -116,7 +113,6 @@ static void _loop(double t, int f)
 {
    Evas_Textblock_Cursor *cur;
    static Evas_Textblock_Cursor *cur2;
-   if (o_text)
    eo_do(o_text, cur = evas_obj_textblock_cursor_get());
    evas_textblock_cursor_text_append(cur, "*");
    evas_textblock_cursor_char_delete(cur);
@@ -124,7 +120,6 @@ static void _loop(double t, int f)
    evas_textblock_cursor_paragraph_char_first(cur);
    if (!cur2)
      {
-        if (o_text)
         eo_do(o_text, cur2 = evas_obj_textblock_cursor_new());
         evas_textblock_cursor_paragraph_last(cur2);
         evas_textblock_cursor_paragraph_char_first(cur2);

src/bin/widgets_file_icons.c

@@ -69,8 +69,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_file_icons_2.c

@@ -67,8 +67,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_file_icons_2_grouped.c

@@ -76,8 +76,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_file_icons_2_same.c

@@ -52,8 +52,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_file_icons_2_same_grouped.c

@@ -56,8 +56,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_file_icons_3.c

@@ -67,8 +67,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_file_icons_4.c

@@ -67,8 +67,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_list_1.c

@@ -84,8 +84,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_list_1_grouped.c

@@ -92,8 +92,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_list_2.c

@@ -84,8 +84,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_list_2_grouped.c

@@ -92,8 +92,11 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+     {
+        eo_del(o_images[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_list_3.c

@@ -113,9 +113,12 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_icons[i]);
+     {
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_icons[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_list_3_grouped.c

@@ -121,7 +121,6 @@ static void _setup(void)
      }
    for (i = 0; i < NUM; i++)
      {
-        if (o_texts[i])
         eo_do(o_texts[i], evas_obj_raise());
      }
    done = 0;
@@ -131,9 +130,12 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_icons[i]);
+     {
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_icons[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */

src/bin/widgets_list_4_grouped.c

@@ -129,9 +129,12 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++)
-   for (i = 0; i < NUM; i++) eo_del(o_icons[i]);
+     {
-   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
+        eo_del(o_images[i]);
+        eo_del(o_icons[i]);
+        eo_del(o_texts[i]);
+     }
 }
 
 /* loop - do things */