diff --git a/ChangeLog b/ChangeLog index 9fe7b93d75..d5829cb100 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-02-08 Michael Natterer + + * app/paint/paint-types.h + * app/paint/*.h: move opaque typedefs of object instances to + paint-types.h, don't typedef empty class stuctures as their parent + class (gtk-doc gets confused), cleanups. + 2007-02-08 Sven Neumann * app/tools/gimprectangleoptions.c diff --git a/app/paint/gimpairbrush.h b/app/paint/gimpairbrush.h index 7c5961680b..15efbe2f77 100644 --- a/app/paint/gimpairbrush.h +++ b/app/paint/gimpairbrush.h @@ -31,7 +31,6 @@ #define GIMP_AIRBRUSH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_AIRBRUSH, GimpAirbrushClass)) -typedef struct _GimpAirbrush GimpAirbrush; typedef struct _GimpAirbrushClass GimpAirbrushClass; struct _GimpAirbrush @@ -45,7 +44,7 @@ struct _GimpAirbrush struct _GimpAirbrushClass { - GimpPaintbrushClass parent_class; + GimpPaintbrushClass parent_class; }; diff --git a/app/paint/gimpairbrushoptions.h b/app/paint/gimpairbrushoptions.h index 58cccb2738..d2368333bb 100644 --- a/app/paint/gimpairbrushoptions.h +++ b/app/paint/gimpairbrushoptions.h @@ -31,8 +31,7 @@ #define GIMP_AIRBRUSH_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_AIRBRUSH_OPTIONS, GimpAirbrushOptionsClass)) -typedef struct _GimpAirbrushOptions GimpAirbrushOptions; -typedef struct _GimpPaintOptionsClass GimpAirbrushOptionsClass; +typedef struct _GimpAirbrushOptionsClass GimpAirbrushOptionsClass; struct _GimpAirbrushOptions { @@ -42,6 +41,11 @@ struct _GimpAirbrushOptions gdouble pressure; }; +struct _GimpAirbrushOptionsClass +{ + GimpPaintOptionsClass parent_class; +}; + GType gimp_airbrush_options_get_type (void) G_GNUC_CONST; diff --git a/app/paint/gimpclone.h b/app/paint/gimpclone.h index 1e52d00c41..4390f2fa17 100644 --- a/app/paint/gimpclone.h +++ b/app/paint/gimpclone.h @@ -31,17 +31,16 @@ #define GIMP_CLONE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CLONE, GimpCloneClass)) -typedef struct _GimpClone GimpClone; typedef struct _GimpCloneClass GimpCloneClass; struct _GimpClone { - GimpSourceCore parent_instance; + GimpSourceCore parent_instance; }; struct _GimpCloneClass { - GimpSourceCoreClass parent_class; + GimpSourceCoreClass parent_class; }; diff --git a/app/paint/gimpcloneoptions.h b/app/paint/gimpcloneoptions.h index d477e312c5..74a06443cd 100644 --- a/app/paint/gimpcloneoptions.h +++ b/app/paint/gimpcloneoptions.h @@ -31,7 +31,6 @@ #define GIMP_CLONE_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CLONE_OPTIONS, GimpCloneOptionsClass)) -typedef struct _GimpCloneOptions GimpCloneOptions; typedef struct _GimpCloneOptionsClass GimpCloneOptionsClass; struct _GimpCloneOptions diff --git a/app/paint/gimpconvolve.h b/app/paint/gimpconvolve.h index 79de226225..bc7ac6645e 100644 --- a/app/paint/gimpconvolve.h +++ b/app/paint/gimpconvolve.h @@ -31,7 +31,6 @@ #define GIMP_CONVOLVE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONVOLVE, GimpConvolveClass)) -typedef struct _GimpConvolve GimpConvolve; typedef struct _GimpConvolveClass GimpConvolveClass; struct _GimpConvolve diff --git a/app/paint/gimpconvolveoptions.h b/app/paint/gimpconvolveoptions.h index 4ade8a24d0..da70c852a6 100644 --- a/app/paint/gimpconvolveoptions.h +++ b/app/paint/gimpconvolveoptions.h @@ -31,17 +31,21 @@ #define GIMP_CONVOLVE_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONVOLVE_OPTIONS, GimpConvolveOptionsClass)) -typedef struct _GimpConvolveOptions GimpConvolveOptions; -typedef struct _GimpPaintOptionsClass GimpConvolveOptionsClass; +typedef struct _GimpConvolveOptionsClass GimpConvolveOptionsClass; struct _GimpConvolveOptions { - GimpPaintOptions paint_options; + GimpPaintOptions parent_instance; GimpConvolveType type; gdouble rate; }; +struct _GimpConvolveOptionsClass +{ + GimpPaintOptionsClass parent_class; +}; + GType gimp_convolve_options_get_type (void) G_GNUC_CONST; diff --git a/app/paint/gimpdodgeburn.h b/app/paint/gimpdodgeburn.h index 09b7b0947b..4110498db0 100644 --- a/app/paint/gimpdodgeburn.h +++ b/app/paint/gimpdodgeburn.h @@ -30,7 +30,6 @@ #define GIMP_IS_DODGE_BURN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DODGE_BURN)) -typedef struct _GimpDodgeBurn GimpDodgeBurn; typedef struct _GimpDodgeBurnClass GimpDodgeBurnClass; struct _GimpDodgeBurn @@ -42,7 +41,7 @@ struct _GimpDodgeBurn struct _GimpDodgeBurnClass { - GimpBrushCoreClass parent_class; + GimpBrushCoreClass parent_class; }; diff --git a/app/paint/gimpdodgeburnoptions.h b/app/paint/gimpdodgeburnoptions.h index 8f5f0d5601..2efef9b78f 100644 --- a/app/paint/gimpdodgeburnoptions.h +++ b/app/paint/gimpdodgeburnoptions.h @@ -31,18 +31,22 @@ #define GIMP_DODGE_BURN_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DODGE_BURN_OPTIONS, GimpDodgeBurnOptionsClass)) -typedef struct _GimpDodgeBurnOptions GimpDodgeBurnOptions; -typedef struct _GimpPaintOptionsClass GimpDodgeBurnOptionsClass; +typedef struct _GimpDodgeBurnOptionsClass GimpDodgeBurnOptionsClass; struct _GimpDodgeBurnOptions { - GimpPaintOptions paint_options; + GimpPaintOptions parent_instance; GimpDodgeBurnType type; GimpTransferMode mode; /*highlights, midtones, shadows*/ gdouble exposure; }; +struct _GimpDodgeBurnOptionsClass +{ + GimpPaintOptionsClass parent_class; +}; + GType gimp_dodge_burn_options_get_type (void) G_GNUC_CONST; diff --git a/app/paint/gimperaser.h b/app/paint/gimperaser.h index 7fefe9ce9f..bab9a2297f 100644 --- a/app/paint/gimperaser.h +++ b/app/paint/gimperaser.h @@ -31,17 +31,16 @@ #define GIMP_ERASER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ERASER, GimpEraserClass)) -typedef struct _GimpEraser GimpEraser; typedef struct _GimpEraserClass GimpEraserClass; struct _GimpEraser { - GimpBrushCore parent_instance; + GimpBrushCore parent_instance; }; struct _GimpEraserClass { - GimpBrushCoreClass parent_class; + GimpBrushCoreClass parent_class; }; diff --git a/app/paint/gimperaseroptions.h b/app/paint/gimperaseroptions.h index 55e3838e93..a8db031b23 100644 --- a/app/paint/gimperaseroptions.h +++ b/app/paint/gimperaseroptions.h @@ -31,16 +31,20 @@ #define GIMP_ERASER_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ERASER_OPTIONS, GimpEraserOptionsClass)) -typedef struct _GimpEraserOptions GimpEraserOptions; -typedef struct _GimpPaintOptionsClass GimpEraserOptionsClass; +typedef struct _GimpEraserOptionsClass GimpEraserOptionsClass; struct _GimpEraserOptions { - GimpPaintOptions paint_options; + GimpPaintOptions parent_instance; gboolean anti_erase; }; +struct _GimpEraserOptionsClass +{ + GimpPaintOptionsClass parent_class; +}; + GType gimp_eraser_options_get_type (void) G_GNUC_CONST; diff --git a/app/paint/gimpheal.h b/app/paint/gimpheal.h index 52bf8d7c0a..1d2498a640 100644 --- a/app/paint/gimpheal.h +++ b/app/paint/gimpheal.h @@ -31,7 +31,6 @@ #define GIMP_HEAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HEAL, GimpHealClass)) -typedef struct _GimpHeal GimpHeal; typedef struct _GimpHealClass GimpHealClass; struct _GimpHeal diff --git a/app/paint/gimpink.h b/app/paint/gimpink.h index 43a76406c5..38a61b379b 100644 --- a/app/paint/gimpink.h +++ b/app/paint/gimpink.h @@ -36,7 +36,6 @@ #define GIMP_INK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_INK, GimpInkClass)) -typedef struct _GimpInk GimpInk; typedef struct _GimpInkClass GimpInkClass; struct _GimpInk diff --git a/app/paint/gimpinkoptions.h b/app/paint/gimpinkoptions.h index 7091507a81..635b602c64 100644 --- a/app/paint/gimpinkoptions.h +++ b/app/paint/gimpinkoptions.h @@ -31,12 +31,11 @@ #define GIMP_INK_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_INK_OPTIONS, GimpInkOptionsClass)) -typedef struct _GimpInkOptions GimpInkOptions; -typedef struct _GimpPaintOptionsClass GimpInkOptionsClass; +typedef struct _GimpInkOptionsClass GimpInkOptionsClass; struct _GimpInkOptions { - GimpPaintOptions paint_options; + GimpPaintOptions parent_instance; gdouble size; gdouble tilt_angle; @@ -50,6 +49,11 @@ struct _GimpInkOptions gdouble blob_angle; }; +struct _GimpInkOptionsClass +{ + GimpPaintOptionsClass parent_instance; +}; + GType gimp_ink_options_get_type (void) G_GNUC_CONST; diff --git a/app/paint/gimppaintbrush.h b/app/paint/gimppaintbrush.h index b7347ea2d4..ab0410f710 100644 --- a/app/paint/gimppaintbrush.h +++ b/app/paint/gimppaintbrush.h @@ -31,17 +31,16 @@ #define GIMP_PAINTBRUSH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PAINTBRUSH, GimpPaintbrushClass)) -typedef struct _GimpPaintbrush GimpPaintbrush; typedef struct _GimpPaintbrushClass GimpPaintbrushClass; struct _GimpPaintbrush { - GimpBrushCore parent_instance; + GimpBrushCore parent_instance; }; struct _GimpPaintbrushClass { - GimpBrushCoreClass parent_class; + GimpBrushCoreClass parent_class; }; diff --git a/app/paint/gimppencil.h b/app/paint/gimppencil.h index 8e890c9196..bd55ff0cd5 100644 --- a/app/paint/gimppencil.h +++ b/app/paint/gimppencil.h @@ -31,7 +31,6 @@ #define GIMP_PENCIL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PENCIL, GimpPencilClass)) -typedef struct _GimpPencil GimpPencil; typedef struct _GimpPencilClass GimpPencilClass; struct _GimpPencil diff --git a/app/paint/gimppenciloptions.h b/app/paint/gimppenciloptions.h index 55475449d2..757c4bf703 100644 --- a/app/paint/gimppenciloptions.h +++ b/app/paint/gimppenciloptions.h @@ -31,14 +31,18 @@ #define GIMP_PENCIL_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PENCIL_OPTIONS, GimpPencilOptionsClass)) -typedef struct _GimpPencilOptions GimpPencilOptions; -typedef struct _GimpPaintOptionsClass GimpPencilOptionsClass; +typedef struct _GimpPencilOptionsClass GimpPencilOptionsClass; struct _GimpPencilOptions { GimpPaintOptions parent_instance; }; +struct _GimpPencilOptionsClass +{ + GimpPaintOptionsClass parent_class; +}; + GType gimp_pencil_options_get_type (void) G_GNUC_CONST; diff --git a/app/paint/gimpperspectiveclone.h b/app/paint/gimpperspectiveclone.h index f115040647..8dc0996261 100644 --- a/app/paint/gimpperspectiveclone.h +++ b/app/paint/gimpperspectiveclone.h @@ -31,7 +31,6 @@ #define GIMP_PERSPECTIVE_CLONE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PERSPECTIVE_CLONE, GimpPerspectiveCloneClass)) -typedef struct _GimpPerspectiveClone GimpPerspectiveClone; typedef struct _GimpPerspectiveCloneClass GimpPerspectiveCloneClass; struct _GimpPerspectiveClone diff --git a/app/paint/gimpperspectivecloneoptions.h b/app/paint/gimpperspectivecloneoptions.h index f7952564c0..f432c47c10 100644 --- a/app/paint/gimpperspectivecloneoptions.h +++ b/app/paint/gimpperspectivecloneoptions.h @@ -31,19 +31,18 @@ #define GIMP_PERSPECTIVE_CLONE_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PERSPECTIVE_CLONE_OPTIONS, GimpPerspectiveCloneOptionsClass)) -typedef struct _GimpPerspectiveCloneOptions GimpPerspectiveCloneOptions; typedef struct _GimpPerspectiveCloneOptionsClass GimpPerspectiveCloneOptionsClass; struct _GimpPerspectiveCloneOptions { - GimpCloneOptions paint_instance; + GimpCloneOptions paint_instance; - GimpPerspectiveCloneMode clone_mode; + GimpPerspectiveCloneMode clone_mode; }; struct _GimpPerspectiveCloneOptionsClass { - GimpCloneOptionsClass parent_class; + GimpCloneOptionsClass parent_class; }; diff --git a/app/paint/gimpsmudge.h b/app/paint/gimpsmudge.h index d404b1959b..4b09b30281 100644 --- a/app/paint/gimpsmudge.h +++ b/app/paint/gimpsmudge.h @@ -33,7 +33,6 @@ #define GIMP_SMUDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SMUDGE, GimpSmudgeClass)) -typedef struct _GimpSmudge GimpSmudge; typedef struct _GimpSmudgeClass GimpSmudgeClass; struct _GimpSmudge @@ -47,7 +46,7 @@ struct _GimpSmudge struct _GimpSmudgeClass { - GimpBrushCoreClass parent_class; + GimpBrushCoreClass parent_class; }; diff --git a/app/paint/gimpsmudgeoptions.h b/app/paint/gimpsmudgeoptions.h index 302d3e47cf..39dd6eac24 100644 --- a/app/paint/gimpsmudgeoptions.h +++ b/app/paint/gimpsmudgeoptions.h @@ -31,16 +31,20 @@ #define GIMP_SMUDGE_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SMUDGE_OPTIONS, GimpSmudgeOptionsClass)) -typedef struct _GimpSmudgeOptions GimpSmudgeOptions; -typedef struct _GimpPaintOptionsClass GimpSmudgeOptionsClass; +typedef struct _GimpSmudgeOptionsClass GimpSmudgeOptionsClass; struct _GimpSmudgeOptions { - GimpPaintOptions paint_options; + GimpPaintOptions parent_instance; gdouble rate; }; +struct _GimpSmudgeOptionsClass +{ + GimpPaintOptionsClass parent_class; +}; + GType gimp_smudge_options_get_type (void) G_GNUC_CONST; diff --git a/app/paint/gimpsourcecore.h b/app/paint/gimpsourcecore.h index 817852a63f..eec4824de9 100644 --- a/app/paint/gimpsourcecore.h +++ b/app/paint/gimpsourcecore.h @@ -31,7 +31,6 @@ #define GIMP_SOURCE_CORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SOURCE_CORE, GimpSourceCoreClass)) -typedef struct _GimpSourceCore GimpSourceCore; typedef struct _GimpSourceCoreClass GimpSourceCoreClass; struct _GimpSourceCore diff --git a/app/paint/gimpsourceoptions.h b/app/paint/gimpsourceoptions.h index 55cd6769b8..e64e167dcf 100644 --- a/app/paint/gimpsourceoptions.h +++ b/app/paint/gimpsourceoptions.h @@ -31,22 +31,21 @@ #define GIMP_SOURCE_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SOURCE_OPTIONS, GimpSourceOptionsClass)) -typedef struct _GimpSourceOptions GimpSourceOptions; typedef struct _GimpSourceOptionsClass GimpSourceOptionsClass; struct _GimpSourceOptions { - GimpPaintOptions parent_instance; + GimpPaintOptions parent_instance; - GimpSourceAlignMode align_mode; - gboolean sample_merged; + GimpSourceAlignMode align_mode; + gboolean sample_merged; - gboolean use_source; /* not a property */ + gboolean use_source; /* not a property */ }; struct _GimpSourceOptionsClass { - GimpPaintOptionsClass parent_class; + GimpPaintOptionsClass parent_class; }; diff --git a/app/paint/paint-types.h b/app/paint/paint-types.h index 03cfc55128..c542f22638 100644 --- a/app/paint/paint-types.h +++ b/app/paint/paint-types.h @@ -24,15 +24,46 @@ #include "paint/paint-enums.h" -/* objects */ +/* paint cores */ + +typedef struct _GimpPaintCore GimpPaintCore; +typedef struct _GimpBrushCore GimpBrushCore; +typedef struct _GimpSourceCore GimpSourceCore; + +typedef struct _GimpAirbrush GimpAirbrush; +typedef struct _GimpClone GimpClone; +typedef struct _GimpConvolve GimpConvolve; +typedef struct _GimpDodgeBurn GimpDodgeBurn; +typedef struct _GimpEraser GimpEraser; +typedef struct _GimpHeal GimpHeal; +typedef struct _GimpInk GimpInk; +typedef struct _GimpPaintbrush GimpPaintbrush; +typedef struct _GimpPencil GimpPencil; +typedef struct _GimpPerspectiveClone GimpPerspectiveClone; +typedef struct _GimpSmudge GimpSmudge; + + +/* paint options */ + +typedef struct _GimpPaintOptions GimpPaintOptions; +typedef struct _GimpSourceOptions GimpSourceOptions; + +typedef struct _GimpAirbrushOptions GimpAirbrushOptions; +typedef struct _GimpCloneOptions GimpCloneOptions; +typedef struct _GimpConvolveOptions GimpConvolveOptions; +typedef struct _GimpDodgeBurnOptions GimpDodgeBurnOptions; +typedef struct _GimpEraserOptions GimpEraserOptions; +typedef struct _GimpInkOptions GimpInkOptions; +typedef struct _GimpPencilOptions GimpPencilOptions; +typedef struct _GimpPerspectiveCloneOptions GimpPerspectiveCloneOptions; +typedef struct _GimpSmudgeOptions GimpSmudgeOptions; + + +/* paint undos */ -typedef struct _GimpPaintCore GimpPaintCore; typedef struct _GimpPaintCoreUndo GimpPaintCoreUndo; -typedef struct _GimpBrushCore GimpBrushCore; typedef struct _GimpInkUndo GimpInkUndo; -typedef struct _GimpPaintOptions GimpPaintOptions; - /* functions */