[gnumeric] Introspection: updates related to element type.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Introspection: updates related to element type.
- Date: Wed, 5 Jun 2013 02:27:01 +0000 (UTC)
commit 1d912442a342c74f48772aa6698500cf4554ac96
Author: Morten Welinder <terra gnome org>
Date: Tue Jun 4 22:26:33 2013 -0400
Introspection: updates related to element type.
ChangeLog | 5 +++--
NEWS | 1 +
src/application.h | 2 +-
src/collect.h | 8 ++++----
src/print.c | 6 ++++++
src/rangefunc-strings.c | 7 +++++++
src/search.c | 13 ++++++++++---
src/selection.h | 2 +-
src/sheet-control-gui.h | 2 +-
src/sheet-object.c | 2 +-
src/sheet.c | 2 +-
src/stf-parse.c | 7 +++++--
src/style-conditions.c | 2 +-
13 files changed, 42 insertions(+), 17 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fe03ca6..4ed252a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,8 +9,9 @@
2013-06-01 Andreas J. Guelzow <aguelzow pyrshep ca>
- * src/item-grid.c (cb_cursor_come_to_rest): gnumeric_position_tooltip needs the
- tooltip size, so load the text before calling it.
+ * src/item-grid.c (cb_cursor_come_to_rest):
+ gnumeric_position_tooltip needs the tooltip size, so load the text
+ before calling it.
2013-05-29 Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/NEWS b/NEWS
index 32593ab..8703f25 100644
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,7 @@ Morten:
* Add new SNORM.DIST.RANGE function.
* Fix critical when last row deleted.
* Fix criticals in about dialog.
+ * Introspection fixes.
--------------------------------------------------------------------------
Gnumeric 1.12.2
diff --git a/src/application.h b/src/application.h
index b1166bf..f88b4e8 100644
--- a/src/application.h
+++ b/src/application.h
@@ -8,7 +8,7 @@
G_BEGIN_DECLS
#define GNM_APP_TYPE (gnm_app_get_type ())
-typedef gboolean (*GnmWbIterFunc) (Workbook *, gpointer data);
+typedef gboolean (*GnmWbIterFunc) (Workbook *wb, gpointer data);
GType gnm_app_get_type (void);
GObject *gnm_app_get_app (void);
diff --git a/src/collect.h b/src/collect.h
index ba8288f..4683a76 100644
--- a/src/collect.h
+++ b/src/collect.h
@@ -30,10 +30,10 @@ typedef enum {
COLLECT_INFO = 0x1000000
} CollectFlags;
-typedef int (*float_range_function_t) (gnm_float const *, int, gnm_float *);
-typedef int (*float_range_function2_t) (gnm_float const *, gnm_float const *, int, gnm_float *);
-typedef int (*float_range_function2d_t) (gnm_float const *, gnm_float const *, int, gnm_float *, gpointer);
-typedef int (*string_range_function_t) (GPtrArray *, char**);
+typedef int (*float_range_function_t) (gnm_float const *xs, int n, gnm_float *res);
+typedef int (*float_range_function2_t) (gnm_float const *xs, gnm_float const *ys, int n, gnm_float *res);
+typedef int (*float_range_function2d_t) (gnm_float const *xs, gnm_float const *ys, int n, gnm_float *res,
gpointer data);
+typedef int (*string_range_function_t) (GPtrArray *xs, char**res);
gnm_float *collect_floats_value (GnmValue const *val,
GnmEvalPos const *ep,
diff --git a/src/print.c b/src/print.c
index c118d1d..6fc235f 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1968,6 +1968,12 @@ gnm_draw_so_page_cb (G_GNUC_UNUSED GtkPrintOperation *operation,
cairo_restore (cr);
}
+/**
+ * gnm_print_so:
+ * @wbc:
+ * @sos: (element-type SheetObject) (transfer none):
+ * @export_dst:
+ */
void
gnm_print_so (WorkbookControl *wbc, GPtrArray *sos,
GsfOutput *export_dst)
diff --git a/src/rangefunc-strings.c b/src/rangefunc-strings.c
index 2d5f085..5034620 100644
--- a/src/rangefunc-strings.c
+++ b/src/rangefunc-strings.c
@@ -11,6 +11,13 @@
#include <string.h>
+/**
+ * range_concatenate:
+ * @data: (element-type utf8) (transfer none):
+ * @res: (out) (transfer full):
+ *
+ * Returns: non-zero on error.
+ */
int
range_concatenate (GPtrArray *data, char **res)
{
diff --git a/src/search.c b/src/search.c
index 05dd7c7..622f8c9 100644
--- a/src/search.c
+++ b/src/search.c
@@ -248,6 +248,10 @@ gnm_search_collect_cells (GnmSearchReplace *sr)
return cells;
}
+/**
+ * gnm_search_collect_cells_free:
+ * @cells: (element-type GnmEvalPos) (transfer full):
+ */
void
gnm_search_collect_cells_free (GPtrArray *cells)
{
@@ -262,10 +266,9 @@ gnm_search_collect_cells_free (GPtrArray *cells)
/**
* gnm_search_filter_matching:
* @sr: The search spec.
- * @cells: An array of GnmEvalPos*, presumably a result of gnm_search_collect_cells.
+ * @cells: (element-type GnmEvalPos): Cell positions to filter, presumably a result of
gnm_search_collect_cells.
*
- * Returns: (element-type GnmSearchReplace) (transfer full): an array of
- * GnmSearchFilterResult*s, which the caller must free.
+ * Returns: (element-type GnmSearchFilterResult) (transfer full): matches
*/
GPtrArray *
@@ -313,6 +316,10 @@ gnm_search_filter_matching (GnmSearchReplace *sr, const GPtrArray *cells)
return result;
}
+/**
+ * gnm_search_filter_matching_free:
+ * @matches: (element-type GnmSearchFilterResult) (transfer full): matches
+ */
void
gnm_search_filter_matching_free (GPtrArray *matches)
{
diff --git a/src/selection.h b/src/selection.h
index 8d5a279..73de816 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -62,7 +62,7 @@ void sv_selection_walk_step (SheetView *sv,
gboolean horizontal);
/* Utilities for operating on a selection */
-typedef void (*SelectionApplyFunc) (SheetView *sv, GnmRange const *,
+typedef void (*SelectionApplyFunc) (SheetView *sv, GnmRange const *r,
gpointer user_data);
typedef gboolean (*GnmSelectionFunc) (SheetView *sv, GnmRange const *r,
gpointer user_data);
diff --git a/src/sheet-control-gui.h b/src/sheet-control-gui.h
index 35cdb88..093160f 100644
--- a/src/sheet-control-gui.h
+++ b/src/sheet-control-gui.h
@@ -96,7 +96,7 @@ void scg_size_guide_motion (SheetControlGUI *scg, gboolean vert,
gint64 guide_pos);
void scg_size_guide_stop (SheetControlGUI *scg);
-typedef void (*SCGUIMoveFunc) (SheetControlGUI *, int n,
+typedef void (*SCGUIMoveFunc) (SheetControlGUI *scg, int n,
gboolean jump, gboolean horiz);
void scg_queue_movement (SheetControlGUI *scg,
SCGUIMoveFunc handler,
diff --git a/src/sheet-object.c b/src/sheet-object.c
index 23a693f..8e8b336 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -263,7 +263,7 @@ sheet_object_populate_menu_real (SheetObject *so, GPtrArray *actions)
/**
* sheet_object_populate_menu:
* @so: #SheetObject
- * @actions: #GPtrArray
+ * @actions: (inout) (transfer full) (element-type SheetObjectAction): #GPtrArray
*
* Get a list of the actions that can be performed on @so
**/
diff --git a/src/sheet.c b/src/sheet.c
index 79e6bdf..bb6542d 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -3791,7 +3791,7 @@ cell_ordering (gconstpointer a_, gconstpointer b_)
* @r: a #GnmRange
*
* Retrieves an array of all cells inside @r.
- * Returns: (transfer container): the cells array.
+ * Returns: (element-type GnmCell) (transfer container): the cells array.
**/
GPtrArray *
sheet_cells (Sheet *sheet, const GnmRange *r)
diff --git a/src/stf-parse.c b/src/stf-parse.c
index 8fb65ad..a8fd5cb 100644
--- a/src/stf-parse.c
+++ b/src/stf-parse.c
@@ -812,6 +812,9 @@ stf_parse_fixed_line (Source_t *src, StfParseOptions_t *parseoptions)
return line;
}
+/**
+ * stf_parse_general_free: (skip)
+ */
void
stf_parse_general_free (GPtrArray *lines)
{
@@ -827,7 +830,7 @@ stf_parse_general_free (GPtrArray *lines)
/**
- * stf_parse_general:
+ * stf_parse_general: (skip)
*
* Returns: (transfer full): a GPtrArray of lines, where each line is itself a
* GPtrArray of strings.
@@ -883,7 +886,7 @@ stf_parse_general (StfParseOptions_t *parseoptions,
}
/**
- * stf_parse_lines:
+ * stf_parse_lines: (skip)
* @parseoptions: #StfParseOptions_t
* @lines_chunk:
* @data:
diff --git a/src/style-conditions.c b/src/style-conditions.c
index 328d262..07c00e6 100644
--- a/src/style-conditions.c
+++ b/src/style-conditions.c
@@ -380,7 +380,7 @@ gnm_style_conditions_set_sheet (GnmStyleConditions *sc, Sheet *sheet)
* gnm_style_conditions_details:
* @sc: #GnmStyleConditions
*
- * Returns: (transfer none): an array of GnmStyleCond which should not be modified.
+ * Returns: (element-type GnmStyleCond) (transfer none): style details.
**/
GPtrArray const *
gnm_style_conditions_details (GnmStyleConditions const *sc)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]