[goffice] gtk-doc fixes

From: Morten Welinder <mortenw src gnome org>
To: commits-list gnome org
Cc:
Subject: [goffice] gtk-doc fixes
Date: Sun, 25 Nov 2018 01:57:12 +0000 (UTC)
commit 47672d5216d749da1efa7e377e6879074130ef92
Author: Morten Welinder <terra gnome org>
Date:   Sat Nov 24 20:55:40 2018 -0500

    gtk-doc fixes
    
    gtk-doc doesn't understand that "unsigned" is a perfectly fine type.
    It wants "unsigned int".  Sometimes.  Maybe.
    
    The technical term for this, in gtk+ speak, is "progress".

 NEWS                               |  4 ++++
 goffice/canvas/goc-polygon.h       |  4 ++--
 goffice/canvas/goc-polyline.h      |  2 +-
 goffice/canvas/goc-utils.h         |  8 ++++----
 goffice/graph/gog-axis-line-impl.h |  2 +-
 goffice/graph/gog-chart-impl.h     |  8 ++++----
 goffice/graph/gog-graph-impl.h     |  2 +-
 goffice/graph/gog-object.h         | 10 ++++------
 goffice/graph/gog-plot-impl.h      |  6 +++---
 goffice/graph/gog-series-impl.h    | 10 +++++-----
 goffice/graph/gog-series-labels.h  | 12 ++++++------
 goffice/graph/gog-smoothed-curve.h |  2 +-
 goffice/graph/gog-view.h           |  4 ++--
 goffice/math/go-cspline.h          |  6 +++---
 goffice/math/go-quad.c             |  4 ++--
 goffice/math/go-regression.h       |  4 ++--
 goffice/utils/go-bezier.h          |  4 ++--
 goffice/utils/go-format.h          |  2 +-
 goffice/utils/go-line.h            |  2 +-
 goffice/utils/go-pattern.h         |  2 +-
 20 files changed, 50 insertions(+), 48 deletions(-)
---
diff --git a/NEWS b/NEWS
index 3d68326c..32ab2a89 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 goffice 0.10.45:
 
+Morten:
+       * Introspection fixes.
+       * Work around gtk-doc bugs.
+
 --------------------------------------------------------------------------
 goffice 0.10.44:
 
diff --git a/goffice/canvas/goc-polygon.h b/goffice/canvas/goc-polygon.h
index fc5e6cc9..c066f4f7 100644
--- a/goffice/canvas/goc-polygon.h
+++ b/goffice/canvas/goc-polygon.h
@@ -32,10 +32,10 @@ struct _GocPolygon {
        GocStyledItem base;
 
        GocPoint *points;
-       unsigned nb_points;
+       unsigned int nb_points;
        gboolean use_spline;
        gboolean fill_rule;
-       unsigned nb_sizes;
+       unsigned int nb_sizes;
        int *sizes;
        gpointer priv;
 };
diff --git a/goffice/canvas/goc-polyline.h b/goffice/canvas/goc-polyline.h
index ffdabba8..66cad979 100644
--- a/goffice/canvas/goc-polyline.h
+++ b/goffice/canvas/goc-polyline.h
@@ -32,7 +32,7 @@ struct _GocPolyline {
        GocStyledItem base;
 
        GocPoint *points;
-       unsigned nb_points;
+       unsigned int nb_points;
        gboolean use_spline;
        gpointer priv;
 };
diff --git a/goffice/canvas/goc-utils.h b/goffice/canvas/goc-utils.h
index 998f00d3..66daf3e9 100644
--- a/goffice/canvas/goc-utils.h
+++ b/goffice/canvas/goc-utils.h
@@ -26,8 +26,8 @@
 
 typedef struct {
        /*< private >*/
-       unsigned n;
-       unsigned refs;
+       unsigned int n;
+       unsigned int refs;
        /*< public >*/
        GocPoint *points;
 } GocPoints;
@@ -41,9 +41,9 @@ void           goc_points_unref (GocPoints *points);
 
 typedef struct {
        /*< private >*/
-       unsigned refs;
+       unsigned int refs;
        /*< public >*/
-       unsigned n;
+       unsigned int n;
        int *vals;
 } GocIntArray;
 
diff --git a/goffice/graph/gog-axis-line-impl.h b/goffice/graph/gog-axis-line-impl.h
index fbe38e35..d31fc732 100644
--- a/goffice/graph/gog-axis-line-impl.h
+++ b/goffice/graph/gog-axis-line-impl.h
@@ -38,7 +38,7 @@ struct _GogAxisBase {
        GogAxis         *axis;
 
        GogAxisPosition    position;
-       unsigned           crossed_axis_id;
+       unsigned int       crossed_axis_id;
        GogDatasetElement  cross_location;
 
        int                padding;
diff --git a/goffice/graph/gog-chart-impl.h b/goffice/graph/gog-chart-impl.h
index e835f337..0ec46586 100644
--- a/goffice/graph/gog-chart-impl.h
+++ b/goffice/graph/gog-chart-impl.h
@@ -30,14 +30,14 @@ struct _GogChart {
        GogOutlinedObject        base;
 
        GSList  *plots;
-       unsigned full_cardinality, visible_cardinality;
+       unsigned int full_cardinality, visible_cardinality;
        gboolean cardinality_valid;
 
        /* use a simple grid layout to position charts within graph */
-       unsigned x_pos, y_pos;
-       unsigned cols, rows;            /* if == 0, chart is not positionned */
+       unsigned int x_pos, y_pos;
+       unsigned int cols, rows;                /* if == 0, chart is not positionned */
        /* actual chart position in graph grid after layout validation */
-       unsigned x_pos_actual, y_pos_actual;
+       unsigned int x_pos_actual, y_pos_actual;
 
        GogObject *grid;
        GSList  *axes;
diff --git a/goffice/graph/gog-graph-impl.h b/goffice/graph/gog-graph-impl.h
index ef2f9f5c..1fa8c764 100644
--- a/goffice/graph/gog-graph-impl.h
+++ b/goffice/graph/gog-graph-impl.h
@@ -33,7 +33,7 @@ struct _GogGraph {
        GSList   *charts;
        GSList   *data;
 
-       unsigned  num_cols, num_rows;
+       unsigned int num_cols, num_rows;
        double    width, height;
 
        guint     idle_handler;
diff --git a/goffice/graph/gog-object.h b/goffice/graph/gog-object.h
index ce9be459..83f31a47 100644
--- a/goffice/graph/gog-object.h
+++ b/goffice/graph/gog-object.h
@@ -41,7 +41,7 @@ typedef enum {
 struct _GogObjectRole {
        char const *id; /* for persistence */
        char const *is_a_typename;
-       unsigned    priority;
+       unsigned    int priority;
 
        guint32                 allowable_positions;
        GogObjectPosition       default_position;
@@ -64,7 +64,7 @@ GType gog_object_role_get_type (void);
 struct _GogObject {
        GObject          base;
 
-       unsigned         id;
+       unsigned int     id;
        char            *user_name;     /* user assigned, NULL will fall back to system generated */
        char            *auto_name;     /* system generated, in current locale */
 
@@ -90,10 +90,8 @@ typedef struct {
        GHashTable *roles;
        GType       view_type;
 
-       /* using some Private/Public statements to make gtk-doc happy since it does not like the ":1"*/
-       unsigned use_parent_as_proxy /*< private >*/:1/*< public >*/; /* when we change, pretend it was our 
parent */
-        /*< private >*/
-       unsigned roles_allocated:1;
+       unsigned int use_parent_as_proxy : 1; /* when we change, pretend it was our parent */
+       unsigned int roles_allocated:1;
        /*< public >*/
 
        /* Virtuals */
diff --git a/goffice/graph/gog-plot-impl.h b/goffice/graph/gog-plot-impl.h
index 2d516cf4..4600d840 100644
--- a/goffice/graph/gog-plot-impl.h
+++ b/goffice/graph/gog-plot-impl.h
@@ -27,7 +27,7 @@
 G_BEGIN_DECLS
 
 struct _GogPlotDesc {
-       unsigned  num_series_max;
+       unsigned int num_series_max;
        GogSeriesDesc series;
 };
 
@@ -35,9 +35,9 @@ struct _GogPlot {
        GogObject        base;
 
        GSList          *series;
-       unsigned         full_cardinality, visible_cardinality;
+       unsigned int     full_cardinality, visible_cardinality;
        gboolean         cardinality_valid;
-       unsigned         index_num;
+       unsigned int     index_num;
        gboolean         vary_style_by_element;
        GogPlotRenderingOrder rendering_order;
        gchar           *plot_group;
diff --git a/goffice/graph/gog-series-impl.h b/goffice/graph/gog-series-impl.h
index eaef6bd5..43183caf 100644
--- a/goffice/graph/gog-series-impl.h
+++ b/goffice/graph/gog-series-impl.h
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
 typedef struct {
        GogStyledObject base;
 
-       unsigned index;
+       unsigned int index;
 } GogSeriesElement;
 
 typedef struct {
@@ -61,8 +61,8 @@ struct _GogSeriesDimDesc {
 };
 
 struct _GogSeriesDesc {
-       unsigned style_fields;
-       unsigned num_dim;
+       unsigned int style_fields;
+       unsigned int num_dim;
        GogSeriesDimDesc const *dim;
 };
 
@@ -78,7 +78,7 @@ struct _GogSeries {
        GogPlot           *plot;
        GogDatasetElement *values;
        gboolean           has_legend;
-       unsigned           num_elements;
+       unsigned int       num_elements;
        GogSeriesFillType  fill_type;
        GList             *overrides;  /* GogSeriesElement (individual points) */
 
@@ -86,7 +86,7 @@ struct _GogSeries {
        gboolean interpolation_skip_invalid;
        /* data related to data labels */
        GogSeriesLabelsPos default_pos;
-       unsigned allowed_pos; /* if 0, no data labels can be addded */
+       unsigned int allowed_pos; /* if 0, no data labels can be addded */
 };
 
 typedef struct {
diff --git a/goffice/graph/gog-series-labels.h b/goffice/graph/gog-series-labels.h
index ef936055..4d170d89 100644
--- a/goffice/graph/gog-series-labels.h
+++ b/goffice/graph/gog-series-labels.h
@@ -37,11 +37,11 @@ struct _GogDataLabel {
        GogOutlinedObject base;
 
        /* private */
-       unsigned index;
+       unsigned int index;
        GogSeriesLabelsPos position;
        GogSeriesLabelsPos default_pos;
-       unsigned allowed_pos;
-       unsigned offset; /* position offset in pixels */
+       unsigned int allowed_pos;
+       unsigned int offset; /* position offset in pixels */
        char *format;
        char *separator;
        GogDatasetElement custom_label[2];
@@ -67,12 +67,12 @@ struct _GogSeriesLabels {
        /* private */
        GogSeriesLabelsPos position;
        GogSeriesLabelsPos default_pos;
-       unsigned allowed_pos;
-       unsigned offset; /* position offset in pixels */
+       unsigned int allowed_pos;
+       unsigned int offset; /* position offset in pixels */
        char *format;
        char *separator;
        GogDatasetElement custom_labels[2];
-       unsigned n_elts;
+       unsigned int n_elts;
        GogSeriesLabelElt *elements;
        GList *overrides;
        gboolean supports_percent;
diff --git a/goffice/graph/gog-smoothed-curve.h b/goffice/graph/gog-smoothed-curve.h
index 98e872f9..fd111c07 100644
--- a/goffice/graph/gog-smoothed-curve.h
+++ b/goffice/graph/gog-smoothed-curve.h
@@ -31,7 +31,7 @@ struct  _GogSmoothedCurve {
 
        GogSeries         *series;
        double *x, *y;
-       unsigned nb;
+       unsigned int nb;
        GogDatasetElement *name;
 };
 
diff --git a/goffice/graph/gog-view.h b/goffice/graph/gog-view.h
index b8c10c20..e5d3ad55 100644
--- a/goffice/graph/gog-view.h
+++ b/goffice/graph/gog-view.h
@@ -49,7 +49,7 @@ struct _GogToolAction {
        GogTool         *tool;
        gpointer         data;
        /* private */
-       unsigned ref_count;
+       unsigned int ref_count;
 };
 
 GType        gog_tool_action_get_type   (void);
@@ -82,7 +82,7 @@ struct _GogView {
 typedef struct {
        GObjectClass    base;
 
-       unsigned clip;  /* Automaticaly clip to object bounding box */
+       unsigned int clip;      /* Automaticaly clip to object bounding box */
 
        /* Virtuals */
        void     (*state_init)    (GogView *view);
diff --git a/goffice/math/go-cspline.h b/goffice/math/go-cspline.h
index ebc1e422..175105de 100644
--- a/goffice/math/go-cspline.h
+++ b/goffice/math/go-cspline.h
@@ -31,7 +31,7 @@ struct _GOCSpline {
        double const *x, *y;
        double *a, *b, *c;
        int n;
-       unsigned ref_count;
+       unsigned int ref_count;
 };
 
 typedef enum {
@@ -59,12 +59,12 @@ struct _GOCSplinel {
        long double const *x, *y;
        long double *a, *b, *c;
        int n;
-       unsigned ref_count;
+       unsigned int ref_count;
 };
 
 GType go_csplinel_get_type (void);
 GOCSplinel *go_cspline_initl (long double const *x, long double const *y, int n,
-                                    unsigned limits, long double a0, long double a1);
+                             unsigned limits, long double a0, long double a1);
 void go_cspline_destroyl (GOCSplinel *sp);
 long double go_cspline_get_valuel (GOCSplinel const *sp, long double x);
 long double go_cspline_get_derivl (GOCSplinel const *sp, long double x);
diff --git a/goffice/math/go-quad.c b/goffice/math/go-quad.c
index d04be0a2..bb77f57a 100644
--- a/goffice/math/go-quad.c
+++ b/goffice/math/go-quad.c
@@ -1,7 +1,7 @@
-/*
+ /*
  * go-quad.c:  Extended precision routines.
  *
- * Authors:
+ * Authors
  *   Morten Welinder <terra gnome org>
  *
  * This library is free software; you can redistribute it and/or
diff --git a/goffice/math/go-regression.h b/goffice/math/go-regression.h
index 36811b2c..6f400fcb 100644
--- a/goffice/math/go-regression.h
+++ b/goffice/math/go-regression.h
@@ -35,7 +35,7 @@ typedef struct {
        double *xbar;
        double var;             /* The variance of the entire regression: sum(errors^2)/(n-xdim) */
        /*<private>*/
-       unsigned ref_count;
+       unsigned int ref_count;
 } go_regression_stat_t;
 #define GORegressionStat go_regression_stat_t
 
@@ -139,7 +139,7 @@ typedef struct {
        long double var; /* The variance of the entire regression:
                        sum(errors^2)/(n-xdim) */
        /*<private>*/
-       unsigned ref_count;
+       unsigned int ref_count;
 } go_regression_stat_tl;
 #define GORegressionStatl go_regression_stat_tl
 
diff --git a/goffice/utils/go-bezier.h b/goffice/utils/go-bezier.h
index bcb71bed..270372e6 100644
--- a/goffice/utils/go-bezier.h
+++ b/goffice/utils/go-bezier.h
@@ -30,8 +30,8 @@ struct  _GOBezierSpline {
        double *x, *y;
        int n;
        gboolean closed;
-       /* private */
-       unsigned ref_count;
+       /*< private >*/
+       unsigned int ref_count;
 };
 
 GType go_bezier_spline_get_type (void);
diff --git a/goffice/utils/go-format.h b/goffice/utils/go-format.h
index e7791e6f..0c2a24fe 100644
--- a/goffice/utils/go-format.h
+++ b/goffice/utils/go-format.h
@@ -121,7 +121,7 @@ typedef struct {
 
        /* <private> */
        int expansion[30]; /* what is this for? */
-       unsigned ref_count;
+       unsigned int ref_count;
 } GOFormatDetails;
 
 GType go_format_details_get_type (void);
diff --git a/goffice/utils/go-line.h b/goffice/utils/go-line.h
index f902c425..b371d5d0 100644
--- a/goffice/utils/go-line.h
+++ b/goffice/utils/go-line.h
@@ -31,7 +31,7 @@ typedef struct {
        unsigned int     n_dash;
        double          *dash;
        /* <private> */
-       unsigned ref_count;
+       unsigned int ref_count;
 } GOLineDashSequence;
 GType go_line_dash_sequence_get_type (void);
 
diff --git a/goffice/utils/go-pattern.h b/goffice/utils/go-pattern.h
index e8628d46..94243ae8 100644
--- a/goffice/utils/go-pattern.h
+++ b/goffice/utils/go-pattern.h
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
 
 struct _GOPattern {
        GOColor  fore, back;
-       unsigned pattern;
+       unsigned int pattern;
 };
 
 /* Useful for themes to explicitly name the pattern */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]