From ebcce86769d174cce6e881740c5e9bcedce28e06 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 11 Sep 2010 11:50:51 -0400 Subject: Coding style and whitespace cleanups. --- widgets/table/e-table-sorted.c | 82 +++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'widgets/table/e-table-sorted.c') diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index 9e4f1c4046..c1ff7740d5 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -55,22 +55,22 @@ ets_dispose (GObject *object) ETableSorted *ets = E_TABLE_SORTED (object); if (ets->sort_idle_id) - g_source_remove(ets->sort_idle_id); + g_source_remove (ets->sort_idle_id); ets->sort_idle_id = 0; if (ets->insert_idle_id) - g_source_remove(ets->insert_idle_id); + g_source_remove (ets->insert_idle_id); ets->insert_idle_id = 0; if (ets->sort_info) { g_signal_handler_disconnect (G_OBJECT (ets->sort_info), ets->sort_info_changed_id); - g_object_unref(ets->sort_info); + g_object_unref (ets->sort_info); ets->sort_info = NULL; } if (ets->full_header) - g_object_unref(ets->full_header); + g_object_unref (ets->full_header); ets->full_header = NULL; G_OBJECT_CLASS (ets_parent_class)->dispose (object); @@ -104,18 +104,18 @@ ets_init (ETableSorted *ets) } static gboolean -ets_sort_idle(ETableSorted *ets) +ets_sort_idle (ETableSorted *ets) { - g_object_ref(ets); - ets_sort(ets); + g_object_ref (ets); + ets_sort (ets); ets->sort_idle_id = 0; ets->insert_count = 0; - g_object_unref(ets); + g_object_unref (ets); return FALSE; } static gboolean -ets_insert_idle(ETableSorted *ets) +ets_insert_idle (ETableSorted *ets) { ets->insert_count = 0; ets->insert_idle_id = 0; @@ -137,22 +137,22 @@ e_table_sorted_new (ETableModel *source, ETableHeader *full_header, ETableSortIn } ets->sort_info = sort_info; - g_object_ref(ets->sort_info); + g_object_ref (ets->sort_info); ets->full_header = full_header; - g_object_ref(ets->full_header); + g_object_ref (ets->full_header); - ets_proxy_model_changed(etss, source); + ets_proxy_model_changed (etss, source); ets->sort_info_changed_id = g_signal_connect (G_OBJECT (sort_info), "sort_info_changed", G_CALLBACK (ets_sort_info_changed), ets); - return E_TABLE_MODEL(ets); + return E_TABLE_MODEL (ets); } static void ets_sort_info_changed (ETableSortInfo *info, ETableSorted *ets) { - ets_sort(ets); + ets_sort (ets); } static void @@ -160,27 +160,27 @@ ets_proxy_model_changed (ETableSubset *subset, ETableModel *source) { gint rows, i; - rows = e_table_model_row_count(source); + rows = e_table_model_row_count (source); - g_free(subset->map_table); + g_free (subset->map_table); subset->n_map = rows; - subset->map_table = g_new(int, rows); + subset->map_table = g_new (int, rows); for (i = 0; i < rows; i++) { subset->map_table[i] = i; } - if (!E_TABLE_SORTED(subset)->sort_idle_id) - E_TABLE_SORTED(subset)->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, subset, NULL); + if (!E_TABLE_SORTED (subset)->sort_idle_id) + E_TABLE_SORTED (subset)->sort_idle_id = g_idle_add_full (50, (GSourceFunc) ets_sort_idle, subset, NULL); - e_table_model_changed(E_TABLE_MODEL(subset)); + e_table_model_changed (E_TABLE_MODEL (subset)); } static void ets_proxy_model_row_changed (ETableSubset *subset, ETableModel *source, gint row) { - if (!E_TABLE_SORTED(subset)->sort_idle_id) - E_TABLE_SORTED(subset)->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, subset, NULL); + if (!E_TABLE_SORTED (subset)->sort_idle_id) + E_TABLE_SORTED (subset)->sort_idle_id = g_idle_add_full (50, (GSourceFunc) ets_sort_idle, subset, NULL); if (E_TABLE_SUBSET_CLASS (ets_parent_class)->proxy_model_row_changed) (E_TABLE_SUBSET_CLASS (ets_parent_class)->proxy_model_row_changed) (subset, source, row); @@ -189,9 +189,9 @@ ets_proxy_model_row_changed (ETableSubset *subset, ETableModel *source, gint row static void ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, gint col, gint row) { - ETableSorted *ets = E_TABLE_SORTED(subset); - if (e_table_sorting_utils_affects_sort(ets->sort_info, ets->full_header, col)) - ets_proxy_model_row_changed(subset, source, row); + ETableSorted *ets = E_TABLE_SORTED (subset); + if (e_table_sorting_utils_affects_sort (ets->sort_info, ets->full_header, col)) + ets_proxy_model_row_changed (subset, source, row); else if (E_TABLE_SUBSET_CLASS (ets_parent_class)->proxy_model_cell_changed) (E_TABLE_SUBSET_CLASS (ets_parent_class)->proxy_model_cell_changed) (subset, source, col, row); } @@ -199,8 +199,8 @@ ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, gint co static void ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row, gint count) { - ETableModel *etm = E_TABLE_MODEL(etss); - ETableSorted *ets = E_TABLE_SORTED(etss); + ETableModel *etm = E_TABLE_MODEL (etss); + ETableSorted *ets = E_TABLE_SORTED (etss); gint i; gboolean full_change = FALSE; @@ -218,7 +218,7 @@ ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row } } - etss->map_table = g_realloc (etss->map_table, (etss->n_map + count) * sizeof(gint)); + etss->map_table = g_realloc (etss->map_table, (etss->n_map + count) * sizeof (gint)); for (; count > 0; count--) { if (!full_change) @@ -230,14 +230,14 @@ ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row ets->insert_count++; if (ets->insert_count > ETS_INSERT_MAX) { /* schedule a sort, and append instead */ - ets->sort_idle_id = g_idle_add_full(50, (GSourceFunc) ets_sort_idle, ets, NULL); + ets->sort_idle_id = g_idle_add_full (50, (GSourceFunc) ets_sort_idle, ets, NULL); } else { /* make sure we have an idle handler to reset the count every now and then */ if (ets->insert_idle_id == 0) { - ets->insert_idle_id = g_idle_add_full(40, (GSourceFunc) ets_insert_idle, ets, NULL); + ets->insert_idle_id = g_idle_add_full (40, (GSourceFunc) ets_insert_idle, ets, NULL); } - i = e_table_sorting_utils_insert(etss->source, ets->sort_info, ets->full_header, etss->map_table, etss->n_map, row); - memmove(etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof(gint)); + i = e_table_sorting_utils_insert (etss->source, ets->sort_info, ets->full_header, etss->map_table, etss->n_map, row); + memmove (etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof (gint)); } } etss->map_table[i] = row; @@ -253,13 +253,13 @@ ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row e_table_model_changed (etm); else e_table_model_no_change (etm); - d(e_table_subset_print_debugging(etss)); + d (e_table_subset_print_debugging (etss)); } static void ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, gint row, gint count) { - ETableModel *etm = E_TABLE_MODEL(etss); + ETableModel *etm = E_TABLE_MODEL (etss); gint i; gboolean shift; gint j; @@ -271,7 +271,7 @@ ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, gint row, if (etss->map_table[i] == row + j) { if (shift) e_table_model_pre_change (etm); - memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof(gint)); + memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof (gint)); etss->n_map--; if (shift) e_table_model_row_deleted (etm, i); @@ -290,22 +290,22 @@ ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, gint row, } d(g_print("deleted row %d count %d", row, count)); - d(e_table_subset_print_debugging(etss)); + d (e_table_subset_print_debugging (etss)); } static void -ets_sort(ETableSorted *ets) +ets_sort (ETableSorted *ets) { - ETableSubset *etss = E_TABLE_SUBSET(ets); + ETableSubset *etss = E_TABLE_SUBSET (ets); static gint reentering = 0; if (reentering) return; reentering = 1; - e_table_model_pre_change(E_TABLE_MODEL(ets)); + e_table_model_pre_change (E_TABLE_MODEL (ets)); - e_table_sorting_utils_sort(etss->source, ets->sort_info, ets->full_header, etss->map_table, etss->n_map); + e_table_sorting_utils_sort (etss->source, ets->sort_info, ets->full_header, etss->map_table, etss->n_map); - e_table_model_changed (E_TABLE_MODEL(ets)); + e_table_model_changed (E_TABLE_MODEL (ets)); reentering = 0; } -- cgit v1.2.3