ector: share base type structure to the rest of ecore_private.h.

diff --git a/src/lib/ector/ector_private.h b/src/lib/ector/ector_private.h
index 8e95d0330edd7bca6ba7cfcd17b42ee65b981f6e..41b51d880ce83c44124aa154d6e72457230eb3ec 100644 (file)
--- a/src/lib/ector/ector_private.h
+++ b/src/lib/ector/ector_private.h
@@ -45,4 +45,80 @@ _ector_renderer_replace(Ector_Renderer **d, const Ector_Renderer *s)
    eo_unref(tmp);
 }
 
+typedef struct _Ector_Renderer_Generic_Base_Data Ector_Renderer_Generic_Base_Data;
+typedef struct _Ector_Renderer_Generic_Gradient_Data Ector_Renderer_Generic_Gradient_Data;
+typedef struct _Ector_Renderer_Generic_Gradient_Linear_Data Ector_Renderer_Generic_Gradient_Linear_Data;
+typedef struct _Ector_Renderer_Generic_Gradient_Radial_Data Ector_Renderer_Generic_Gradient_Radial_Data;
+typedef struct _Ector_Renderer_Generic_Shape_Data Ector_Renderer_Generic_Shape_Data;
+
+struct _Ector_Renderer_Generic_Base_Data
+{
+   Eina_Matrix3 *m;
+
+   struct {
+      double x;
+      double y;
+   } origin;
+
+   struct {
+      int r, g, b, a;
+   } color;
+
+   Ector_Renderer *mask;
+
+   Ector_Quality q;
+   Eina_Bool visibility;
+};
+
+struct _Ector_Renderer_Generic_Gradient_Data
+{
+   Efl_Graphics_Gradient_Stop *colors;
+   unsigned int colors_count;
+
+   Efl_Graphics_Gradient_Spread s;
+};
+
+struct _Ector_Renderer_Generic_Gradient_Linear_Data
+{
+   struct {
+      double x, y;
+   } start, end;
+};
+
+struct _Ector_Renderer_Generic_Gradient_Radial_Data
+{
+   struct {
+      double x, y;
+   } radial, focal;
+   double radius;
+};
+
+struct _Ector_Renderer_Generic_Shape_Data
+{
+   struct {
+      Efl_Graphics_Path_Command *cmd;
+      double *pts;
+   } path;
+
+   Ector_Renderer *fill;
+   struct {
+      Ector_Renderer *fill;
+      Ector_Renderer *marker;
+
+      double scale;
+      double width;
+      double centered;
+
+      struct {
+         int r, g, b, a;
+      } color;
+
+      Efl_Graphics_Dash *dash;
+      unsigned int dash_length;
+
+      Efl_Graphics_Cap cap;
+      Efl_Graphics_Cap join;
+   } stroke;
+};
+
 #endif

diff --git a/src/lib/ector/ector_renderer_base.c b/src/lib/ector/ector_renderer_base.c
index 92ffaa51cc9e0c6456e7aa9fd6527468c025f51e..9bf001e1b9a6d0eb15a1453c061c0f63cab3ab0f 100644 (file)
--- a/src/lib/ector/ector_renderer_base.c
+++ b/src/lib/ector/ector_renderer_base.c
@@ -7,26 +7,6 @@
 
 #include "ector_private.h"
 
-typedef struct _Ector_Renderer_Generic_Base_Data Ector_Renderer_Generic_Base_Data;
-struct _Ector_Renderer_Generic_Base_Data
-{
-   Eina_Matrix3 *m;
-
-   struct {
-      double x;
-      double y;
-   } origin;
-
-   struct {
-      int r, g, b, a;
-   } color;
-
-   Ector_Renderer *mask;
-
-   Ector_Quality q;
-   Eina_Bool visibility;
-};
-
 void
 _ector_renderer_base_transformation_set(Eo *obj EINA_UNUSED,
                                         Ector_Renderer_Generic_Base_Data *pd,

diff --git a/src/lib/ector/ector_renderer_gradient.c b/src/lib/ector/ector_renderer_gradient.c
index d54f365fa99cf5a12f6a98c9aa0d8b4f87336d5d..5cf3c442f68dc9d4bd90d3208ed609ff0adcc301 100644 (file)
--- a/src/lib/ector/ector_renderer_gradient.c
+++ b/src/lib/ector/ector_renderer_gradient.c
@@ -7,15 +7,6 @@
 
 #include "ector_private.h"
 
-typedef struct _Ector_Renderer_Generic_Gradient_Data Ector_Renderer_Generic_Gradient_Data;
-struct _Ector_Renderer_Generic_Gradient_Data
-{
-   Efl_Graphics_Gradient_Stop *colors;
-   unsigned int colors_count;
-
-   Efl_Graphics_Gradient_Spread s;
-};
-
 void
 _ector_renderer_gradient_efl_graphics_gradient_stop_set(Eo *obj,
                                                         Ector_Renderer_Generic_Gradient_Data *pd,

diff --git a/src/lib/ector/ector_renderer_gradient_linear.c b/src/lib/ector/ector_renderer_gradient_linear.c
index 21412ceb5931a6e4cec7b7a1222b7f264bb0b9d6..46ed20fff9b5519c26023ec085be4968874cf692 100644 (file)
--- a/src/lib/ector/ector_renderer_gradient_linear.c
+++ b/src/lib/ector/ector_renderer_gradient_linear.c
@@ -7,14 +7,6 @@
 
 #include "ector_private.h"
 
-typedef struct _Ector_Renderer_Generic_Gradient_Linear_Data Ector_Renderer_Generic_Gradient_Linear_Data;
-struct _Ector_Renderer_Generic_Gradient_Linear_Data
-{
-   struct {
-      double x, y;
-   } start, end;
-};
-
 void
 _ector_renderer_gradient_linear_efl_graphics_gradient_linear_start_set(Eo *obj EINA_UNUSED,
                                                                        Ector_Renderer_Generic_Gradient_Linear_Data *pd,

diff --git a/src/lib/ector/ector_renderer_gradient_radial.c b/src/lib/ector/ector_renderer_gradient_radial.c
index 26d3b5dc804884061d0afcd1cfb452996b72e0d3..8f377b303dc75414b62cc567802324be6963add7 100644 (file)
--- a/src/lib/ector/ector_renderer_gradient_radial.c
+++ b/src/lib/ector/ector_renderer_gradient_radial.c
@@ -7,15 +7,6 @@
 
 #include "ector_private.h"
 
-typedef struct _Ector_Renderer_Generic_Gradient_Radial_Data Ector_Renderer_Generic_Gradient_Radial_Data;
-struct _Ector_Renderer_Generic_Gradient_Radial_Data
-{
-   struct {
-      double x, y;
-   } radial, focal;
-   double radius;
-};
-
 void
 _ector_renderer_gradient_radial_efl_graphics_gradient_radial_center_set(Eo *obj EINA_UNUSED,
                                                                         Ector_Renderer_Generic_Gradient_Radial_Data *pd,

diff --git a/src/lib/ector/ector_renderer_shape.c b/src/lib/ector/ector_renderer_shape.c
index 27c60c85eb84e991ebb24c490ea443bf324618e1..c69b0220d515445e3235420cddab23146b4fa5df 100644 (file)
--- a/src/lib/ector/ector_renderer_shape.c
+++ b/src/lib/ector/ector_renderer_shape.c
@@ -7,35 +7,6 @@
 
 #include "ector_private.h"
 
-typedef struct _Ector_Renderer_Generic_Shape_Data Ector_Renderer_Generic_Shape_Data;
-struct _Ector_Renderer_Generic_Shape_Data
-{
-   struct {
-      Efl_Graphics_Path_Command *cmd;
-      double *pts;
-   } path;
-
-   Ector_Renderer *fill;
-   struct {
-      Ector_Renderer *fill;
-      Ector_Renderer *marker;
-
-      double scale;
-      double width;
-      double centered;
-
-      struct {
-         int r, g, b, a;
-      } color;
-
-      Efl_Graphics_Dash *dash;
-      unsigned int dash_length;
-
-      Efl_Graphics_Cap cap;
-      Efl_Graphics_Cap join;
-   } stroke;
-};
-
 void
 _ector_renderer_shape_fill_set(Eo *obj EINA_UNUSED,
                                Ector_Renderer_Generic_Shape_Data *pd,