From ec73f5522ff2d6f8c476f02a9daaff32ef1db069 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 30 Jan 2010 15:32:08 -0500 Subject: Coding style and whitespace cleanup. --- widgets/table/e-cell-checkbox.c | 2 +- widgets/table/e-cell-combo.c | 4 +-- widgets/table/e-cell-date-edit.c | 2 +- widgets/table/e-cell-pixbuf.c | 8 ++--- widgets/table/e-cell-popup.c | 10 +++--- widgets/table/e-cell-text.c | 30 +++++++++--------- widgets/table/e-cell-text.h | 2 +- widgets/table/e-cell-toggle.c | 4 +-- widgets/table/e-cell-tree.c | 4 +-- widgets/table/e-cell.c | 4 +-- widgets/table/e-cell.h | 4 +-- widgets/table/e-table-click-to-add.c | 10 +++--- widgets/table/e-table-col.c | 2 +- widgets/table/e-table-col.h | 2 +- widgets/table/e-table-column-specification.h | 2 +- widgets/table/e-table-config.c | 10 +++--- widgets/table/e-table-field-chooser-item.c | 18 +++++------ widgets/table/e-table-field-chooser-item.h | 2 +- widgets/table/e-table-field-chooser.c | 24 +++++++-------- widgets/table/e-table-group-container.c | 10 +++--- widgets/table/e-table-header-item.c | 20 ++++++------ widgets/table/e-table-header.c | 12 ++++---- widgets/table/e-table-item.c | 42 +++++++++++++------------- widgets/table/e-table-state.c | 4 +-- widgets/table/e-table-state.h | 2 +- widgets/table/e-table-utils.c | 2 +- widgets/table/e-table.c | 16 +++++----- widgets/table/e-tree.c | 20 ++++++------ widgets/table/gal-a11y-e-cell-popup.h | 2 +- widgets/table/gal-a11y-e-cell-registry.h | 2 +- widgets/table/gal-a11y-e-cell-text.h | 2 +- widgets/table/gal-a11y-e-cell-tree.h | 2 +- widgets/table/gal-a11y-e-cell.h | 2 +- widgets/table/gal-a11y-e-table-click-to-add.c | 2 +- widgets/table/gal-a11y-e-table-click-to-add.h | 2 +- widgets/table/gal-a11y-e-table-column-header.h | 2 +- widgets/table/gal-a11y-e-table-factory.h | 2 +- widgets/table/gal-a11y-e-table-item-factory.h | 2 +- widgets/table/gal-a11y-e-table-item.c | 8 ++--- widgets/table/gal-a11y-e-table-item.h | 2 +- widgets/table/gal-a11y-e-table.h | 2 +- widgets/table/gal-a11y-e-tree-factory.h | 2 +- widgets/table/gal-a11y-e-tree.h | 2 +- 43 files changed, 154 insertions(+), 154 deletions(-) (limited to 'widgets/table') diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c index b01e6c11bc..9264c37ad4 100644 --- a/widgets/table/e-cell-checkbox.c +++ b/widgets/table/e-cell-checkbox.c @@ -42,7 +42,7 @@ static GdkPixbuf *checks [2]; static void ecc_print (ECellView *ecell_view, GtkPrintContext *context, gint model_col, gint view_col, gint row, - double width, double height) + gdouble width, gdouble height) { cairo_t *cr = gtk_print_context_get_cairo_context (context); const gint value = GPOINTER_TO_INT ( diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index af79261c64..fe9b90717f 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -373,8 +373,8 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc, gboolean show_vscroll = FALSE, show_hscroll = FALSE; gint avail_height, avail_width, min_height, work_height, screen_width; gint column_width, row_height, scrollbar_width; - double x1, y1; - double wx, wy; + gdouble x1, y1; + gdouble wx, wy; /* This code is practically copied from GtkCombo. */ popup = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window); diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c index f67a03ceed..1d27b292d0 100644 --- a/widgets/table/e-cell-date-edit.c +++ b/widgets/table/e-cell-date-edit.c @@ -644,7 +644,7 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas); GtkRequisition popup_requisition; gint avail_height, screen_width, column_width, row_height; - double x1, y1, wx, wy; + gdouble x1, y1, wx, wy; gdk_window_get_origin (canvas->window, x, y); diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index 3f7ee1d378..eb7b1330c3 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -191,7 +191,7 @@ pixbuf_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) static void pixbuf_print (ECellView *ecell_view, GtkPrintContext *context, gint model_col, gint view_col, gint row, - double width, double height) + gdouble width, gdouble height) { GdkPixbuf *pixbuf; gint scale; @@ -203,8 +203,8 @@ pixbuf_print (ECellView *ecell_view, GtkPrintContext *context, scale = gdk_pixbuf_get_height (pixbuf); cairo_save (cr); - cairo_translate (cr, 0, (double)(height - scale) / (double)2); - gdk_cairo_set_source_pixbuf (cr, pixbuf, (double)scale, (double)scale); + cairo_translate (cr, 0, (gdouble)(height - scale) / (gdouble)2); + gdk_cairo_set_source_pixbuf (cr, pixbuf, (gdouble)scale, (gdouble)scale); cairo_paint (cr); cairo_restore (cr); } @@ -212,7 +212,7 @@ pixbuf_print (ECellView *ecell_view, GtkPrintContext *context, static gdouble pixbuf_print_height (ECellView *ecell_view, GtkPrintContext *context, gint model_col, gint view_col, gint row, - double width) + gdouble width) { GdkPixbuf *pixbuf; diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index 62777792b3..6deb4c46a9 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -88,14 +88,14 @@ static void ecp_print (ECellView *ecv, gint model_col, gint view_col, gint row, - double width, - double height); + gdouble width, + gdouble height); static gdouble ecp_print_height (ECellView *ecv, GtkPrintContext *context, gint model_col, gint view_col, gint row, - double width); + gdouble width); static gint ecp_max_width (ECellView *ecv, gint model_col, gint view_col); @@ -388,7 +388,7 @@ ecp_leave_edit (ECellView *ecv, gint model_col, gint view_col, gint row, static void ecp_print (ECellView *ecv, GtkPrintContext *context, - gint model_col, gint view_col, gint row, double width, double height) + gint model_col, gint view_col, gint row, gdouble width, gdouble height) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; @@ -399,7 +399,7 @@ ecp_print (ECellView *ecv, GtkPrintContext *context, static gdouble ecp_print_height (ECellView *ecv, GtkPrintContext *context, gint model_col, gint view_col, gint row, - double width) + gdouble width) { ECellPopupView *ecp_view = (ECellPopupView *) ecv; diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 852f8ec980..57dd88e17d 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -136,7 +136,7 @@ typedef struct { gint xofs, yofs; /* This gets added to the x and y for the cell text. */ - double ellipsis_width[2]; /* The width of the ellipsis. */ + gdouble ellipsis_width[2]; /* The width of the ellipsis. */ } ECellTextView; struct _CellEdit { @@ -289,7 +289,7 @@ ect_stop_editing (ECellTextView *text_view, gboolean commit) text = edit->text; if (edit->tep) g_object_unref (edit->tep); - if (! edit->default_cursor_shown) { + if (!edit->default_cursor_shown) { gdk_window_set_cursor (GTK_WIDGET(text_view->canvas)->window, NULL); edit->default_cursor_shown = TRUE; } @@ -1132,7 +1132,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col text_view->pointer_in = FALSE; #endif if (edit_display) { - if (! edit->default_cursor_shown) { + if (!edit->default_cursor_shown) { gdk_window_set_cursor (canvas->window, NULL); edit->default_cursor_shown = TRUE; } @@ -1301,7 +1301,7 @@ ect_free_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, static void get_font_size (PangoLayout *layout, PangoFontDescription *font, const gchar *text, - double *width, double *height) + gdouble *width, gdouble *height) { gint w; gint h; @@ -1314,14 +1314,14 @@ get_font_size (PangoLayout *layout, PangoFontDescription *font, const gchar *tex pango_layout_get_size (layout, &w, &h); - *width = (double)w/(double)PANGO_SCALE; - *height = (double)h/(double)PANGO_SCALE; + *width = (gdouble)w/(gdouble)PANGO_SCALE; + *height = (gdouble)h/(gdouble)PANGO_SCALE; } static void ect_print (ECellView *ecell_view, GtkPrintContext *context, gint model_col, gint view_col, gint row, - double width, double height) + gdouble width, gdouble height) { PangoFontDescription *font_des; PangoLayout *layout; @@ -1334,7 +1334,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, gboolean strikeout, underline; cairo_t *cr; gchar *string; - double ty, ly, text_width = 0.0, text_height = 0.0; + gdouble ty, ly, text_width = 0.0, text_height = 0.0; cr = gtk_print_context_get_cairo_context (context); string = e_cell_text_get_text(ect, ecell_view->e_table_model, model_col, row); @@ -1354,9 +1354,9 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, pango_context = gtk_widget_get_pango_context (canvas); font_metrics = pango_context_get_metrics (pango_context, canvas->style->font_desc, pango_context_get_language(pango_context)); - ty = (double)(text_height + ty = (gdouble)(text_height - pango_font_metrics_get_ascent (font_metrics) - - pango_font_metrics_get_descent (font_metrics)) / 2.0 /(double)PANGO_SCALE; + - pango_font_metrics_get_descent (font_metrics)) / 2.0 /(gdouble)PANGO_SCALE; strikeout = ect->strikeout_column >= 0 && row >= 0 && e_table_model_value_at (ecell_view->e_table_model, ect->strikeout_column, row); @@ -1366,7 +1366,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, dir = pango_find_base_dir (string, strlen(string)); if (underline) { - ly = ty + (double)pango_font_metrics_get_underline_position (font_metrics)/(double)PANGO_SCALE; + ly = ty + (gdouble)pango_font_metrics_get_underline_position (font_metrics)/(gdouble)PANGO_SCALE; cairo_new_path (cr); if (dir == PANGO_DIRECTION_RTL) { cairo_move_to (cr, width - 2, ly + text_height + 6); @@ -1376,12 +1376,12 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, cairo_move_to (cr, 2, ly + text_height + 6); cairo_line_to (cr, MIN (2 + text_width, width - 2), ly + text_height + 6); } - cairo_set_line_width (cr, (double)pango_font_metrics_get_underline_thickness (font_metrics)/(double)PANGO_SCALE); + cairo_set_line_width (cr, (gdouble)pango_font_metrics_get_underline_thickness (font_metrics)/(gdouble)PANGO_SCALE); cairo_stroke (cr); } if (strikeout) { - ly = ty + (double)pango_font_metrics_get_strikethrough_position (font_metrics)/(double)PANGO_SCALE; + ly = ty + (gdouble)pango_font_metrics_get_strikethrough_position (font_metrics)/(gdouble)PANGO_SCALE; cairo_new_path (cr); if (dir == PANGO_DIRECTION_RTL) { cairo_move_to (cr, width - 2, ly + text_height + 6); @@ -1391,7 +1391,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, cairo_move_to (cr, 2, ly + text_height + 6); cairo_line_to (cr, MIN (2 + text_width, width - 2), ly + text_height + 6); } - cairo_set_line_width (cr,(double)pango_font_metrics_get_strikethrough_thickness (font_metrics)/(double)PANGO_SCALE); + cairo_set_line_width (cr,(gdouble)pango_font_metrics_get_strikethrough_thickness (font_metrics)/(gdouble)PANGO_SCALE); cairo_stroke (cr); } @@ -1409,7 +1409,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, static gdouble ect_print_height (ECellView *ecell_view, GtkPrintContext *context, gint model_col, gint view_col, gint row, - double width) + gdouble width) { /* * Font size is 16 by default. To leave some margin for cell diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h index 740db82880..2cc23a36f5 100644 --- a/widgets/table/e-cell-text.h +++ b/widgets/table/e-cell-text.h @@ -56,7 +56,7 @@ typedef struct { GtkJustification justify; gchar *font_name; - double x, y; /* Position at anchor */ + gdouble x, y; /* Position at anchor */ gulong pixel; /* Fill color */ diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index a03eed037e..5f7cc66321 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -328,8 +328,8 @@ cell_toggle_print (ECellView *ecell_view, cairo_save(cr); cairo_translate (cr, 0 , 0); image = gdk_pixbuf_add_alpha (image, TRUE, 255, 255, 255); - image_width = (double)gdk_pixbuf_get_width (image); - image_height = (double)gdk_pixbuf_get_height (image); + image_width = (gdouble)gdk_pixbuf_get_width (image); + image_height = (gdouble)gdk_pixbuf_get_height (image); cairo_rectangle (cr, image_width / 7, image_height / 3, image_width - image_width / 4, image_width - image_height / 7); diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index fac7b9784f..8a8017e2e7 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -674,7 +674,7 @@ ect_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row, static void ect_print (ECellView *ecell_view, GtkPrintContext *context, gint model_col, gint view_col, gint row, - double width, double height) + gdouble width, gdouble height) { ECellTreeView *tree_view = (ECellTreeView *) ecell_view; cairo_t *cr = gtk_print_context_get_cairo_context (context); @@ -769,7 +769,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, static gdouble ect_print_height (ECellView *ecell_view, GtkPrintContext *context, gint model_col, gint view_col, gint row, - double width) + gdouble width) { return 12; /* XXX */ } diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c index 4c32c18e77..1c4b64f2c1 100644 --- a/widgets/table/e-cell.c +++ b/widgets/table/e-cell.c @@ -283,7 +283,7 @@ e_cell_draw (ECellView *ecell_view, GdkDrawable *drawable, void e_cell_print (ECellView *ecell_view, GtkPrintContext *context, gint model_col, gint view_col, gint row, - double width, double height) + gdouble width, gdouble height) { if (ECVIEW_EC_CLASS(ecell_view)->print) ECVIEW_EC_CLASS(ecell_view)->print (ecell_view, context, model_col, view_col, row, width, height); @@ -297,7 +297,7 @@ e_cell_print (ECellView *ecell_view, GtkPrintContext *context, gdouble e_cell_print_height (ECellView *ecell_view, GtkPrintContext *context, gint model_col, gint view_col, gint row, - double width) + gdouble width) { if (ECVIEW_EC_CLASS(ecell_view)->print_height) return ECVIEW_EC_CLASS(ecell_view)->print_height diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h index 181a3143e4..63fa8e2afd 100644 --- a/widgets/table/e-cell.h +++ b/widgets/table/e-cell.h @@ -151,8 +151,8 @@ void e_cell_print (ECellView *ecell_view, gint model_col, gint view_col, gint row, - double width, - double height); + gdouble width, + gdouble height); gdouble e_cell_print_height (ECellView *ecell_view, GtkPrintContext *context, gint model_col, diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index c71e10bde4..e5c35fe93c 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -242,10 +242,10 @@ create_rect_and_text (ETableClickToAdd *etcta) if (!etcta->rect) etcta->rect = gnome_canvas_item_new(GNOME_CANVAS_GROUP(etcta), gnome_canvas_rect_get_type(), - "x1", (double) 0, - "y1", (double) 0, - "x2", (double) etcta->width - 1, - "y2", (double) etcta->height - 1, + "x1", (gdouble) 0, + "y1", (gdouble) 0, + "x2", (gdouble) etcta->width - 1, + "y2", (gdouble) etcta->height - 1, "outline_color_gdk", &widget->style->fg[GTK_STATE_NORMAL], "fill_color_gdk", &widget->style->bg[GTK_STATE_NORMAL], NULL); @@ -458,7 +458,7 @@ etcta_reflow (GnomeCanvasItem *item, gint flags) { ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item); - double old_height = etcta->height; + gdouble old_height = etcta->height; if (etcta->text) { g_object_get(etcta->text, diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index 4e9802d9b8..cd96441b63 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -169,7 +169,7 @@ ETableCol * e_table_col_new (gint col_idx, const gchar *text, const gchar *icon_name, - double expansion, + gdouble expansion, gint min_width, ECell *ecell, GCompareDataFunc compare, diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h index 7b7c31db7c..cbe3dc3a80 100644 --- a/widgets/table/e-table-col.h +++ b/widgets/table/e-table-col.h @@ -96,7 +96,7 @@ GType e_table_col_get_type (void); ETableCol * e_table_col_new (gint col_idx, const gchar *text, const gchar *icon_name, - double expansion, + gdouble expansion, gint min_width, ECell *ecell, GCompareDataFunc compare, diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h index 7ea6f23dc4..048decdf54 100644 --- a/widgets/table/e-table-column-specification.h +++ b/widgets/table/e-table-column-specification.h @@ -43,7 +43,7 @@ typedef struct { gchar *title; gchar *pixbuf; - double expansion; + gdouble expansion; gint minimum_width; guint resizable : 1; guint disabled : 1; diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 1bbfc6a8b3..f87b316dd0 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -1031,7 +1031,7 @@ config_button_remove (GtkWidget *widget, ETableConfig *config) gint row = GPOINTER_TO_INT (column->data); memmove (config->temp_state->columns + row, config->temp_state->columns + row + 1, sizeof (gint) * (config->temp_state->col_count - row - 1)); - memmove (config->temp_state->expansions + row, config->temp_state->expansions + row + 1, sizeof (double) * (config->temp_state->col_count - row - 1)); + memmove (config->temp_state->expansions + row, config->temp_state->expansions + row + 1, sizeof (gdouble) * (config->temp_state->col_count - row - 1)); config->temp_state->col_count --; } config->temp_state->columns = g_renew (int, config->temp_state->columns, config->temp_state->col_count); @@ -1048,9 +1048,9 @@ config_button_up (GtkWidget *widget, ETableConfig *config) GList *columns = NULL; GList *column; gint *new_shown; - double *new_expansions; + gdouble *new_expansions; gint next_col; - double next_expansion; + gdouble next_expansion; gint i; e_table_selected_row_foreach (config->shown, add_column, &columns); @@ -1103,9 +1103,9 @@ config_button_down (GtkWidget *widget, ETableConfig *config) GList *columns = NULL; GList *column; gint *new_shown; - double *new_expansions; + gdouble *new_expansions; gint next_col; - double next_expansion; + gdouble next_expansion; gint i; e_table_selected_row_foreach (config->shown, add_column, &columns); diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 5cd2f9edc2..f38cb3964a 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -90,11 +90,11 @@ etfci_dispose (GObject *object) } static gint -etfci_find_button (ETableFieldChooserItem *etfci, double loc) +etfci_find_button (ETableFieldChooserItem *etfci, gdouble loc) { gint i; gint count; - double height = 0; + gdouble height = 0; count = e_table_header_count(etfci->combined_header); for (i = 0; i < count; i++) { @@ -137,7 +137,7 @@ etfci_rebuild_combined (ETableFieldChooserItem *etfci) ETableCol *ecol = e_table_header_get_column (etfci->full_header, i); if (ecol->disabled) continue; - if (! (GPOINTER_TO_INT (g_hash_table_lookup (hash, GINT_TO_POINTER (ecol->col_idx))))) + if (!(GPOINTER_TO_INT (g_hash_table_lookup (hash, GINT_TO_POINTER (ecol->col_idx))))) e_table_header_add_column (etfci->combined_header, ecol, -1); } @@ -148,10 +148,10 @@ static void etfci_reflow (GnomeCanvasItem *item, gint flags) { ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item); - double old_height; + gdouble old_height; gint i; gint count; - double height = 0; + gdouble height = 0; etfci_rebuild_combined (etfci); @@ -176,10 +176,10 @@ etfci_reflow (GnomeCanvasItem *item, gint flags) } static void -etfci_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags) +etfci_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags) { ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item); - double i2c [6]; + gdouble i2c [6]; ArtPoint c1, c2, i1, i2; if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update) @@ -493,7 +493,7 @@ etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint w } static double -etfci_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, +etfci_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; @@ -514,7 +514,7 @@ etfci_maybe_start_drag (ETableFieldChooserItem *etfci, gint x, gint y) } static void -etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, double x, double y) +etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdouble y) { GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas); GtkTargetList *list; diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h index d0cbbd9f75..9040d7db39 100644 --- a/widgets/table/e-table-field-chooser-item.h +++ b/widgets/table/e-table-field-chooser-item.h @@ -42,7 +42,7 @@ typedef struct { ETableHeader *header; ETableHeader *combined_header; - double height, width; + gdouble height, width; PangoFontDescription *font_desc; diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index 8d6ddb59e3..3c1d722617 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -101,10 +101,10 @@ ensure_nonzero_step_increments (ETableFieldChooser *etfc) static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, ETableFieldChooser *etfc) { - double height; + gdouble height; etfc->last_alloc = *allocation; gnome_canvas_item_set( etfc->item, - "width", (double) allocation->width, + "width", (gdouble) allocation->width, NULL ); g_object_get(etfc->item, "height", &height, @@ -112,15 +112,15 @@ static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, ETab height = MAX(height, allocation->height); gnome_canvas_set_scroll_region(GNOME_CANVAS( etfc->canvas ), 0, 0, allocation->width - 1, height - 1); gnome_canvas_item_set( etfc->rect, - "x2", (double) allocation->width, - "y2", (double) height, + "x2", (gdouble) allocation->width, + "y2", (gdouble) height, NULL ); ensure_nonzero_step_increments (etfc); } static void resize(GnomeCanvas *canvas, ETableFieldChooser *etfc) { - double height; + gdouble height; g_object_get(etfc->item, "height", &height, NULL); @@ -129,8 +129,8 @@ static void resize(GnomeCanvas *canvas, ETableFieldChooser *etfc) gnome_canvas_set_scroll_region (GNOME_CANVAS(etfc->canvas), 0, 0, etfc->last_alloc.width - 1, height - 1); gnome_canvas_item_set( etfc->rect, - "x2", (double) etfc->last_alloc.width, - "y2", (double) height, + "x2", (gdouble) etfc->last_alloc.width, + "y2", (gdouble) height, NULL ); ensure_nonzero_step_increments (etfc); } @@ -187,16 +187,16 @@ e_table_field_chooser_init (ETableFieldChooser *etfc) etfc->rect = gnome_canvas_item_new(gnome_canvas_root( GNOME_CANVAS( etfc->canvas ) ), gnome_canvas_rect_get_type(), - "x1", (double) 0, - "y1", (double) 0, - "x2", (double) 100, - "y2", (double) 100, + "x1", (gdouble) 0, + "y1", (gdouble) 0, + "x2", (gdouble) 100, + "y2", (gdouble) 100, "fill_color", "white", NULL ); etfc->item = gnome_canvas_item_new(gnome_canvas_root(etfc->canvas), e_table_field_chooser_item_get_type(), - "width", (double) 100, + "width", (gdouble) 100, "full_header", etfc->full_header, "header", etfc->header, "dnd_code", etfc->dnd_code, diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 26124b824a..77d766b16e 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -1084,10 +1084,10 @@ etgc_reflow (GnomeCanvasItem *item, gint flags) running_height); gnome_canvas_item_set (GNOME_CANVAS_ITEM(child_node->rect), - "x1", (double) 0, - "x2", (double) running_width + GROUP_INDENT, - "y1", (double) running_height - extra_height, - "y2", (double) running_height + item_height, + "x1", (gdouble) 0, + "x2", (gdouble) running_width + GROUP_INDENT, + "y1", (gdouble) running_height - extra_height, + "y2", (gdouble) running_height + item_height, NULL); running_height += item_height + extra_height; @@ -1154,7 +1154,7 @@ typedef struct { #if 0 static gint -gp_draw_rect (GtkPrintContext *context, double x, double y, double width, double height) +gp_draw_rect (GtkPrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height) { cairo_t *cr; cr = gtk_print_context_get_cairo_context (context); diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 0ea785bc86..b39d86bcd4 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -183,11 +183,11 @@ e_table_header_item_get_height (ETableHeaderItem *ethi) } static void -ethi_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags) +ethi_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags) { ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); - double i2c [6]; + gdouble i2c [6]; ArtPoint c1, c2, i1, i2; if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update) @@ -526,7 +526,7 @@ static gchar gray50_bits [] = { static void ethi_add_destroy_marker (ETableHeaderItem *ethi) { - double x1; + gdouble x1; if (ethi->remove_item) gtk_object_destroy (GTK_OBJECT (ethi->remove_item)); @@ -535,7 +535,7 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi) ethi->stipple = gdk_bitmap_create_from_data ( NULL, gray50_bits, gray50_width, gray50_height); - x1 = (double) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col); + x1 = (gdouble) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col); if (ethi->drag_col > 0) x1 += ethi->group_indent_width; @@ -543,11 +543,11 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi) GNOME_CANVAS_GROUP (GNOME_CANVAS_ITEM (ethi)->canvas->root), gnome_canvas_rect_get_type (), "x1", x1 + 1, - "y1", (double) 1, - "x2", (double) x1 + e_table_header_col_diff ( + "y1", (gdouble) 1, + "x2", (gdouble) x1 + e_table_header_col_diff ( ethi->eth, ethi->drag_col, ethi->drag_col+1) - 2, - "y2", (double) ethi->height - 2, + "y2", (gdouble) ethi->height - 2, "fill_color", "red", "fill_stipple", ethi->stipple, NULL); @@ -630,7 +630,7 @@ scroll_timeout (gpointer data) ETableHeaderItem *ethi = data; gint dx = 0; GtkAdjustment *h, *v; - double value; + gdouble value; if (ethi->scroll_direction & ET_SCROLL_RIGHT) dx += 20; @@ -1001,7 +1001,7 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wi } static double -ethi_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, +ethi_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; @@ -1626,7 +1626,7 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col) ETableSortColumn column = e_table_sort_info_grouping_get_nth(ethi->sort_info, i); if (model_col == column.column || model_col == -1) { gint ascending = column.ascending; - ascending = ! ascending; + ascending = !ascending; column.ascending = ascending; e_table_sort_info_grouping_set_nth(ethi->sort_info, i, column); found = TRUE; diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index e5587ab3e2..3ff4c3472b 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -684,8 +684,8 @@ e_table_header_set_selection (ETableHeader *eth, gboolean allow_selection) static void eth_set_size (ETableHeader *eth, gint idx, gint size) { - double expansion; - double old_expansion; + gdouble expansion; + gdouble old_expansion; gint min_width; gint left_width; gint total_extra; @@ -775,8 +775,8 @@ eth_set_size (ETableHeader *eth, gint idx, gint size) old_expansion -= eth->columns[idx]->expansion; /* Set the new expansion so that it will generate the desired size. */ eth->columns[idx]->expansion = - expansion * (((double)(size - (eth->columns[idx]->min_width + - eth->width_extras))) / ((double)total_extra)); + expansion * (((gdouble)(size - (eth->columns[idx]->min_width + + eth->width_extras))) / ((gdouble)total_extra)); /* The expansion left for the columns on the right. */ expansion -= eth->columns[idx]->expansion; @@ -845,9 +845,9 @@ eth_calc_widths (ETableHeader *eth) { gint i; gint extra; - double expansion; + gdouble expansion; gint last_position = 0; - double next_position = 0; + gdouble next_position = 0; gint last_resizable = -1; gint *widths; gboolean changed; diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 006c5c02cf..d6f0a45cf7 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -419,9 +419,9 @@ eti_detach_cell_views (ETableItem *eti) } static void -eti_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2) +eti_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdouble *y2) { - double i2c [6]; + gdouble i2c [6]; ArtPoint c1, c2, i1, i2; ETableItem *eti = E_TABLE_ITEM (item); @@ -474,7 +474,7 @@ eti_reflow (GnomeCanvasItem *item, gint flags) * GnomeCanvasItem::update method */ static void -eti_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags) +eti_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags) { ArtPoint o1, o2; ETableItem *eti = E_TABLE_ITEM (item); @@ -782,7 +782,7 @@ eti_item_region_redraw (ETableItem *eti, gint x0, gint y0, gint x1, gint y1) { GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti); ArtDRect rect; - double i2c [6]; + gdouble i2c [6]; rect.x0 = x0; rect.y0 = y0; @@ -1728,7 +1728,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid gint x1, x2; gint f_x1, f_x2, f_y1, f_y2; gboolean f_found; - double i2c [6]; + gdouble i2c [6]; ArtPoint eti_base, eti_base_item, lower_right; GtkWidget *canvas = GTK_WIDGET(item->canvas); gint height_extra = eti->horizontal_draw_grid ? 1 : 0; @@ -2015,7 +2015,7 @@ exit: } static double -eti_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, +eti_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy, GnomeCanvasItem **actual_item) { *actual_item = item; @@ -2024,7 +2024,7 @@ eti_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, } static gboolean -find_cell (ETableItem *eti, double x, double y, gint *view_col_res, gint *view_row_res, double *x1_res, double *y1_res) +find_cell (ETableItem *eti, gdouble x, gdouble y, gint *view_col_res, gint *view_row_res, gdouble *x1_res, gdouble *y1_res) { const gint cols = eti->cols; const gint rows = eti->rows; @@ -2164,8 +2164,8 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) switch (e->type) { case GDK_BUTTON_PRESS: { - double x1, y1; - double realx, realy; + gdouble x1, y1; + gdouble realx, realy; GdkEventButton button; gint col, row; gint cursor_row, cursor_col; @@ -2288,7 +2288,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) } case GDK_BUTTON_RELEASE: { - double x1, y1; + gdouble x1, y1; gint col, row; gint cursor_row, cursor_col; @@ -2367,7 +2367,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) case GDK_2BUTTON_PRESS: { gint model_col, model_row; #if 0 - double x1, y1; + gdouble x1, y1; #endif d(g_print("%s: GDK_2BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button)); @@ -2422,7 +2422,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) } case GDK_MOTION_NOTIFY: { gint col, row, flags; - double x1, y1; + gdouble x1, y1; gint cursor_col, cursor_row; gnome_canvas_item_w2i (item, &e->motion.x, &e->motion.y); @@ -3079,7 +3079,7 @@ eti_cursor_change (ESelectionModel *selection, gint row, gint col, ETableItem *e return; } - if (! e_table_model_has_change_pending (eti->table_model)) { + if (!e_table_model_has_change_pending (eti->table_model)) { if (!eti->in_key_press) { eti_maybe_show_cursor(eti, DOUBLE_CLICK_TIME + 10); } else { @@ -3111,7 +3111,7 @@ eti_cursor_activated (ESelectionModel *selection, gint row, gint col, ETableItem view_col = model_to_view_col(eti, col); if (view_row != -1 && view_col != -1) { - if (! e_table_model_has_change_pending (eti->table_model)) { + if (!e_table_model_has_change_pending (eti->table_model)) { if (!eti->in_key_press) { eti_show_cursor(eti, DOUBLE_CLICK_TIME + 10); } else { @@ -3254,7 +3254,7 @@ e_table_item_compute_mouse_over (ETableItem *eti, gint *row, gint *col) { - double realx, realy; + gdouble realx, realy; /* Save the grabbed row but make sure that we don't get flawed results because the cursor is grabbed. */ gint grabbed_row = eti->grabbed_row; @@ -3307,8 +3307,8 @@ static gdouble * e_table_item_calculate_print_widths (ETableHeader *eth, gdouble width) { gint i; - double extra; - double expansion; + gdouble extra; + gdouble expansion; gint last_resizable = -1; gdouble scale = 1.0L; gdouble *widths = g_new(gdouble, e_table_header_count(eth)); @@ -3348,7 +3348,7 @@ eti_printed_row_height (ETableItem *eti, gdouble *widths, GtkPrintContext *conte #define CHECK(x) if((x) == -1) return -1; static gint -gp_draw_rect (GtkPrintContext *context, double x, double y, double width, double height) +gp_draw_rect (GtkPrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height) { cairo_t *cr; cr = gtk_print_context_get_cairo_context (context); @@ -3363,8 +3363,8 @@ gp_draw_rect (GtkPrintContext *context, double x, double y, double width, double static void e_table_item_print_page (EPrintable *ep, GtkPrintContext *context, - double width, - double height, + gdouble width, + gdouble height, gboolean quantize, ETableItemPrintContext *itemcontext) { @@ -3374,7 +3374,7 @@ e_table_item_print_page (EPrintable *ep, gdouble max_height; gint rows_printed = itemcontext->rows_printed; gint row, col, next_page = 0; - double yd = height; + gdouble yd = height; cairo_t *cr; gdouble *widths; diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index 86694eccac..46d0c355e8 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -145,7 +145,7 @@ e_table_state_load_from_string (ETableState *state, typedef struct { gint column; - double expansion; + gdouble expansion; } int_and_double; void @@ -255,7 +255,7 @@ e_table_state_save_to_node (ETableState *state, for (i = 0; i < state->col_count; i++) { gint column = state->columns[i]; - double expansion = state->expansions[i]; + gdouble expansion = state->expansions[i]; xmlNode *new_node; new_node = xmlNewChild ( diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h index da3f11b93c..082bb17ad7 100644 --- a/widgets/table/e-table-state.h +++ b/widgets/table/e-table-state.h @@ -42,7 +42,7 @@ typedef struct { ETableSortInfo *sort_info; gint col_count; gint *columns; - double *expansions; + gdouble *expansions; } ETableState; typedef struct { diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c index e54317ec8b..89affd357d 100644 --- a/widgets/table/e-table-utils.c +++ b/widgets/table/e-table-utils.c @@ -52,7 +52,7 @@ e_table_state_to_header (GtkWidget *widget, ETableHeader *full_header, ETableSta for (column = 0; column < state->col_count; column++) { gint col; - double expansion; + gdouble expansion; ETableCol *table_col; col = state->columns[column]; diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 2656f7f949..14b3707464 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -593,7 +593,7 @@ et_focus (GtkWidget *container, GtkDirectionType direction) static void set_header_canvas_width (ETable *e_table) { - double oldwidth, oldheight, width; + gdouble oldwidth, oldheight, width; if (!(e_table->header_item && e_table->header_canvas && e_table->table_canvas)) return; @@ -997,7 +997,7 @@ changed_idle (gpointer data) gtk_object_destroy (GTK_OBJECT (et->group)); et_build_groups(et); g_object_set (et->canvas_vbox, - "width", (double) GTK_WIDGET (et->table_canvas)->allocation.width, + "width", (gdouble) GTK_WIDGET (et->table_canvas)->allocation.width, NULL); if (GTK_WIDGET_REALIZED(et->table_canvas)) @@ -1308,7 +1308,7 @@ e_table_set_state_object(ETable *e_table, ETableState *state) connect_header (e_table, state); - g_value_set_double (val, (double) (GTK_WIDGET(e_table->table_canvas)->allocation.width)); + g_value_set_double (val, (gdouble) (GTK_WIDGET(e_table->table_canvas)->allocation.width)); g_object_set_property (G_OBJECT (e_table->header), "width", val); g_free (val); @@ -2586,10 +2586,10 @@ e_table_drag_highlight (ETable *table, NULL); } gnome_canvas_item_set (table->drop_highlight, - "x1", (double) x, - "x2", (double) x + width - 1, - "y1", (double) y, - "y2", (double) y + height - 1, + "x1", (gdouble) x, + "x2", (gdouble) x + width - 1, + "y1", (gdouble) y, + "y2", (gdouble) y + height - 1, NULL); } else { if (table->drop_highlight) { @@ -2884,7 +2884,7 @@ scroll_timeout (gpointer data) ETable *et = data; gint dx = 0, dy = 0; GtkAdjustment *h, *v; - double hvalue, vvalue; + gdouble hvalue, vvalue; if (et->scroll_direction & ET_SCROLL_DOWN) dy += 20; diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index d612fc93bc..3d5c604faa 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -663,7 +663,7 @@ et_focus (GtkWidget *container, GtkDirectionType direction) static void set_header_canvas_width (ETree *e_tree) { - double oldwidth, oldheight, width; + gdouble oldwidth, oldheight, width; if (!(e_tree->priv->header_item && e_tree->priv->header_canvas && e_tree->priv->table_canvas)) return; @@ -1165,7 +1165,7 @@ e_tree_set_state_object(ETree *e_tree, ETableState *state) connect_header (e_tree, state); - g_value_set_double (val, (double) (GTK_WIDGET(e_tree->priv->table_canvas)->allocation.width)); + g_value_set_double (val, (gdouble) (GTK_WIDGET(e_tree->priv->table_canvas)->allocation.width)); g_object_set_property (G_OBJECT (e_tree->priv->header), "width", val); g_free (val); @@ -2378,10 +2378,10 @@ e_tree_drag_highlight (ETree *tree, NULL); } gnome_canvas_item_set (tree->priv->drop_highlight, - "x1", (double) x, - "x2", (double) x + width - 1, - "y1", (double) y, - "y2", (double) y + height - 1, + "x1", (gdouble) x, + "x2", (gdouble) x + width - 1, + "y1", (gdouble) y, + "y2", (gdouble) y + height - 1, NULL); } else { gtk_object_destroy (GTK_OBJECT (tree->priv->drop_highlight)); @@ -2747,7 +2747,7 @@ scroll_timeout (gpointer data) ETree *et = data; gint dx = 0, dy = 0; GtkAdjustment *v, *h; - double vvalue, hvalue; + gdouble vvalue, hvalue; if (et->priv->scroll_direction & ET_SCROLL_DOWN) dy += 20; @@ -3399,7 +3399,7 @@ e_tree_class_init (ETreeClass *class) static void tree_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *tree) { - double width; + gdouble width; g_return_if_fail (tree != NULL); g_return_if_fail (tree->priv != NULL); @@ -3444,8 +3444,8 @@ e_tree_set_info_message (ETree *tree, const gchar *info_message) "justification", GTK_JUSTIFY_LEFT, "text", info_message, "draw_background", FALSE, - "width", (double) GTK_WIDGET (tree->priv->table_canvas)->allocation.width - 60.0, - "clip_width", (double) GTK_WIDGET (tree->priv->table_canvas)->allocation.width - 60.0, + "width", (gdouble) GTK_WIDGET (tree->priv->table_canvas)->allocation.width - 60.0, + "clip_width", (gdouble) GTK_WIDGET (tree->priv->table_canvas)->allocation.width - 60.0, NULL); e_canvas_item_move_absolute (tree->priv->info_text, 30, 30); diff --git a/widgets/table/gal-a11y-e-cell-popup.h b/widgets/table/gal-a11y-e-cell-popup.h index 9729e13e55..b96aa9392c 100644 --- a/widgets/table/gal-a11y-e-cell-popup.h +++ b/widgets/table/gal-a11y-e-cell-popup.h @@ -58,4 +58,4 @@ AtkObject *gal_a11y_e_cell_popup_new (ETableItem *item, gint view_col, gint row); -#endif /* ! __GAL_A11Y_E_CELL_POPUP_H__ */ +#endif /* __GAL_A11Y_E_CELL_POPUP_H__ */ diff --git a/widgets/table/gal-a11y-e-cell-registry.h b/widgets/table/gal-a11y-e-cell-registry.h index 85afdadf4e..189da02b02 100644 --- a/widgets/table/gal-a11y-e-cell-registry.h +++ b/widgets/table/gal-a11y-e-cell-registry.h @@ -68,4 +68,4 @@ void gal_a11y_e_cell_registry_add_cell_type (GalA11yECellRegistry *re GType type, GalA11yECellRegistryFunc func); -#endif /* ! __GAL_A11Y_E_CELL_REGISTRY_H__ */ +#endif /* __GAL_A11Y_E_CELL_REGISTRY_H__ */ diff --git a/widgets/table/gal-a11y-e-cell-text.h b/widgets/table/gal-a11y-e-cell-text.h index e5a95accad..c9e0fa8ac4 100644 --- a/widgets/table/gal-a11y-e-cell-text.h +++ b/widgets/table/gal-a11y-e-cell-text.h @@ -60,4 +60,4 @@ AtkObject *gal_a11y_e_cell_text_new (ETableItem *item, gint view_col, gint row); -#endif /* ! __GAL_A11Y_E_CELL_TEXT_H__ */ +#endif /* __GAL_A11Y_E_CELL_TEXT_H__ */ diff --git a/widgets/table/gal-a11y-e-cell-tree.h b/widgets/table/gal-a11y-e-cell-tree.h index fa48c1486a..fedd9e5fbd 100644 --- a/widgets/table/gal-a11y-e-cell-tree.h +++ b/widgets/table/gal-a11y-e-cell-tree.h @@ -60,4 +60,4 @@ AtkObject *gal_a11y_e_cell_tree_new (ETableItem *item, gint view_col, gint row); -#endif /* ! __GAL_A11Y_E_CELL_TREE_H__ */ +#endif /* __GAL_A11Y_E_CELL_TREE_H__ */ diff --git a/widgets/table/gal-a11y-e-cell.h b/widgets/table/gal-a11y-e-cell.h index 4f2e536b8d..aa02aff79c 100644 --- a/widgets/table/gal-a11y-e-cell.h +++ b/widgets/table/gal-a11y-e-cell.h @@ -106,4 +106,4 @@ gboolean gal_a11y_e_cell_remove_state (GalA11yECell *cell, AtkStateType state_type, gboolean emit_signal); -#endif /* ! __GAL_A11Y_E_CELL_H__ */ +#endif /* __GAL_A11Y_E_CELL_H__ */ diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c index 225f24c685..8d788a458b 100644 --- a/widgets/table/gal-a11y-e-table-click-to-add.c +++ b/widgets/table/gal-a11y-e-table-click-to-add.c @@ -144,7 +144,7 @@ etcta_ref_child (AtkObject *accessible, AtkObject * atk_obj = NULL; ETableClickToAdd * etcta; - if ( i != 0 ) + if (i != 0) return NULL; etcta = E_TABLE_CLICK_TO_ADD(atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible))); diff --git a/widgets/table/gal-a11y-e-table-click-to-add.h b/widgets/table/gal-a11y-e-table-click-to-add.h index 17d6940d08..0d1507f79d 100644 --- a/widgets/table/gal-a11y-e-table-click-to-add.h +++ b/widgets/table/gal-a11y-e-table-click-to-add.h @@ -52,4 +52,4 @@ GType gal_a11y_e_table_click_to_add_get_type (void); AtkObject *gal_a11y_e_table_click_to_add_new (GObject *widget); void gal_a11y_e_table_click_to_add_init (void); -#endif /* ! __GAL_A11Y_E_TABLE_CLICK_TO_ADD_H__ */ +#endif /* __GAL_A11Y_E_TABLE_CLICK_TO_ADD_H__ */ diff --git a/widgets/table/gal-a11y-e-table-column-header.h b/widgets/table/gal-a11y-e-table-column-header.h index 0cf0695f75..ec9a74b868 100644 --- a/widgets/table/gal-a11y-e-table-column-header.h +++ b/widgets/table/gal-a11y-e-table-column-header.h @@ -50,4 +50,4 @@ GType gal_a11y_e_table_column_header_get_type (void); AtkObject *gal_a11y_e_table_column_header_new (ETableCol *etc, ETableItem *item); void gal_a11y_e_table_column_header_init (void); -#endif /* ! __GAL_A11Y_E_TABLE_COLUMN_HEADER_H__ */ +#endif /* __GAL_A11Y_E_TABLE_COLUMN_HEADER_H__ */ diff --git a/widgets/table/gal-a11y-e-table-factory.h b/widgets/table/gal-a11y-e-table-factory.h index f0a1cecd0b..6caf3d8beb 100644 --- a/widgets/table/gal-a11y-e-table-factory.h +++ b/widgets/table/gal-a11y-e-table-factory.h @@ -47,4 +47,4 @@ struct _GalA11yETableFactoryClass { /* Standard Glib function */ GType gal_a11y_e_table_factory_get_type (void); -#endif /* ! __GAL_A11Y_E_TABLE_FACTORY_H__ */ +#endif /* __GAL_A11Y_E_TABLE_FACTORY_H__ */ diff --git a/widgets/table/gal-a11y-e-table-item-factory.h b/widgets/table/gal-a11y-e-table-item-factory.h index 5fdf7ce1ef..a08cfeb84b 100644 --- a/widgets/table/gal-a11y-e-table-item-factory.h +++ b/widgets/table/gal-a11y-e-table-item-factory.h @@ -46,4 +46,4 @@ struct _GalA11yETableItemFactoryClass { /* Standard Glib function */ GType gal_a11y_e_table_item_factory_get_type (void); -#endif /* ! __GAL_A11Y_E_TABLE_FACTORY_H__ */ +#endif /* __GAL_A11Y_E_TABLE_FACTORY_H__ */ diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c index 37f55f68c1..85c4f9164d 100644 --- a/widgets/table/gal-a11y-e-table-item.c +++ b/widgets/table/gal-a11y-e-table-item.c @@ -799,7 +799,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) /* Compare with previously saved column headers. */ for ( i = 0; i < n_cols && cols[i]; i ++ ) { for ( j = 0; j < prev_n_cols && prev_cols[j]; j ++ ) { - if ( prev_cols [j] == cols[i] && i != j ) { + if (prev_cols [j] == cols[i] && i != j) { reorder_found = TRUE; state [i] = ETI_HEADER_REORDERED; @@ -813,7 +813,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) } /* cols[i] is new added column. */ - if ( j == prev_n_cols ) { + if (j == prev_n_cols) { added_found = TRUE; state[i] = ETI_HEADER_NEW_ADDED; } @@ -822,11 +822,11 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) /* Now try to find if there are removed columns. */ for (i = 0; i < prev_n_cols && prev_cols[i]; i ++) { for (j = 0; j < n_cols && cols[j]; j ++) - if ( prev_cols [j] == cols[i] ) + if (prev_cols [j] == cols[i]) break; /* Removed columns found. */ - if ( j == n_cols ) { + if (j == n_cols) { removed_found = TRUE; prev_state[j] = ETI_HEADER_REMOVED; } diff --git a/widgets/table/gal-a11y-e-table-item.h b/widgets/table/gal-a11y-e-table-item.h index 87773aae48..90861a14ec 100644 --- a/widgets/table/gal-a11y-e-table-item.h +++ b/widgets/table/gal-a11y-e-table-item.h @@ -55,4 +55,4 @@ AtkObject *gal_a11y_e_table_item_new (ETableItem *item); void gal_a11y_e_table_item_init (void); -#endif /* ! __GAL_A11Y_E_TABLE_ITEM_H__ */ +#endif /* __GAL_A11Y_E_TABLE_ITEM_H__ */ diff --git a/widgets/table/gal-a11y-e-table.h b/widgets/table/gal-a11y-e-table.h index ba7c8adc03..f5dba40c7e 100644 --- a/widgets/table/gal-a11y-e-table.h +++ b/widgets/table/gal-a11y-e-table.h @@ -55,4 +55,4 @@ AtkObject *gal_a11y_e_table_new (GObject *table); void gal_a11y_e_table_init (void); -#endif /* ! __GAL_A11Y_E_TABLE_H__ */ +#endif /* __GAL_A11Y_E_TABLE_H__ */ diff --git a/widgets/table/gal-a11y-e-tree-factory.h b/widgets/table/gal-a11y-e-tree-factory.h index 36b4a61dc2..640261acf2 100644 --- a/widgets/table/gal-a11y-e-tree-factory.h +++ b/widgets/table/gal-a11y-e-tree-factory.h @@ -46,4 +46,4 @@ struct _GalA11yETreeFactoryClass { /* Standard Glib function */ GType gal_a11y_e_tree_factory_get_type (void); -#endif /* ! __GAL_A11Y_E_TREE_FACTORY_H__ */ +#endif /* __GAL_A11Y_E_TREE_FACTORY_H__ */ diff --git a/widgets/table/gal-a11y-e-tree.h b/widgets/table/gal-a11y-e-tree.h index ef15dade36..61799e1b93 100644 --- a/widgets/table/gal-a11y-e-tree.h +++ b/widgets/table/gal-a11y-e-tree.h @@ -54,4 +54,4 @@ AtkObject *gal_a11y_e_tree_new (GObject *tree); void gal_a11y_e_tree_init (void); -#endif /* ! __GAL_A11Y_E_TREE_H__ */ +#endif /* __GAL_A11Y_E_TREE_H__ */ -- cgit