From: John Darrington Date: Sun, 23 Apr 2017 07:35:58 +0000 (+0200) Subject: Whitespace changes only. Remove trailing whitespace. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0e349cf4628a5a0c60cffa6ec8341c252c1c1e0;p=pspp Whitespace changes only. Remove trailing whitespace. --- diff --git a/src/ui/gui/find-dialog.c b/src/ui/gui/find-dialog.c index c8f8451bd8..123f7cf69b 100644 --- a/src/ui/gui/find-dialog.c +++ b/src/ui/gui/find-dialog.c @@ -103,7 +103,7 @@ do_find (GObject *obj, const struct find_dialog *fd) gint column = -1; glong row; - + row = 10; find_value (fd, row, &x, &column); diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c index de7e977646..4d6fec1a28 100644 --- a/src/ui/gui/goto-case-dialog.c +++ b/src/ui/gui/goto-case-dialog.c @@ -57,7 +57,7 @@ goto_case_dialog (JmdSheet *ds) gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (case_num_entry)) - FIRST_CASE_NUMBER ; - if (case_num >= 0 && + if (case_num >= 0 && case_num < gtk_tree_model_iter_n_children (ds->data_model, NULL)) { jmd_sheet_scroll_to (ds, -1, case_num); diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c index c7dc55afa5..7c2708f1da 100644 --- a/src/ui/gui/psppire-data-store.c +++ b/src/ui/gui/psppire-data-store.c @@ -110,7 +110,7 @@ __iter_nth_child (GtkTreeModel *tree_model, gint n) { PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); - + g_assert (parent == NULL); g_return_val_if_fail (store, FALSE); @@ -122,10 +122,10 @@ __iter_nth_child (GtkTreeModel *tree_model, iter->user_data = NULL; return FALSE; } - + iter->user_data = GINT_TO_POINTER (n); iter->stamp = store->stamp; - + return TRUE; } @@ -144,7 +144,7 @@ myreversefunc (GtkTreeModel *model, gint col, gint row, union value val; value_init (&val, width); - char *xx = + char *xx = data_in (ss_cstr (in), psppire_dict_encoding (store->dict), fmt->type, &val, width, "UTF-8"); @@ -183,7 +183,7 @@ __get_value (GtkTreeModel *tree_model, PsppireDataStore *store = PSPPIRE_DATA_STORE (tree_model); g_return_if_fail (iter->stamp == store->stamp); - + const struct variable *variable = psppire_dict_get_variable (store->dict, column); if (NULL == variable) return; @@ -199,7 +199,7 @@ __get_value (GtkTreeModel *tree_model, GVariant *vv = value_variant_new (val, var_get_width (variable)); g_value_set_variant (value, vv); - + case_unref (cc); } @@ -210,16 +210,16 @@ __tree_model_init (GtkTreeModelIface *iface) iface->get_flags = __tree_model_get_flags; iface->get_n_columns = __tree_model_get_n_columns ; iface->get_column_type = NULL; - iface->get_iter = NULL; - iface->iter_next = NULL; - iface->get_path = NULL; + iface->get_iter = NULL; + iface->iter_next = NULL; + iface->get_path = NULL; iface->get_value = __get_value; - iface->iter_children = NULL; - iface->iter_has_child = NULL; + iface->iter_children = NULL; + iface->iter_has_child = NULL; iface->iter_n_children = __tree_model_iter_n_children; iface->iter_nth_child = __iter_nth_child; - iface->iter_parent = NULL; + iface->iter_parent = NULL; } @@ -440,7 +440,7 @@ psppire_data_store_set_reader (PsppireDataStore *ds, ds->datasheet = datasheet_create (reader); gint new_n = datasheet_get_n_rows (ds->datasheet); - + if ( ds->dict ) for (i = 0 ; i < n_dict_signals; ++i ) { @@ -588,7 +588,7 @@ psppire_data_store_get_value (PsppireDataStore *store, return TRUE; } - + gchar * psppire_data_store_get_string (PsppireDataStore *store, @@ -600,7 +600,7 @@ psppire_data_store_get_string (PsppireDataStore *store, int width = var_get_width (var); if (! psppire_data_store_get_value (store, row, var, &v)) return NULL; - + string = NULL; if (use_value_label) { diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index ff30d64c69..21479d008d 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -90,7 +90,7 @@ gi (GListModel *list, guint id) JmdDatum *gd = JMD_DATUM (g_object_new (JMD_TYPE_DATUM, NULL)); PsppireDict *dict = PSPPIRE_DICT (list); - + if (id >= psppire_dict_get_var_cnt (dict)) { gd->text = g_strdup (_("Var")); @@ -160,7 +160,7 @@ psppire_dict_get_type (void) object_type = g_type_register_static (G_TYPE_OBJECT, "PsppireDict", &object_info, 0); - + g_type_add_interface_static (object_type, GTK_TYPE_TREE_MODEL, &tree_model_info); @@ -180,7 +180,7 @@ psppire_dict_class_init (PsppireDictClass *class) parent_class = g_type_class_peek_parent (class); object_class->dispose = psppire_dict_dispose; - + signals [VARIABLE_CHANGED] = g_signal_new ("variable-changed", G_TYPE_FROM_CLASS (class), @@ -344,7 +344,7 @@ psppire_dict_new_from_dict (struct dictionary *d) { PsppireDict *new_dict = g_object_new (PSPPIRE_TYPE_DICT, NULL); new_dict->dict = d; - + dict_set_callbacks (new_dict->dict, &gui_callbacks, new_dict); return new_dict; @@ -358,7 +358,7 @@ psppire_dict_replace_dictionary (PsppireDict *dict, struct dictionary *d) guint old_n = dict_get_var_cnt (dict->dict); guint new_n = dict_get_var_cnt (d); - + dict->dict = d; weight_changed_callback (d, var ? var_get_dict_index (var) : -1, dict); @@ -435,7 +435,7 @@ psppire_dict_insert_variable (PsppireDict *d, gint idx, const gchar *name) g_signal_emit (d, signals[VARIABLE_INSERTED], 0, idx); g_signal_emit_by_name (d, "items-changed", idx, 0, 1); - + return var; } @@ -682,7 +682,7 @@ tree_model_column_type (GtkTreeModel *model, gint index) g_return_val_if_fail (PSPPIRE_IS_DICT (model), (GType) 0); GType t = 0; - + switch (index) { case DICT_TVM_COL_NAME: @@ -810,7 +810,7 @@ tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, var = iter->user_data; const struct fmt_spec *fs = var_get_write_format (var); - + switch (column) { case DICT_TVM_COL_NAME: diff --git a/src/ui/gui/value-variant.c b/src/ui/gui/value-variant.c index e26e0d4a31..0789717ab7 100644 --- a/src/ui/gui/value-variant.c +++ b/src/ui/gui/value-variant.c @@ -55,7 +55,7 @@ value_variant_new (const union value *in, int width) vv[IDX_DATA] = g_variant_new_from_data (G_VARIANT_TYPE_BYTESTRING, q, width + 1, FALSE, NULL, NULL); } - + return g_variant_new_tuple (vv, 2); } diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c index e969eb5ae2..bbbc5a728a 100644 --- a/src/ui/gui/widgets.c +++ b/src/ui/gui/widgets.c @@ -171,7 +171,7 @@ preregister_misc (void) g_value_register_transform_func (G_TYPE_STRING, G_TYPE_DOUBLE, tx_string_to_double); g_value_register_transform_func (G_TYPE_STRING, G_TYPE_INT, tx_string_to_int); - + g_value_register_transform_func (measure_enum_type, G_TYPE_STRING, enum_to_string); g_value_register_transform_func (align_enum_type, G_TYPE_STRING, enum_to_string); g_value_register_transform_func (role_enum_type, G_TYPE_STRING, enum_to_string);