From a891b81cfb3430a764dab0d5644114c4dab22297 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 7 Nov 2010 21:13:03 -0500 Subject: Coding style and whitespace cleanup. --- widgets/misc/e-calendar-item.c | 2 +- widgets/misc/e-dateedit.c | 2 +- widgets/misc/e-map.c | 22 +++++++++++----------- widgets/table/e-cell-text.c | 2 +- widgets/table/e-cell-tree.c | 2 +- widgets/table/e-table-field-chooser-item.c | 2 +- widgets/table/e-table-header-item.c | 1 - widgets/table/e-table-header-utils.c | 2 +- widgets/table/e-table-item.c | 10 +++++----- widgets/text/e-text.c | 14 +++++++------- 10 files changed, 29 insertions(+), 30 deletions(-) (limited to 'widgets') diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index a7a1a68d71..6afe62d381 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -1330,7 +1330,7 @@ e_calendar_item_draw_month (ECalendarItem *calitem, gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_ACTIVE]); for (day = 0; day < 7; day++) { layout_set_day_text (calitem, layout, day_index); - cairo_move_to (cr, + cairo_move_to (cr, text_x - calitem->day_widths[day_index], text_y); pango_cairo_show_layout (cr, layout); diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 5045a1d53f..a1a385ca70 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -588,7 +588,7 @@ create_children (EDateEdit *dedit) gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (priv->time_combo), cell, TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->time_combo), cell, "text", 0, NULL); } - + #else priv->time_combo = gtk_combo_box_entry_new_with_model ( GTK_TREE_MODEL (time_store), 0); diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index d88e1698dc..4c292bfc4a 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -120,7 +120,7 @@ static void e_map_get_current_location (EMap *map, double *longitude, double *la static void e_map_world_to_render_surface (EMap *map, gdouble world_longitude, gdouble world_latitude, gdouble *win_x, gdouble *win_y); static void update_render_surface (EMap *map, gboolean render_overlays); -static void set_scroll_area (EMap *view, int width, int height); +static void set_scroll_area (EMap *view, gint width, gint height); static void center_at (EMap *map, double longitude, double latitude); static void scroll_to (EMap *view, gint x, gint y); static gint load_map_background (EMap *view, gchar *name); @@ -176,7 +176,7 @@ e_map_do_tween_cb (gpointer data) priv->timer_current_ms = g_timer_elapsed (priv->timer, NULL) * 1000; gtk_widget_queue_draw (GTK_WIDGET (view)); - + /* Can't use for loop here, because we need to advance * the list before deleting. */ @@ -184,7 +184,7 @@ e_map_do_tween_cb (gpointer data) while (walk) { EMapTween *tween = walk->data; - + walk = walk->next; if (tween->end_time <= priv->timer_current_ms) @@ -215,7 +215,7 @@ e_map_tween_new (EMap *view, guint msecs, double longitude_offset, double latitu { EMapPrivate *priv = view->priv; EMapTween *tween; - + if (!priv->smooth_zoom) return; @@ -412,7 +412,7 @@ e_map_unrealize (GtkWidget *widget) cairo_surface_destroy (priv->map_render_surface); priv->map_render_surface = NULL; - + if (GTK_WIDGET_CLASS (e_map_parent_class)->unrealize) (*GTK_WIDGET_CLASS (e_map_parent_class)->unrealize) (widget); } @@ -557,7 +557,7 @@ e_map_tweens_compute_matrix (EMap *view, cairo_matrix_t *matrix) cairo_matrix_init_translate (matrix, allocation.width / 2.0, allocation.height / 2.0); - + e_map_world_to_render_surface (view, longitude, latitude, &x, &y); @@ -576,7 +576,7 @@ e_map_expose (GtkWidget *widget, GdkEventExpose *event) cairo_matrix_t matrix; if (!gtk_widget_is_drawable (widget)) - return FALSE; + return FALSE; view = E_MAP (widget); priv = view->priv; @@ -588,11 +588,11 @@ e_map_expose (GtkWidget *widget, GdkEventExpose *event) e_map_tweens_compute_matrix (view, &matrix); cairo_transform (cr, &matrix); - cairo_set_source_surface (cr, + cairo_set_source_surface (cr, priv->map_render_surface, 0, 0); cairo_paint (cr); - + cairo_destroy (cr); return FALSE; @@ -1268,7 +1268,7 @@ e_map_get_current_location (EMap *map, double *longitude, double *latitude) e_map_window_to_world (map, allocation.width / 2.0, allocation.height / 2.0, - longitude, latitude); + longitude, latitude); } /* Callback used when an adjustment is changed */ @@ -1289,7 +1289,7 @@ adjustment_changed_cb (GtkAdjustment *adj, gpointer data) } static void -set_scroll_area (EMap *view, int width, int height) +set_scroll_area (EMap *view, gint width, gint height) { EMapPrivate *priv; GtkAllocation allocation; diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 897e02ad19..a718f1d91e 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -734,7 +734,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, cell_foreground = e_cell_text_get_color (text_view, color_spec); if (cell_foreground) - gdk_cairo_set_source_color (cr, cell_foreground); + gdk_cairo_set_source_color (cr, cell_foreground); } } diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index e0de5e047c..5771cbc053 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -649,7 +649,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, /* now draw our icon if we're expandable */ if (expandable) { #if GTK_CHECK_VERSION (3, 0, 0) - gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node); + gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node); #error Paint an expander here #endif } diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index fb8f2babca..02c86b8136 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -180,7 +180,7 @@ etfci_update (GnomeCanvasItem *item, gint flags) { ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item); - double x1, y1, x2, y2; + gdouble x1, y1, x2, y2; if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update) GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update ( diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 43400cae82..28d53ce971 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -969,7 +969,6 @@ ethi_unrealize (GnomeCanvasItem *item) gtk_drag_dest_unset (GTK_WIDGET (item->canvas)); - if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize) (*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize)(item); } diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index 19a493b0f4..56fa44a3c6 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -379,7 +379,7 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol, } #endif gdk_cairo_set_source_pixbuf (cr, ecol->pixbuf, - xpos, inner_y + (inner_height - clip_height) / 2); + xpos, inner_y + (inner_height - clip_height) / 2); cairo_paint (cr); } else { pango_layout_set_width (layout, inner_width * PANGO_SCALE); diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index b9d0f63c68..7c45bbe656 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -792,7 +792,7 @@ static void eti_item_region_redraw (ETableItem *eti, gint x0, gint y0, gint x1, gint y1) { GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti); - double dx1, dy1, dx2, dy2; + gdouble dx1, dy1, dx2, dy2; cairo_matrix_t i2c; dx1 = x0; @@ -1719,7 +1719,7 @@ eti_unrealize (GnomeCanvasItem *item) static void eti_draw_grid_line (ETableItem *eti, cairo_t *cr, GtkStyle *style, - int x1, int y1, int x2, int y2) + gint x1, gint y1, gint x2, gint y2) { cairo_save (cr); @@ -1746,7 +1746,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid gint f_x1, f_x2, f_y1, f_y2; gboolean f_found; cairo_matrix_t i2c; - double eti_base_x, eti_base_y, lower_right_y, lower_right_x; + gdouble eti_base_x, eti_base_y, lower_right_y, lower_right_x; GtkWidget *canvas = GTK_WIDGET (item->canvas); GtkStyle *style = gtk_widget_get_style (canvas); gint height_extra = eti->horizontal_draw_grid ? 1 : 0; @@ -1990,7 +1990,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid yd += height; if (eti->horizontal_draw_grid) { - eti_draw_grid_line (eti, cr, style, eti_base_x - x, yd, eti_base_x + eti->width - x, yd); + eti_draw_grid_line (eti, cr, style, eti_base_x - x, yd, eti_base_x + eti->width - x, yd); yd++; } } @@ -2001,7 +2001,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid for (col = first_col; col <= last_col; col++) { ETableCol *ecol = e_table_header_get_column (eti->header, col); - eti_draw_grid_line (eti, cr, style, xd, y_offset, xd, yd - 1); + eti_draw_grid_line (eti, cr, style, xd, y_offset, xd, yd - 1); /* * This looks wierd, but it is to draw the last line diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index cbae6d1da8..6ce9716b00 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -768,8 +768,8 @@ e_text_set_property (GObject *object, (color.green & 0xff00) << 8 | (color.blue & 0xff00) | 0xff); - text->needs_redraw = 1; - needs_update = 1; + text->needs_redraw = 1; + needs_update = 1; break; case PROP_FILL_COLOR_GDK: @@ -782,8 +782,8 @@ e_text_set_property (GObject *object, (color.green & 0xff00) << 8 | (color.blue & 0xff00) | 0xff); - text->needs_redraw = 1; - needs_update = 1; + text->needs_redraw = 1; + needs_update = 1; break; case PROP_FILL_COLOR_RGBA: @@ -791,8 +791,8 @@ e_text_set_property (GObject *object, color.red = ((text->rgba >> 24) & 0xff) * 0x101; color.green = ((text->rgba >> 16) & 0xff) * 0x101; color.blue = ((text->rgba >> 8) & 0xff) * 0x101; - text->needs_redraw = 1; - needs_update = 1; + text->needs_redraw = 1; + needs_update = 1; break; case PROP_EDITABLE: @@ -1456,7 +1456,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, if (text->clip) { cairo_rectangle (cr, - xpos, ypos, + xpos, ypos, text->clip_cwidth - text->xofs, text->clip_cheight - text->yofs); cairo_clip (cr); -- cgit v1.2.3