[gnumeric] Introspection fixes



commit 969ed710f700c90fab904544f85807d362ccfed4
Author: Morten Welinder <terra gnome org>
Date:   Fri May 11 18:11:17 2018 -0400

    Introspection fixes
    
    Introspection does not understand pass-through arguments.  It's better
    to (skip) the result than disconnecting the input and output.

 src/position.c |   25 ++++++++++++-------------
 src/ranges.c   |   18 +++++++++---------
 2 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/src/position.c b/src/position.c
index 0a5fd3c..a56057f 100644
--- a/src/position.c
+++ b/src/position.c
@@ -85,7 +85,7 @@ gnm_eval_pos_get_type (void)
  * @col: column.
  * @row: row
  *
- * Returns: (transfer none): the initialized #GnmEvalPos (@ep).
+ * Returns: (skip) (transfer none): the initialized #GnmEvalPos (@ep).
  **/
 GnmEvalPos *
 eval_pos_init (GnmEvalPos *ep, Sheet *sheet, int col, int row)
@@ -108,7 +108,7 @@ eval_pos_init (GnmEvalPos *ep, Sheet *sheet, int col, int row)
  * @s: #Sheet
  * @pos: #GnmCellPos
  *
- * Returns: (transfer none): the initialized #GnmEvalPos (@ep).
+ * Returns: (skip) (transfer none): the initialized #GnmEvalPos (@ep).
  **/
 GnmEvalPos *
 eval_pos_init_pos (GnmEvalPos *ep, Sheet *sheet, GnmCellPos const *pos)
@@ -130,7 +130,7 @@ eval_pos_init_pos (GnmEvalPos *ep, Sheet *sheet, GnmCellPos const *pos)
  * @ep: The position to init.
  * @dep:
  *
- * Returns: (transfer none): the initialized #GnmEvalPos (@ep).
+ * Returns: (skip) (transfer none): the initialized #GnmEvalPos (@ep).
  **/
 GnmEvalPos *
 eval_pos_init_dep (GnmEvalPos *ep, GnmDependent const *dep)
@@ -153,7 +153,7 @@ eval_pos_init_dep (GnmEvalPos *ep, GnmDependent const *dep)
  *
  * The function initializes an evalpos with the edit position from the
  * given sheetview.
- * Returns: (transfer none): the initialized #GnmEvalPos (@ep).
+ * Returns: (skip) (transfer none): the initialized #GnmEvalPos (@ep).
  **/
 GnmEvalPos *
 eval_pos_init_editpos (GnmEvalPos *ep, SheetView const *sv)
@@ -172,7 +172,7 @@ eval_pos_init_editpos (GnmEvalPos *ep, SheetView const *sv)
  *
  * The function initializes an evalpos with the given cell
  *
- * Returns: (transfer none): the initialized #GnmEvalPos (@ep).
+ * Returns: (skip) (transfer none): the initialized #GnmEvalPos (@ep).
  */
 GnmEvalPos *
 eval_pos_init_cell (GnmEvalPos *ep, GnmCell const *cell)
@@ -195,7 +195,7 @@ eval_pos_init_cell (GnmEvalPos *ep, GnmCell const *cell)
  *
  * The function initializes an evalpos with the given sheet.
  *
- * Returns: (transfer none): the initialized #GnmEvalPos (@ep).
+ * Returns: (skip) (transfer none): the initialized #GnmEvalPos (@ep).
  */
 GnmEvalPos *
 eval_pos_init_sheet (GnmEvalPos *ep, Sheet const *sheet)
@@ -250,7 +250,7 @@ gnm_parse_pos_get_type (void)
  *
  * Use either a sheet (preferred) or a workbook to initialize the supplied
  * ParsePosition.
- * Returns: (transfer none): the initialized #GnmParsePos (@pp).
+ * Returns: (skip) (transfer none): the initialized #GnmParsePos (@pp).
  */
 GnmParsePos *
 parse_pos_init (GnmParsePos *pp, Workbook *wb, Sheet const *sheet,
@@ -275,7 +275,7 @@ parse_pos_init (GnmParsePos *pp, Workbook *wb, Sheet const *sheet,
  * @pp: The position to init.
  * @dep: The dependent
  *
- * Returns: (transfer none): the initialized #GnmParsePos (@pp).
+ * Returns: (skip) (transfer none): the initialized #GnmParsePos (@pp).
  */
 GnmParsePos *
 parse_pos_init_dep (GnmParsePos *pp, GnmDependent const *dep)
@@ -294,7 +294,7 @@ parse_pos_init_dep (GnmParsePos *pp, GnmDependent const *dep)
  * @pp: The position to init.
  * @cell: The cell
  *
- * Returns: (transfer none): the initialized #GnmParsePos (@pp).
+ * Returns: (skip) (transfer none): the initialized #GnmParsePos (@pp).
  */
 GnmParsePos *
 parse_pos_init_cell (GnmParsePos *pp, GnmCell const *cell)
@@ -312,7 +312,7 @@ parse_pos_init_cell (GnmParsePos *pp, GnmCell const *cell)
  * @pp: The position to init.
  * @ep: #GnmEvalPos
  *
- * Returns: (transfer none): the initialized #GnmParsePos (@pp).
+ * Returns: (skip) (transfer none): the initialized #GnmParsePos (@pp).
  */
 GnmParsePos *
 parse_pos_init_evalpos (GnmParsePos *pp, GnmEvalPos const *ep)
@@ -327,7 +327,7 @@ parse_pos_init_evalpos (GnmParsePos *pp, GnmEvalPos const *ep)
  * @pp: The position to init.
  * @sv: sheet view
  *
- * Returns: (transfer none): the initialized #GnmParsePos (@pp).
+ * Returns: (skip) (transfer none): the initialized #GnmParsePos (@pp).
  */
 GnmParsePos *
 parse_pos_init_editpos (GnmParsePos *pp, SheetView const *sv)
@@ -343,7 +343,7 @@ parse_pos_init_editpos (GnmParsePos *pp, SheetView const *sv)
  * @pp: The position to init.
  * @sheet: The sheet
  *
- * Returns: (transfer none): the initialized #GnmParsePos (@pp).
+ * Returns: (skip) (transfer none): the initialized #GnmParsePos (@pp).
  */
 GnmParsePos *
 parse_pos_init_sheet (GnmParsePos *pp, Sheet const *sheet)
@@ -620,4 +620,3 @@ gnm_cellpos_equal (GnmCellPos const *a, GnmCellPos const *b)
 {
        return (a->row == b->row && a->col == b->col);
 }
-
diff --git a/src/ranges.c b/src/ranges.c
index 80da983..42ac101 100644
--- a/src/ranges.c
+++ b/src/ranges.c
@@ -41,7 +41,7 @@
  *
  * Updates @r to fill @sheet in its entirety.
  *
- * Returns: (transfer none): @r
+ * Returns: (skip) (transfer none): @r
  */
 GnmRange *
 range_init_full_sheet (GnmRange *r, Sheet const *sheet)
@@ -62,7 +62,7 @@ range_init_full_sheet (GnmRange *r, Sheet const *sheet)
  *
  * Updates @r to span full columns @start_col through @end_col completely.
  *
- * Returns: (transfer none): @r
+ * Returns: (skip) (transfer none): @r
  */
 GnmRange *
 range_init_cols (GnmRange *r, Sheet const *sheet, int start_col, int end_col)
@@ -83,7 +83,7 @@ range_init_cols (GnmRange *r, Sheet const *sheet, int start_col, int end_col)
  *
  * Updates @r to span full rows @start_row through @end_row completely.
  *
- * Returns: (transfer none): @r
+ * Returns: (skip) (transfer none): @r
  */
 GnmRange *
 range_init_rows (GnmRange *r, Sheet const *sheet, int start_row, int end_row)
@@ -101,7 +101,7 @@ range_init_rows (GnmRange *r, Sheet const *sheet, int start_row, int end_row)
  *
  * Updates @r to a meaningless range
  *
- * Returns: (transfer none): @r
+ * Returns: (skip) (transfer none): @r
  */
 GnmRange *
 range_init_invalid (GnmRange *r)
@@ -120,7 +120,7 @@ range_init_invalid (GnmRange *r)
  *
  * Updates @r to be the same as the range part of @rr.
  *
- * Returns: (transfer none): @r
+ * Returns: (skip) (transfer none): @r
  */
 GnmRange *
 range_init_rangeref (GnmRange *range, GnmRangeRef const *rr)
@@ -142,7 +142,7 @@ range_init_rangeref (GnmRange *range, GnmRangeRef const *rr)
  *
  * Updates @r to be the same as the cell range of @v.
  *
- * Returns: (transfer none) (nullable): @r
+ * Returns: (skip) (transfer none) (nullable): @r
  */
 GnmRange *
 range_init_value (GnmRange *range, GnmValue const *v)
@@ -160,7 +160,7 @@ range_init_value (GnmRange *range, GnmValue const *v)
  *
  * Updates @r to be the singleton range of @pos
  *
- * Returns: (transfer none): @r
+ * Returns: (skip) (transfer none): @r
  */
 GnmRange *
 range_init_cellpos (GnmRange *r, GnmCellPos const *pos)
@@ -180,7 +180,7 @@ range_init_cellpos (GnmRange *r, GnmCellPos const *pos)
  *
  * Updates @r to start at @start and spanning @cols columns and @rows rows.
  *
- * Returns: (transfer none): @r
+ * Returns: (skip) (transfer none): @r
  */
 GnmRange *
 range_init_cellpos_size (GnmRange *r,
@@ -204,7 +204,7 @@ range_init_cellpos_size (GnmRange *r,
  * Updates @r to start at (@start_col,@start_row) and end
  * at (@end_col,@end_row).
  *
- * Returns: (transfer none): @r
+ * Returns: (skip) (transfer none): @r
  */
 GnmRange *
 range_init (GnmRange *r, int start_col, int start_row,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]