[gnumeric] Introspection: fix warnings.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Introspection: fix warnings.
- Date: Sun, 24 Feb 2013 15:57:47 +0000 (UTC)
commit 9383a0f9e72f9ed3945659ee1c0fe475a4836e24
Author: Morten Welinder <terra gnome org>
Date: Sun Feb 24 10:54:01 2013 -0500
Introspection: fix warnings.
NEWS | 1 +
src/cell-draw.c | 4 +-
src/cmd-edit.h | 2 +-
src/dependent.c | 2 +-
src/expr-name.c | 5 +--
src/expr-name.h | 12 ++++----
src/expr.c | 2 +-
src/gnm-format.h | 4 +-
src/gui-util.c | 54 ++++++++++++++++++------------------
src/hlink.c | 14 +++++-----
src/hlink.h | 6 ++--
src/number-match.c | 4 +-
src/number-match.h | 6 ++--
src/parse-util.c | 3 +-
src/parse-util.h | 4 +-
src/ranges.c | 10 +++---
src/selection.c | 2 +-
src/selection.h | 2 +-
src/sheet-filter.h | 4 +-
src/sheet-object-impl.h | 8 +++---
src/sheet-style.h | 15 ++++++----
src/sheet-utils.c | 28 +++++++++----------
src/sheet-view.c | 8 +++---
src/sheet-view.h | 4 +-
src/style.c | 12 ++++----
src/tools/dao.c | 8 +++---
src/widgets/gnumeric-expr-entry.h | 2 +-
src/workbook-view.c | 12 ++++----
28 files changed, 120 insertions(+), 118 deletions(-)
---
diff --git a/NEWS b/NEWS
index aec1342..3037dde 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ Morten:
* Clean up sheet style code somewhat.
* Track dependents of conditional formats. [#654495] [#674954]
* FreeBSD portability fix. [#693761]
+ * Introspection fixes.
--------------------------------------------------------------------------
Gnumeric 1.12.0
diff --git a/src/cell-draw.c b/src/cell-draw.c
index c76a21d..b312b10 100644
--- a/src/cell-draw.c
+++ b/src/cell-draw.c
@@ -400,8 +400,8 @@ cell_draw_v_extension_markers (cairo_t *cr,
* cell_draw:
* @cell: #GnmCell const
* @cr: #cairo_t
- * @x1:
- * @y1:
+ * @x:
+ * @y:
* @width: including margins and leading grid line
* @height: including margins and leading grid line
* @h_center:
diff --git a/src/cmd-edit.h b/src/cmd-edit.h
index 0c6cdb6..91fd8dd 100644
--- a/src/cmd-edit.h
+++ b/src/cmd-edit.h
@@ -13,7 +13,7 @@ void sv_select_cur_array (SheetView *sv);
void sv_select_cur_depends (SheetView *sv);
void sv_select_cur_inputs (SheetView *sv);
-void cmd_paste_to_selection (WorkbookControl *wbc, SheetView *sv, int flags);
+void cmd_paste_to_selection (WorkbookControl *wbc, SheetView *dest_sv, int paste_flags);
void cmd_paste (WorkbookControl *wbc, GnmPasteTarget const *pt);
void cmd_shift_cols (WorkbookControl *wbc, Sheet *sheet,
diff --git a/src/dependent.c b/src/dependent.c
index 45992c1..92edad4 100644
--- a/src/dependent.c
+++ b/src/dependent.c
@@ -1175,7 +1175,7 @@ workbook_unlink_3d_dep (GnmDependent *dep)
* @texpr:
* @r:
*
- * Returns: (element-type GnmDependent):
+ * Returns: (element-type GnmDependent) (transfer full):
**/
GSList *
gnm_dep_style_dependency (Sheet *sheet,
diff --git a/src/expr-name.c b/src/expr-name.c
index 689cbe3..1ba3bf9 100644
--- a/src/expr-name.c
+++ b/src/expr-name.c
@@ -456,7 +456,7 @@ expr_name_handle_references (GnmNamedExpr *nexpr, gboolean add)
/**
* expr_name_lookup:
- * @pp :
+ * @pos :
* @name :
*
* lookup but do not reference a named expression.
@@ -920,8 +920,7 @@ expr_name_set_pos (GnmNamedExpr *nexpr, GnmParsePos const *pp)
/**
* expr_name_set_expr :
* @nexpr : the named expression
- * @new_expr : the new content
- * @rwinfo : optional.
+ * @texpr : the new content
*
* Unrefs the current content of @nexpr and absorbs a ref to @new_expr.
**/
diff --git a/src/expr-name.h b/src/expr-name.h
index 8b41c89..6e5a0be 100644
--- a/src/expr-name.h
+++ b/src/expr-name.h
@@ -44,15 +44,15 @@ const char *expr_name_name (GnmNamedExpr const *nexpr);
gboolean expr_name_set_name (GnmNamedExpr *nexpr, const char *new_name);
gboolean expr_name_is_placeholder (GnmNamedExpr const *ne);
-void expr_name_set_is_placeholder (GnmNamedExpr *ne, gboolean is_placeholder);
+void expr_name_set_is_placeholder (GnmNamedExpr *nexpr, gboolean is_placeholder);
-char *expr_name_as_string (GnmNamedExpr const *ne, GnmParsePos const *pp,
+char *expr_name_as_string (GnmNamedExpr const *nexpr, GnmParsePos const *pp,
GnmConventions const *fmt);
char *expr_name_set_pos (GnmNamedExpr *nexpr, GnmParsePos const *pp);
-void expr_name_set_expr (GnmNamedExpr *ne, GnmExprTop const *texpr);
-void expr_name_add_dep (GnmNamedExpr *ne, GnmDependent *dep);
-void expr_name_remove_dep (GnmNamedExpr *ne, GnmDependent *dep);
-gboolean expr_name_is_active (GnmNamedExpr const *ne);
+void expr_name_set_expr (GnmNamedExpr *nexpr, GnmExprTop const *texpr);
+void expr_name_add_dep (GnmNamedExpr *nexpr, GnmDependent *dep);
+void expr_name_remove_dep (GnmNamedExpr *nexpr, GnmDependent *dep);
+gboolean expr_name_is_active (GnmNamedExpr const *nexpr);
void expr_name_downgrade_to_placeholder (GnmNamedExpr *nexpr);
gboolean expr_name_in_use (GnmNamedExpr *nexpr);
diff --git a/src/expr.c b/src/expr.c
index 8fbaf14..d87bedc 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2996,7 +2996,7 @@ gnm_expr_top_new_array_elem (int x, int y)
* @texpr :
*
* A collect the set of GnmRanges in @expr.
- * Return: (element-type GnmRange) (transfer full): a list of the unique
+ * Returns: (element-type GnmRange) (transfer full): a list of the unique
* references Caller is responsible for releasing the list and the content.
**/
GSList *
diff --git a/src/gnm-format.h b/src/gnm-format.h
index 00a07b5..12d09a8 100644
--- a/src/gnm-format.h
+++ b/src/gnm-format.h
@@ -13,12 +13,12 @@ char *format_value (GOFormat const *format,
int col_width,
GODateConventions const *date_conv);
-GOFormatNumberError format_value_gstring (GString *result,
+GOFormatNumberError format_value_gstring (GString *str,
GOFormat const *format,
GnmValue const *value,
int col_width,
GODateConventions const *date_conv);
-GOFormatNumberError format_value_layout (PangoLayout *result,
+GOFormatNumberError format_value_layout (PangoLayout *layout,
GOFormat const *format,
GnmValue const *value,
int col_width,
diff --git a/src/gui-util.c b/src/gui-util.c
index be46ea8..deed75a 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -536,12 +536,12 @@ gnumeric_create_tooltip_widget (void)
/**
* gnumeric_convert_to_tooltip:
* @ref_widget:
- * @label:
+ * @widget:
*
- * Returns: (transfer full): the newly allcated #GtkWindow.
+ * Returns: (transfer none): @widget
**/
GtkWidget *
-gnumeric_convert_to_tooltip (GtkWidget *ref_widget, GtkWidget *label)
+gnumeric_convert_to_tooltip (GtkWidget *ref_widget, GtkWidget *widget)
{
GtkWidget *tip, *frame;
@@ -553,14 +553,14 @@ gnumeric_convert_to_tooltip (GtkWidget *ref_widget, GtkWidget *label)
gtk_window_set_screen (GTK_WINDOW (tip), gtk_widget_get_screen (ref_widget));
gtk_widget_set_name (tip, "gnumeric-tooltip");
- frame = gtk_widget_get_toplevel (label);
+ frame = gtk_widget_get_toplevel (widget);
gtk_container_add (GTK_CONTAINER (tip), frame);
gnumeric_tooltip_set_style (tip);
- gnumeric_tooltip_set_style (label);
+ gnumeric_tooltip_set_style (widget);
- return label;
+ return widget;
}
/**
@@ -641,7 +641,7 @@ popup_item_activate (GtkWidget *item, gpointer *user_data)
/**
* gnumeric_create_popup_menu:
- * @element:
+ * @elements:
* @handler: (scope async):
* @user_data: user data to pass to @handler.
* @display_filter:
@@ -649,7 +649,7 @@ popup_item_activate (GtkWidget *item, gpointer *user_data)
* @event:
**/
void
-gnumeric_create_popup_menu (GnumericPopupMenuElement const *element,
+gnumeric_create_popup_menu (GnumericPopupMenuElement const *elements,
GnumericPopupMenuHandler handler,
gpointer user_data,
int display_filter, int sensitive_filter,
@@ -660,29 +660,29 @@ gnumeric_create_popup_menu (GnumericPopupMenuElement const *element,
GtkWidget *menu, *item;
menu = gtk_menu_new ();
- for (; NULL != element->name ; element++) {
- char const * const name = element->name;
- char const * const pix_name = element->pixmap;
+ for (; NULL != elements->name ; elements++) {
+ char const * const name = elements->name;
+ char const * const pix_name = elements->pixmap;
item = NULL;
- if (element->display_filter != 0 &&
- !(element->display_filter & display_filter)) {
- if (element->allocated_name) {
- g_free (element->allocated_name);
- *(gchar **)(&element->allocated_name) = NULL;
+ if (elements->display_filter != 0 &&
+ !(elements->display_filter & display_filter)) {
+ if (elements->allocated_name) {
+ g_free (elements->allocated_name);
+ *(gchar **)(&elements->allocated_name) = NULL;
}
continue;
}
if (name != NULL && *name != '\0') {
- if (element->allocated_name)
- trans = element->allocated_name;
+ if (elements->allocated_name)
+ trans = elements->allocated_name;
else
trans = _(name);
item = gtk_image_menu_item_new_with_mnemonic (trans);
- if (element->sensitive_filter != 0 &&
- (element->sensitive_filter & sensitive_filter))
+ if (elements->sensitive_filter != 0 &&
+ (elements->sensitive_filter & sensitive_filter))
gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
if (pix_name != NULL) {
GtkWidget *image = gtk_image_new_from_stock (pix_name,
@@ -692,22 +692,22 @@ gnumeric_create_popup_menu (GnumericPopupMenuElement const *element,
GTK_IMAGE_MENU_ITEM (item),
image);
}
- if (element->allocated_name) {
- g_free (element->allocated_name);
- *(gchar **)(&element->allocated_name) = NULL;
+ if (elements->allocated_name) {
+ g_free (elements->allocated_name);
+ *(gchar **)(&elements->allocated_name) = NULL;
}
- } else if (element->index >= 0) {
+ } else if (elements->index >= 0) {
/* separator */
item = gtk_menu_item_new ();
gtk_widget_set_sensitive (item, FALSE);
}
- if (element->index > 0) {
+ if (elements->index > 0) {
g_signal_connect (G_OBJECT (item),
"activate",
G_CALLBACK (&popup_item_activate), user_data);
g_object_set_data (
- G_OBJECT (item), "descriptor", (gpointer)(element));
+ G_OBJECT (item), "descriptor", (gpointer)(elements));
g_object_set_data (
G_OBJECT (item), "handler", (gpointer)handler);
}
@@ -715,7 +715,7 @@ gnumeric_create_popup_menu (GnumericPopupMenuElement const *element,
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
}
- if (element->index < 0) {
+ if (elements->index < 0) {
if (NULL != item) {
menu_stack = g_slist_prepend (menu_stack, menu);
menu = gtk_menu_new ();
diff --git a/src/hlink.c b/src/hlink.c
index 6cfb83e..3bff0b6 100644
--- a/src/hlink.c
+++ b/src/hlink.c
@@ -129,22 +129,22 @@ gnm_hlink_set_target (GnmHLink *lnk, gchar const *target)
}
gchar const *
-gnm_hlink_get_tip (GnmHLink const *l)
+gnm_hlink_get_tip (GnmHLink const *lnk)
{
- g_return_val_if_fail (IS_GNM_HLINK (l), NULL);
- return l->tip;
+ g_return_val_if_fail (IS_GNM_HLINK (lnk), NULL);
+ return lnk->tip;
}
void
-gnm_hlink_set_tip (GnmHLink *l, gchar const *tip)
+gnm_hlink_set_tip (GnmHLink *lnk, gchar const *tip)
{
gchar *tmp;
- g_return_if_fail (IS_GNM_HLINK (l));
+ g_return_if_fail (IS_GNM_HLINK (lnk));
tmp = g_strdup (tip);
- g_free (l->tip);
- l->tip = tmp;
+ g_free (lnk->tip);
+ lnk->tip = tmp;
}
/***************************************************************************/
diff --git a/src/hlink.h b/src/hlink.h
index d4d47fe..257d955 100644
--- a/src/hlink.h
+++ b/src/hlink.h
@@ -19,11 +19,11 @@ G_BEGIN_DECLS
GnmHLink *sheet_hlink_find (Sheet const *sheet, GnmCellPos const *pos);
GType gnm_hlink_get_type (void);
-gboolean gnm_hlink_activate (GnmHLink *l, WBCGtk *wbcg);
+gboolean gnm_hlink_activate (GnmHLink *lnk, WBCGtk *wbcg);
gchar const *gnm_hlink_get_target (GnmHLink const *lnk);
void gnm_hlink_set_target (GnmHLink *lnk, gchar const *url);
-gchar const *gnm_hlink_get_tip (GnmHLink const *l);
-void gnm_hlink_set_tip (GnmHLink *l, gchar const *tip);
+gchar const *gnm_hlink_get_tip (GnmHLink const *lnk);
+void gnm_hlink_set_tip (GnmHLink *lnk, gchar const *tip);
GType gnm_hlink_cur_wb_get_type (void);
GType gnm_hlink_url_get_type (void);
diff --git a/src/number-match.c b/src/number-match.c
index afce71a..5e2313d 100644
--- a/src/number-match.c
+++ b/src/number-match.c
@@ -61,7 +61,7 @@ value_is_error (char const *str)
/**
* format_match_simple :
- * @s : A String to match against.
+ * @text : A String to match against.
*
* Attempt to match the supplied string as a simple value.
*
@@ -1137,7 +1137,7 @@ set_money_format (GnmValue *v)
/**
- * format_match :
+ * format_match:
* @text : The text to parse
* @cur_fmt : The current format for the value (potentially NULL)
* @date_conv: optional date convention
diff --git a/src/number-match.h b/src/number-match.h
index aa7705a..6195a4e 100644
--- a/src/number-match.h
+++ b/src/number-match.h
@@ -6,10 +6,10 @@
G_BEGIN_DECLS
-GnmValue *format_match_simple (char const *s);
-GnmValue *format_match (char const *s, GOFormat const *cur_fmt,
+GnmValue *format_match_simple (char const *text);
+GnmValue *format_match (char const *text, GOFormat const *cur_fmt,
GODateConventions const *date_conv);
-GnmValue *format_match_number (char const *s, GOFormat const *cur_fmt,
+GnmValue *format_match_number (char const *text, GOFormat const *cur_fmt,
GODateConventions const *date_conv);
GnmValue *format_match_decimal_number_with_locale
(char const *text, GOFormatFamily *family,
diff --git a/src/parse-util.c b/src/parse-util.c
index a96664c..07b098a 100644
--- a/src/parse-util.c
+++ b/src/parse-util.c
@@ -1100,6 +1100,7 @@ r1c1_rangeref_parse (GnmRangeRef *res, char const *ptr, GnmParsePos const *pp)
* @res : where to store the result
* @start : the start of the string to parse
* @pp : the location to parse relative to
+ * @convs: #GnmConventions
*
* Returns a pointer to the first invalid character.
* If the result != @start then @res is valid.
@@ -1556,7 +1557,7 @@ parse_util_shutdown (void)
/* ------------------------------------------------------------------------- */
/**
* gnm_expr_conv_quote:
- * @conv: #GnmConventions
+ * @convs: #GnmConventions
* @str: string to quote
*
* Quotes @str according to the convention @convs if necessary.
diff --git a/src/parse-util.h b/src/parse-util.h
index 5399d30..4112ba2 100644
--- a/src/parse-util.h
+++ b/src/parse-util.h
@@ -28,7 +28,7 @@ char const *cellref_parse (GnmCellRef *out, GnmSheetSize const *ss,
void rangeref_as_string (GnmConventionsOut *out,
GnmRangeRef const *ref);
-char const *rangeref_parse (GnmRangeRef *res, char const *in,
+char const *rangeref_parse (GnmRangeRef *res, char const *start,
GnmParsePos const *pp,
GnmConventions const *convs);
/* GError **err); */
@@ -236,7 +236,7 @@ void parse_text_value_or_expr (GnmParsePos const *pos,
GnmValue **val,
GnmExprTop const **texpr);
-GString *gnm_expr_conv_quote (GnmConventions const *conv, char const *str);
+GString *gnm_expr_conv_quote (GnmConventions const *convs, char const *str);
G_END_DECLS
diff --git a/src/ranges.c b/src/ranges.c
index d9e1d32..aa07e35 100644
--- a/src/ranges.c
+++ b/src/ranges.c
@@ -808,18 +808,18 @@ gnm_sheet_range_dup (GnmSheetRange const *sr)
/**
* gnm_sheet_range_from_value :
- * @res :
+ * @r :
* @v :
*
- * Convert @v into a GnmSheetRange and return in @res
+ * Convert @v into a GnmSheetRange and return in @r
**/
gboolean
-gnm_sheet_range_from_value (GnmSheetRange *res, GnmValue const *v)
+gnm_sheet_range_from_value (GnmSheetRange *r, GnmValue const *v)
{
g_return_val_if_fail (v->type == VALUE_CELLRANGE, FALSE);
- res->sheet = v->v_range.cell.a.sheet;
- range_init_value (&res->range, v);
+ r->sheet = v->v_range.cell.a.sheet;
+ range_init_value (&r->range, v);
return TRUE;
}
diff --git a/src/selection.c b/src/selection.c
index bbfb0d5..3d5a551 100644
--- a/src/selection.c
+++ b/src/selection.c
@@ -287,7 +287,7 @@ sv_selection_col_type (SheetView const *sv, int col)
/**
* sv_selection_row_type:
* @sv:
- * @col:
+ * @row:
*
* Returns: How much of column @col is selected in @sv.
**/
diff --git a/src/selection.h b/src/selection.h
index 391c218..8d5a279 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -27,7 +27,7 @@ gboolean sv_is_full_range_selected (SheetView const *sv, GnmRange const *r);
gboolean sv_is_colrow_selected (SheetView const *sv,
int colrow, gboolean is_col);
gboolean sv_is_full_colrow_selected (SheetView const *sv,
- gboolean is_cols, int col);
+ gboolean is_cols, int index);
ColRowSelectionType sv_selection_col_type (SheetView const *sv, int col);
ColRowSelectionType sv_selection_row_type (SheetView const *sv, int row);
diff --git a/src/sheet-filter.h b/src/sheet-filter.h
index 199b09a..2fe7af2 100644
--- a/src/sheet-filter.h
+++ b/src/sheet-filter.h
@@ -69,9 +69,9 @@ GType gnm_filter_condition_get_type (void);
GnmFilterCondition *gnm_filter_condition_dup (GnmFilterCondition const *src);
void gnm_filter_condition_free (GnmFilterCondition *cond);
GnmFilterCondition *gnm_filter_condition_new_single (GnmFilterOp op, GnmValue *v);
-GnmFilterCondition *gnm_filter_condition_new_double (GnmFilterOp op1, GnmValue *v1,
+GnmFilterCondition *gnm_filter_condition_new_double (GnmFilterOp op0, GnmValue *v0,
gboolean join_with_and,
- GnmFilterOp op2, GnmValue *v2);
+ GnmFilterOp op1, GnmValue *v1);
GnmFilterCondition *gnm_filter_condition_new_bucket (gboolean top,
gboolean absolute,
gboolean rel_range,
diff --git a/src/sheet-object-impl.h b/src/sheet-object-impl.h
index bffaa30..edfea5e 100644
--- a/src/sheet-object-impl.h
+++ b/src/sheet-object-impl.h
@@ -54,15 +54,15 @@ typedef struct {
void (*signal_pad2) (void);
/* Virtual methods */
- gboolean (*remove_from_sheet) (SheetObject *sheet_object);
- gboolean (*assign_to_sheet) (SheetObject *sheet_object,
+ gboolean (*remove_from_sheet) (SheetObject *so);
+ gboolean (*assign_to_sheet) (SheetObject *so,
Sheet *sheet);
- SheetObjectView *(*new_view) (SheetObject *sheet_object,
+ SheetObjectView *(*new_view) (SheetObject *so,
SheetObjectViewContainer *container);
void (*populate_menu) (SheetObject *so,
GPtrArray *actions);
- void (*user_config) (SheetObject *sheet_object,
+ void (*user_config) (SheetObject *so,
SheetControl *s_control);
void (*prep_sax_parser) (SheetObject *so,
GsfXMLIn *xin, xmlChar const **attrs,
diff --git a/src/sheet-style.h b/src/sheet-style.h
index 03de1e7..a9c339c 100644
--- a/src/sheet-style.h
+++ b/src/sheet-style.h
@@ -26,10 +26,10 @@ GnmStyle const *sheet_style_get (Sheet const *sheet, int col, int row);
GnmStyle *sheet_style_find (Sheet const *sheet, GnmStyle *st);
void sheet_style_get_row (Sheet const *sheet, GnmStyleRow *sr);
GnmStyle **sheet_style_get_row2 (Sheet const *sheet, int row);
-void sheet_style_apply_border (Sheet *sheet, GnmRange const *r,
+void sheet_style_apply_border (Sheet *sheet, GnmRange const *range,
GnmBorder **borders);
-void sheet_style_apply_range (Sheet *sheet, GnmRange const *r,
- GnmStyle *style);
+void sheet_style_apply_range (Sheet *sheet, GnmRange const *range,
+ GnmStyle *pstyle);
void sheet_style_set_range (Sheet *sheet, GnmRange const *range,
GnmStyle *style);
void sheet_style_apply_col (Sheet *sheet, int col,
@@ -88,9 +88,12 @@ GnmSpanCalcFlags sheet_style_set_list (Sheet *sheet,
sheet_style_set_list_cb_t range_modify,
gpointer data);
-GnmStyleList *sheet_style_collect_conditions (Sheet const *s, GnmRange const *r);
-GnmStyleList *sheet_style_collect_hlinks (Sheet const *s, GnmRange const *r);
-GnmStyleList *sheet_style_collect_validations (Sheet const *s, GnmRange const *r);
+GnmStyleList *sheet_style_collect_conditions (Sheet const *sheet,
+ GnmRange const *r);
+GnmStyleList *sheet_style_collect_hlinks (Sheet const *sheet,
+ GnmRange const *r);
+GnmStyleList *sheet_style_collect_validations (Sheet const *sheet,
+ GnmRange const *r);
GType gnm_style_region_get_type (void); /* boxed type */
GnmStyleRegion *gnm_style_region_new (GnmRange const *range, GnmStyle *style);
diff --git a/src/sheet-utils.c b/src/sheet-utils.c
index eb8d198..000b1cd 100644
--- a/src/sheet-utils.c
+++ b/src/sheet-utils.c
@@ -94,45 +94,43 @@ gnm_sheet_guess_region (Sheet *sheet, GnmRange *region)
/**
* gnm_sheet_guess_data_range :
* @sheet : #Sheet
- * @range : #GnmRange
+ * @region : #GnmRange
*
* Makes a guess at the logical range containing @region and returns the possibly
* expanded result in @region. The range is also expanded upwards.
**/
void
-gnm_sheet_guess_data_range (Sheet *sheet, GnmRange *range)
+gnm_sheet_guess_data_range (Sheet *sheet, GnmRange *region)
{
int col;
int row;
- GnmRange region = *range;
- int start = range->start.col;
+ int start = region->start.col;
/* look for previous empty column */
for (col = start - 1; col > 0; col--)
- if (!sheet_cell_or_one_below_is_not_empty (sheet, col, region.start.row))
+ if (!sheet_cell_or_one_below_is_not_empty (sheet, col, region->start.row))
break;
- region.start.col = col + 1;
+ region->start.col = col + 1;
/* look for next empty column */
- start = range->end.col;
+ start = region->end.col;
for (col = start + 1; col < gnm_sheet_get_max_cols (sheet); col++)
- if (!sheet_cell_or_one_below_is_not_empty (sheet, col, region.start.row))
+ if (!sheet_cell_or_one_below_is_not_empty (sheet, col, region->start.row))
break;
- region.end.col = col - 1;
+ region->end.col = col - 1;
- for (col = region.start.col; col <= region.end.col; col++) {
+ for (col = region->start.col; col <= region->end.col; col++) {
gboolean empties = FALSE;
- for (row = region.start.row - 2; row >= 0; row--)
+ for (row = region->start.row - 2; row >= 0; row--)
if (!sheet_cell_or_one_below_is_not_empty (sheet, col, row)) {
empties = TRUE;
break;
}
- region.start.row = empties ? row + 2 : 0;
- for (row = region.end.row + 1; row < gnm_sheet_get_max_rows (sheet); row++)
+ region->start.row = empties ? row + 2 : 0;
+ for (row = region->end.row + 1; row < gnm_sheet_get_max_rows (sheet); row++)
if (!sheet_cell_or_one_below_is_not_empty (sheet, col, row))
break;
- region.end.row = row - 1;
+ region->end.row = row - 1;
}
- *range = region;
return;
}
diff --git a/src/sheet-view.c b/src/sheet-view.c
index d9df759..6a48a98 100644
--- a/src/sheet-view.c
+++ b/src/sheet-view.c
@@ -751,12 +751,12 @@ sv_editpos_in_slicer (SheetView const *sv)
/**
* sv_freeze_panes :
- * @sv : the sheet
- * @frozen : top left corner of the frozen region
- * @unfrozen : top left corner of the unfrozen region
+ * @sv: the sheet
+ * @frozen_top_left: top left corner of the frozen region
+ * @unfrozen_top_left: top left corner of the unfrozen region
*
* By definition the unfrozen region must be below the frozen.
- * If @frozen == @unfrozen or @frozen == NULL unfreeze
+ * If @frozen_top_left == @unfrozen_top_left or @frozen_top_left == NULL unfreeze
**/
void
sv_freeze_panes (SheetView *sv,
diff --git a/src/sheet-view.h b/src/sheet-view.h
index 988c75b..bc3e42c 100644
--- a/src/sheet-view.h
+++ b/src/sheet-view.h
@@ -95,7 +95,7 @@ GnmSheetSlicer *sv_editpos_in_slicer (SheetView const *sv);
/* Manipulation */
void sv_flag_status_update_pos (SheetView *sv, GnmCellPos const *pos);
void sv_flag_status_update_range (SheetView *sv, GnmRange const *range);
-void sv_flag_style_update_range (SheetView *sv, GnmRange const *r);
+void sv_flag_style_update_range (SheetView *sv, GnmRange const *range);
void sv_flag_selection_change (SheetView *sv);
void sv_unant (SheetView *sv);
@@ -113,7 +113,7 @@ void sv_cursor_set (SheetView *sv,
GnmCellPos const *edit,
int base_col, int base_row,
int move_col, int move_row,
- GnmRange const *cursor_bound);
+ GnmRange const *bound);
void sv_set_edit_pos (SheetView *sv, GnmCellPos const *pos);
void sv_freeze_panes (SheetView *sv,
diff --git a/src/style.c b/src/style.c
index 2bf8740..13a94fc 100644
--- a/src/style.c
+++ b/src/style.c
@@ -571,17 +571,17 @@ gnm_style_required_spanflags (GnmStyle const *style)
}
/**
- * gnm_style_default_halign :
- * @mstyle :
+ * gnm_style_default_halign:
+ * @style :
* @c :
*
* Select the appropriate horizontal alignment depending on the style and cell
* value.
*/
GnmHAlign
-gnm_style_default_halign (GnmStyle const *mstyle, GnmCell const *c)
+gnm_style_default_halign (GnmStyle const *style, GnmCell const *c)
{
- GnmHAlign align = gnm_style_get_align_h (mstyle);
+ GnmHAlign align = gnm_style_get_align_h (style);
GnmValue *v;
if (align != GNM_HALIGN_GENERAL)
@@ -599,7 +599,7 @@ gnm_style_default_halign (GnmStyle const *mstyle, GnmCell const *c)
return GNM_HALIGN_CENTER;
case VALUE_FLOAT: {
- double a = gnm_style_get_rotation (mstyle);
+ double a = gnm_style_get_rotation (style);
if (a > 0 && a < 180)
return GNM_HALIGN_LEFT;
return GNM_HALIGN_RIGHT;
@@ -613,7 +613,7 @@ gnm_style_default_halign (GnmStyle const *mstyle, GnmCell const *c)
}
default:
- if (gnm_style_get_rotation (mstyle) > 180)
+ if (gnm_style_get_rotation (style) > 180)
return GNM_HALIGN_RIGHT;
return GNM_HALIGN_LEFT;
}
diff --git a/src/tools/dao.c b/src/tools/dao.c
index 22e1fe5..29cd50f 100644
--- a/src/tools/dao.c
+++ b/src/tools/dao.c
@@ -651,21 +651,21 @@ dao_autofit_column (data_analysis_output_t *dao, int col)
/**
* dao_autofit_these_columns:
* @dao:
- * @from:
- * @to:
+ * @from_col:
+ * @to_col:
*
* fits all columns to their content
*
*
**/
void
-dao_autofit_these_columns (data_analysis_output_t *dao, int from, int to)
+dao_autofit_these_columns (data_analysis_output_t *dao, int from_col, int to_col)
{
int i;
if (!dao->autofit_flag)
return;
- for (i = from; i <= to; i++)
+ for (i = from_col; i <= to_col; i++)
dao_autofit_column (dao,i);
}
diff --git a/src/widgets/gnumeric-expr-entry.h b/src/widgets/gnumeric-expr-entry.h
index 2274569..3c7240b 100644
--- a/src/widgets/gnumeric-expr-entry.h
+++ b/src/widgets/gnumeric-expr-entry.h
@@ -59,7 +59,7 @@ GnmExprTop const *gnm_expr_entry_parse (GnmExprEntry *gee,
GnmParseError *perr, gboolean start_sel,
GnmExprParseFlags flags);
char *gnm_expr_entry_global_range_name (GnmExprEntry *gee, Sheet *sheet);
-void gnm_expr_entry_load_from_text (GnmExprEntry *gee, char const *str);
+void gnm_expr_entry_load_from_text (GnmExprEntry *gee, char const *txt);
void gnm_expr_entry_load_from_dep (GnmExprEntry *gee,
GnmDependent const *dep);
void gnm_expr_entry_load_from_expr (GnmExprEntry *gee,
diff --git a/src/workbook-view.c b/src/workbook-view.c
index 86925b8..cd97e1c 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -1095,7 +1095,7 @@ wb_view_save_to_uri (WorkbookView *wbv, GOFileSaver const *fs,
* @wbv: Workbook View
* @fs: GOFileSaver object
* @uri: URI to save as.
- * @context:
+ * @cc:
*
* Saves @wbv and workbook it's attached to into @uri file using
* @fs file saver. If the format sufficiently advanced make it the saver
@@ -1105,7 +1105,7 @@ wb_view_save_to_uri (WorkbookView *wbv, GOFileSaver const *fs,
*/
gboolean
wb_view_save_as (WorkbookView *wbv, GOFileSaver *fs, char const *uri,
- GOCmdContext *context)
+ GOCmdContext *cc)
{
GOIOContext *io_context;
Workbook *wb;
@@ -1114,15 +1114,15 @@ wb_view_save_as (WorkbookView *wbv, GOFileSaver *fs, char const *uri,
g_return_val_if_fail (IS_WORKBOOK_VIEW (wbv), FALSE);
g_return_val_if_fail (GO_IS_FILE_SAVER (fs), FALSE);
g_return_val_if_fail (uri != NULL, FALSE);
- g_return_val_if_fail (GO_IS_CMD_CONTEXT (context), FALSE);
+ g_return_val_if_fail (GO_IS_CMD_CONTEXT (cc), FALSE);
wb = wb_view_get_workbook (wbv);
g_object_ref (wb);
- io_context = go_io_context_new (context);
+ io_context = go_io_context_new (cc);
- go_cmd_context_set_sensitive (context, FALSE);
+ go_cmd_context_set_sensitive (cc, FALSE);
wb_view_save_to_uri (wbv, fs, uri, io_context);
- go_cmd_context_set_sensitive (context, TRUE);
+ go_cmd_context_set_sensitive (cc, TRUE);
has_error = go_io_error_occurred (io_context);
has_warning = go_io_warning_occurred (io_context);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
