Whitespace changes and remove unnecessary casts.

[pspp-builds.git] / src / ui / gui / oneway-anova-dialog.c

diff --git a/src/ui/gui/oneway-anova-dialog.c b/src/ui/gui/oneway-anova-dialog.c
index f94756ec23808eda5f1187430c33c5cc14db5d0d..be281f7c546adb838306771c68ea50c1a7bfa86f 100644 (file)
--- a/src/ui/gui/oneway-anova-dialog.c
+++ b/src/ui/gui/oneway-anova-dialog.c
@@ -184,13 +184,15 @@ oneway_anova_dialog (GObject *o, gpointer data)
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
                                 dict_view, ow.vars_treeview,
                                 insert_source_row_into_tree_view,
+                                NULL,
                                 NULL);
 
 
   psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
                                 dict_view, ow.factor_entry,
                                 insert_source_row_into_entry,
-                                is_currently_in_entry);
+                                is_currently_in_entry,
+                                NULL);
 
 
 
@@ -271,7 +273,7 @@ static gchar * generate_syntax (const struct oneway_anova_dialog *ow)
 
   GString *str = g_string_new ("ONEWAY /VARIABLES=");
 
-  append_variable_names (str, ow->dict, GTK_TREE_VIEW (ow->vars_treeview));
+  append_variable_names (str, ow->dict, GTK_TREE_VIEW (ow->vars_treeview), 0);
 
   g_string_append (str, " BY ");
 
@@ -371,6 +373,7 @@ list_store_changed (struct contrasts_subdialog *csd)
 }
 
 
+
 /* Copy the contrasts array into the local array */
 static GArray *
 clone_contrasts_array (GArray *src_array)
@@ -383,7 +386,7 @@ clone_contrasts_array (GArray *src_array)
 
   for (i = 0 ; i < src_array->len ; ++i )
     {
-      gboolean ok;
+
       GtkTreeIter src_iter;
       GtkListStore *src = g_array_index (src_array, GtkListStore*, i);
       GtkListStore *dest;
@@ -393,21 +396,7 @@ clone_contrasts_array (GArray *src_array)
                                           &src_iter))
        continue;
 
-      dest = gtk_list_store_new (1, G_TYPE_DOUBLE);
-
-      for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(src),
-                                              &src_iter);
-          ok;
-          ok = gtk_tree_model_iter_next (GTK_TREE_MODEL (src), &src_iter))
-       {
-         gdouble v;
-         GtkTreeIter dest_iter;
-
-         gtk_tree_model_get (GTK_TREE_MODEL (src), &src_iter, 0, &v, -1);
-
-         gtk_list_store_append  (dest, &dest_iter);
-         gtk_list_store_set (dest, &dest_iter, 0, v, -1);
-       }
+      dest = clone_list_store (src);
 
       g_array_append_val (dest_array, dest);
     }