From 19b15a1f040bfc8aa0753182a41badecd2b7fe74 Mon Sep 17 00:00:00 2001
From: Xavi Artigas <xavierartigas@yahoo.es>
Date: Wed, 22 Nov 2017 16:08:11 +0100
Subject: [PATCH] Adapt code to tutorial text

Minor modifications that make the code easier to explain.
---
 .../c/eo-multiinherit/src/eo_multiinherit.h   | 17 ++------------
 .../src/eo_multiinherit_main.c                | 23 +++++++++++--------
 .../c/eo-multiinherit/src/example_circle.c    |  2 --
 .../c/eo-multiinherit/src/example_colored.c   |  2 --
 .../c/eo-multiinherit/src/example_rectangle.c |  2 --
 .../c/eo-multiinherit/src/example_shape.c     |  2 --
 .../c/eo-multiinherit/src/example_square.c    |  2 --
 7 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/tutorial/c/eo-multiinherit/src/eo_multiinherit.h b/tutorial/c/eo-multiinherit/src/eo_multiinherit.h
index 04d05452..2cbb365f 100644
--- a/tutorial/c/eo-multiinherit/src/eo_multiinherit.h
+++ b/tutorial/c/eo-multiinherit/src/eo_multiinherit.h
@@ -1,18 +1,5 @@
-#ifndef _EO_CLASSES_H
-#define _EO_CLASSES_H 1
-
-#define EFL_EO_API_SUPPORT 1
-#ifndef EFL_BETA_API_SUPPORT
-#define EFL_BETA_API_SUPPORT 1
-#endif
-
-#include <Eina.h>
-#include <Efl_Core.h>
-
-#include "example_shape.eo.h"
-#include "example_colored.eo.h"
 #include "example_rectangle.eo.h"
 #include "example_square.eo.h"
+#include "example_shape.eo.h"
 #include "example_circle.eo.h"
-
-#endif
+#include "example_colored.eo.h"
diff --git a/tutorial/c/eo-multiinherit/src/eo_multiinherit_main.c b/tutorial/c/eo-multiinherit/src/eo_multiinherit_main.c
index ccb65f7a..a469ffcd 100644
--- a/tutorial/c/eo-multiinherit/src/eo_multiinherit_main.c
+++ b/tutorial/c/eo-multiinherit/src/eo_multiinherit_main.c
@@ -1,6 +1,11 @@
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
+
+#include <Eina.h>
+#include <Efl_Core.h>
 #include "eo_multiinherit.h"
 
-Example_Shape *
+Example_Circle *
 _circle_create()
 {
    Example_Circle *circle;
@@ -12,7 +17,7 @@ _circle_create()
    return circle;
 }
 
-Example_Shape *
+Example_Rectangle *
 _rectangle_create()
 {
    Example_Rectangle *rectangle;
@@ -20,30 +25,30 @@ _rectangle_create()
    rectangle = efl_add(EXAMPLE_RECTANGLE_CLASS, NULL,
                        efl_name_set(efl_added, "Rectangle"),
                        example_rectangle_width_set(efl_added, 5),
-                       example_rectangle_height_set(efl_added, 10));
+                       example_rectangle_height_set(efl_added, 10),
+                       example_colored_color_set(efl_added, 255, 0, 0));
 
-   example_colored_color_set(rectangle, 255, 0, 0);
    return rectangle;
 }
 
-Example_Shape *
+Example_Square *
 _square_create()
 {
    Example_Square *square;
 
    square = efl_add(EXAMPLE_SQUARE_CLASS, NULL,
                     efl_name_set(efl_added, "Square"),
-                    example_rectangle_width_set(efl_added, 7));
+                    example_rectangle_width_set(efl_added, 7),
+                    example_colored_color_set(efl_added, 64, 64, 64));
 
-   example_colored_color_set(square, 64, 64, 64);
    return square;
 }
 
 void
 _shape_print(Example_Shape *shape)
 {
-   printf("Shape named %s has area %d\n", efl_name_get(shape), example_shape_area(shape));
-
+   printf("Shape named %s has area %d\n",
+          efl_name_get(shape), example_shape_area(shape));
    if (efl_isa(shape, EXAMPLE_COLORED_MIXIN))
      {
         int red, green, blue;
diff --git a/tutorial/c/eo-multiinherit/src/example_circle.c b/tutorial/c/eo-multiinherit/src/example_circle.c
index 74541fb2..7fe69b2a 100644
--- a/tutorial/c/eo-multiinherit/src/example_circle.c
+++ b/tutorial/c/eo-multiinherit/src/example_circle.c
@@ -1,7 +1,5 @@
 #define EFL_BETA_API_SUPPORT
 #include <Eo.h>
-#include "example_circle.eo.h"
-
 #include "eo_multiinherit.h"
 
 typedef struct
diff --git a/tutorial/c/eo-multiinherit/src/example_colored.c b/tutorial/c/eo-multiinherit/src/example_colored.c
index 49d08149..e054a530 100644
--- a/tutorial/c/eo-multiinherit/src/example_colored.c
+++ b/tutorial/c/eo-multiinherit/src/example_colored.c
@@ -1,7 +1,5 @@
 #define EFL_BETA_API_SUPPORT
 #include <Eo.h>
-#include "example_colored.eo.h"
-
 #include "eo_multiinherit.h"
 
 typedef struct
diff --git a/tutorial/c/eo-multiinherit/src/example_rectangle.c b/tutorial/c/eo-multiinherit/src/example_rectangle.c
index 3062f90b..ef5a08b7 100644
--- a/tutorial/c/eo-multiinherit/src/example_rectangle.c
+++ b/tutorial/c/eo-multiinherit/src/example_rectangle.c
@@ -1,7 +1,5 @@
 #define EFL_BETA_API_SUPPORT
 #include <Eo.h>
-#include "example_rectangle.eo.h"
-
 #include "eo_multiinherit.h"
 
 typedef struct
diff --git a/tutorial/c/eo-multiinherit/src/example_shape.c b/tutorial/c/eo-multiinherit/src/example_shape.c
index 5fa2226f..7ed49aa0 100644
--- a/tutorial/c/eo-multiinherit/src/example_shape.c
+++ b/tutorial/c/eo-multiinherit/src/example_shape.c
@@ -2,6 +2,4 @@
 #include <Eo.h>
 #include "example_shape.eo.h"
 
-#include "eo_multiinherit.h"
-
 #include "example_shape.eo.c"
diff --git a/tutorial/c/eo-multiinherit/src/example_square.c b/tutorial/c/eo-multiinherit/src/example_square.c
index da5120f7..b31ce184 100644
--- a/tutorial/c/eo-multiinherit/src/example_square.c
+++ b/tutorial/c/eo-multiinherit/src/example_square.c
@@ -1,7 +1,5 @@
 #define EFL_BETA_API_SUPPORT
 #include <Eo.h>
-#include "example_square.eo.h"
-
 #include "eo_multiinherit.h"
 
 typedef struct