[gimp/soc-2009-dynamics] Move GimpDynamicsOutput typedef to core-types.h, some cleanup

[Michael Natterer <mitch src gnome org>]

commit 892f43fe9842001dd6f8c6a3d8c81d12638fe7b6
Author: Michael Natterer <mitch gimp org>
Date:   Sun Oct 11 13:16:31 2009 +0200

    Move GimpDynamicsOutput typedef to core-types.h, some cleanup

 app/core/core-types.h   |    1 +
 app/core/gimpdynamics.c |    1 +
 app/core/gimpdynamics.h |   83 ++++++++++++++++++++++++-----------------------
 3 files changed, 44 insertions(+), 41 deletions(-)
---
diff --git a/app/core/core-types.h b/app/core/core-types.h
index 8091d7c..45a1d64 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -99,6 +99,7 @@ typedef struct _GimpBrushGenerated   GimpBrushGenerated;
 typedef struct _GimpBrushPipe        GimpBrushPipe;
 typedef struct _GimpCurve            GimpCurve;
 typedef struct _GimpDynamics         GimpDynamics;
+typedef struct _GimpDynamicsOutput   GimpDynamicsOutput;
 typedef struct _GimpGradient         GimpGradient;
 typedef struct _GimpPalette          GimpPalette;
 typedef struct _GimpPattern          GimpPattern;
diff --git a/app/core/gimpdynamics.c b/app/core/gimpdynamics.c
index 8567e86..ea696f2 100644
--- a/app/core/gimpdynamics.c
+++ b/app/core/gimpdynamics.c
@@ -24,6 +24,7 @@
 
 #include "core-types.h"
 
+#include "gimpcurve.h"
 #include "gimpdynamics.h"
 #include "gimpdynamics-load.h"
 #include "gimpdynamics-save.h"
diff --git a/app/core/gimpdynamics.h b/app/core/gimpdynamics.h
index d042b7c..432afd3 100644
--- a/app/core/gimpdynamics.h
+++ b/app/core/gimpdynamics.h
@@ -18,30 +18,25 @@
 #ifndef __GIMP_DYNAMICS_H__
 #define __GIMP_DYNAMICS_H__
 
-#include "core/gimpdata.h"
-#include "gimpcurve.h"
 
-typedef struct _GimpDynamicsOutput  GimpDynamicsOutput;
+#include "gimpdata.h"
 
 
 struct _GimpDynamicsOutput
 {
-
-  gboolean  pressure;
-  gboolean  velocity;
-  gboolean  direction;
-  gboolean  tilt;
-  gboolean  random;
-  gboolean  fade;
-
-
-  GimpCurve*  pressure_curve;
-  GimpCurve*  velocity_curve;
-  GimpCurve*  direction_curve;
-  GimpCurve*  tilt_curve;
-  GimpCurve*  random_curve;
-  GimpCurve*  fade_curve;
-
+  gboolean   pressure;
+  gboolean   velocity;
+  gboolean   direction;
+  gboolean   tilt;
+  gboolean   random;
+  gboolean   fade;
+
+  GimpCurve *pressure_curve;
+  GimpCurve *velocity_curve;
+  GimpCurve *direction_curve;
+  GimpCurve *tilt_curve;
+  GimpCurve *random_curve;
+  GimpCurve *fade_curve;
 };
 
 
@@ -57,19 +52,18 @@ typedef struct _GimpDynamicsClass GimpDynamicsClass;
 
 struct _GimpDynamics
 {
-  GimpData             parent_instance;
-
-  gchar               *name;
-
-  GimpDynamicsOutput*  opacity_dynamics;
-  GimpDynamicsOutput*  hardness_dynamics;
-  GimpDynamicsOutput*  rate_dynamics;
-  GimpDynamicsOutput*  size_dynamics;
-  GimpDynamicsOutput*  aspect_ratio_dynamics;
-  GimpDynamicsOutput*  color_dynamics;
-  GimpDynamicsOutput*  angle_dynamics;
-  GimpDynamicsOutput*  jitter_dynamics;
-
+  GimpData            parent_instance;
+
+  gchar              *name;
+
+  GimpDynamicsOutput *opacity_dynamics;
+  GimpDynamicsOutput *hardness_dynamics;
+  GimpDynamicsOutput *rate_dynamics;
+  GimpDynamicsOutput *size_dynamics;
+  GimpDynamicsOutput *aspect_ratio_dynamics;
+  GimpDynamicsOutput *color_dynamics;
+  GimpDynamicsOutput *angle_dynamics;
+  GimpDynamicsOutput *jitter_dynamics;
 };
 
 struct _GimpDynamicsClass
@@ -78,20 +72,27 @@ struct _GimpDynamicsClass
 };
 
 
-GType              gimp_dynamics_get_type (void) G_GNUC_CONST;
+GType      gimp_dynamics_get_type               (void) G_GNUC_CONST;
+
+GimpData * gimp_dynamics_new                    (const gchar        *name);
 
-GimpData           * gimp_dynamics_new   (const gchar *name);
+GimpData * gimp_dynamics_get_standard           (void);
 
-GimpData           * gimp_dynamics_get_standard     (void);
+gdouble    gimp_dynamics_get_linear_output_val  (GimpDynamicsOutput *output,
+                                                 GimpCoords          coords,
+                                                 gdouble             fade_point);
 
-gdouble            gimp_dynamics_get_linear_output_val (GimpDynamicsOutput *output, GimpCoords coords, gdouble fade_point);
+gdouble    gimp_dynamics_get_angular_output_val (GimpDynamicsOutput *output,
+                                                 GimpCoords          coords,
+                                                 gdouble             fade_point);
 
-gdouble            gimp_dynamics_get_angular_output_val (GimpDynamicsOutput *output, GimpCoords coords, gdouble fade_point);
+gdouble    gimp_dynamics_get_aspect_output_val  (GimpDynamicsOutput *output,
+                                                 GimpCoords          coords,
+                                                 gdouble             fade_point);
 
-gdouble            gimp_dynamics_get_aspect_output_val (GimpDynamicsOutput *output, GimpCoords coords, gdouble fade_point);
+gboolean   gimp_dynamics_output_is_enabled      (GimpDynamicsOutput *output);
 
-gboolean           gimp_dynamics_output_is_enabled (GimpDynamicsOutput *output);
+gboolean   gimp_dynamics_input_fade_enabled     (GimpDynamics       *dynamics);
 
-gboolean           gimp_dynamics_input_fade_enabled (GimpDynamics *dynamics);
 
-#endif  /*  __GIMP_DYNAMICS_OPTIONS_H__  */
+#endif  /*  __GIMP_DYNAMICS_H__  */