projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Warnings: function type cast for g_list_foreach
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-autorecode.c
diff --git
a/src/ui/gui/psppire-dialog-action-autorecode.c
b/src/ui/gui/psppire-dialog-action-autorecode.c
index 7389976a3c5d011ee053052ff7f2aea35dbac3d9..a2ec9739840b4b2b9679073e5fc891118813e860 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-autorecode.c
+++ b/
src/ui/gui/psppire-dialog-action-autorecode.c
@@
-68,7
+68,7
@@
refresh (PsppireDialogAction *pda)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->group), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->blank), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->group), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rd->blank), FALSE);
- if (rd->varmap
)
+ if (rd->varmap)
g_hash_table_remove_all (rd->varmap);
gtk_list_store_clear (GTK_LIST_STORE (target_list));
g_hash_table_remove_all (rd->varmap);
gtk_list_store_clear (GTK_LIST_STORE (target_list));
@@
-92,7
+92,7
@@
nlp_create (const char *name, const char *label)
nlp->label = NULL;
nlp->label = NULL;
- if (
label != NULL && 0 != strcmp ("", label))
+ if (label != NULL && 0 != strcmp ("", label))
nlp->label = g_strdup (label);
return nlp;
nlp->label = g_strdup (label);
return nlp;
@@
-102,7
+102,7
@@
static void
nlp_destroy (gpointer data)
{
struct nlp *nlp = data ;
nlp_destroy (gpointer data)
{
struct nlp *nlp = data ;
- if (
! nlp
)
+ if (
! nlp
)
return;
g_free (nlp->name);
return;
g_free (nlp->name);
@@
-142,13
+142,13
@@
generate_syntax (const PsppireDialogAction *act)
g_string_append (string, nlp->name);
}
g_string_append (string, nlp->name);
}
- if (
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->ascending)))
+ if (! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->ascending)))
g_string_append (string, "\n\t/DESCENDING");
g_string_append (string, "\n\t/DESCENDING");
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->group)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->group)))
g_string_append (string, "\n\t/GROUP");
g_string_append (string, "\n\t/GROUP");
- if (
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->blank)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rd->blank)))
g_string_append (string, "\n\t/BLANK = MISSING");
g_string_append (string, ".\n");
g_string_append (string, "\n\t/BLANK = MISSING");
g_string_append (string, ".\n");
@@
-176,7
+176,7
@@
on_change_clicked (GObject *obj, gpointer data)
const gchar *dest_var_name =
gtk_entry_get_text (GTK_ENTRY (rd->new_name_entry));
const gchar *dest_var_name =
gtk_entry_get_text (GTK_ENTRY (rd->new_name_entry));
- if (
NULL == rows || rows->next != NULL)
+ if (NULL == rows || rows->next != NULL)
goto finish;
gtk_tree_model_get_iter (model, &iter, rows->data);
goto finish;
gtk_tree_model_get_iter (model, &iter, rows->data);
@@
-192,8
+192,9
@@
on_change_clicked (GObject *obj, gpointer data)
gtk_tree_model_row_changed (model, rows->data, &iter);
finish:
gtk_tree_model_row_changed (model, rows->data, &iter);
finish:
- g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
+ g_list_foreach (rows, (GFunc)
(void (*)(void))
gtk_tree_path_free, NULL);
g_list_free (rows);
g_list_free (rows);
+ var_unref (var);
}
}
@@
-203,9
+204,9
@@
on_entry_change (PsppireDialogActionAutorecode *rd)
gboolean valid = TRUE;
const char *text = gtk_entry_get_text (GTK_ENTRY (rd->new_name_entry));
gboolean valid = TRUE;
const char *text = gtk_entry_get_text (GTK_ENTRY (rd->new_name_entry));
- if (
0 == strcmp ("", text))
+ if (0 == strcmp ("", text))
valid = FALSE;
valid = FALSE;
- else if (psppire_dict_lookup_var (
rd
->dict, text))
+ else if (psppire_dict_lookup_var (
PSPPIRE_DIALOG_ACTION (rd)
->dict, text))
valid = FALSE;
else
{
valid = FALSE;
else
{
@@
-217,7
+218,7
@@
on_entry_change (PsppireDialogActionAutorecode *rd)
{
struct nlp *nlp = value;
{
struct nlp *nlp = value;
- if (
0 == strcmp (nlp->name, text))
+ if (0 == strcmp (nlp->name, text))
{
valid = FALSE;
break;
{
valid = FALSE;
break;
@@
-243,7
+244,7
@@
on_selection_change (GtkTreeSelection *selection, gpointer data)
GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
- if (
rows && !rows->next)
+ if (rows && !rows->next)
{
/* Exactly one row is selected */
struct nlp *nlp;
{
/* Exactly one row is selected */
struct nlp *nlp;
@@
-274,7
+275,7
@@
on_selection_change (GtkTreeSelection *selection, gpointer data)
gtk_widget_set_sensitive (rd->change_button, FALSE);
}
gtk_widget_set_sensitive (rd->change_button, FALSE);
}
- g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
+ g_list_foreach (rows, (GFunc)
(void (*)(void))
gtk_tree_path_free, NULL);
g_list_free (rows);
}
g_list_free (rows);
}
@@
-301,7
+302,7
@@
render_new_var_name (GtkTreeViewColumn *tree_column,
nlp = g_hash_table_lookup (rd->varmap, var);
nlp = g_hash_table_lookup (rd->varmap, var);
- if (
nlp
)
+ if (
nlp
)
g_object_set (cell, "text", nlp->name, NULL);
else
g_object_set (cell, "text", "", NULL);
g_object_set (cell, "text", nlp->name, NULL);
else
g_object_set (cell, "text", "", NULL);