X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-case-file.c;h=ec50b1525b74d516de207ddd4e8a33277cdb06a8;hb=bd5bcd62b73df2eec17bc9a273bfb52f80b3f2fe;hp=6e0766b95249f0f24a7937899cef6906cf0ac16c;hpb=75fe94ea24fd7b12a0d99b8f36a79d8423e668d4;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-case-file.c b/src/ui/gui/psppire-case-file.c
index 6e0766b9..ec50b152 100644
--- a/src/ui/gui/psppire-case-file.c
+++ b/src/ui/gui/psppire-case-file.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "psppire-object.h"
 #include "psppire-case-file.h"
 
 #include <gtksheet/gtkextra-marshal.h>
@@ -48,7 +47,7 @@ enum  {CASE_CHANGED,
        CASES_DELETED,
        n_SIGNALS};
 
-static guint signal[n_SIGNALS];
+static guint signals [n_SIGNALS];
 
 
 /* --- functions --- */
@@ -75,7 +74,7 @@ psppire_case_file_get_type (void)
 	(GInstanceInitFunc) psppire_case_file_init,
       };
 
-      object_type = g_type_register_static (G_TYPE_PSPPIRE_OBJECT, "PsppireCaseFile",
+      object_type = g_type_register_static (G_TYPE_OBJECT, "PsppireCaseFile",
 					    &object_info, 0);
     }
 
@@ -92,7 +91,7 @@ psppire_case_file_class_init (PsppireCaseFileClass *class)
 
   object_class->finalize = psppire_case_file_finalize;
 
-  signal[CASE_CHANGED] =
+  signals [CASE_CHANGED] =
     g_signal_new ("case_changed",
 		  G_TYPE_FROM_CLASS (class),
 		  G_SIGNAL_RUN_FIRST,
@@ -104,7 +103,7 @@ psppire_case_file_class_init (PsppireCaseFileClass *class)
 		  G_TYPE_INT);
 
 
-  signal[CASE_INSERTED] =
+  signals [CASE_INSERTED] =
     g_signal_new ("case_inserted",
 		  G_TYPE_FROM_CLASS (class),
 		  G_SIGNAL_RUN_FIRST,
@@ -116,7 +115,7 @@ psppire_case_file_class_init (PsppireCaseFileClass *class)
 		  G_TYPE_INT);
 
 
-  signal[CASES_DELETED] =
+  signals [CASES_DELETED] =
     g_signal_new ("cases_deleted",
 		  G_TYPE_FROM_CLASS (class),
 		  G_SIGNAL_RUN_FIRST,
@@ -153,33 +152,24 @@ psppire_case_file_init (PsppireCaseFile *cf)
  * Creates a new #PsppireCaseFile.
  */
 PsppireCaseFile*
-psppire_case_file_new (gint val_cnt)
+psppire_case_file_new (void)
 {
   PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL);
 
-  cf->flexifile = flexifile_create (val_cnt);
+  cf->flexifile = flexifile_create (0);
 
   return cf;
 }
 
 
-/**
- * psppire_case_file_new_from_flexifile:
- * @returns: a new #PsppireCaseFile object
- *
- * Creates a new #PsppireCaseFile from an existing flexifile
- */
-PsppireCaseFile*
-psppire_case_file_new_from_flexifile (struct flexifile *ff)
+void
+psppire_case_file_replace_flexifile (PsppireCaseFile *cf, struct flexifile *ff)
 {
-  PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL);
-
   cf->flexifile = (struct casefile *) ff;
-
-  return cf;
 }
 
 
+
 gboolean
 psppire_case_file_delete_cases (PsppireCaseFile *cf, gint n_cases, gint first)
 {
@@ -190,7 +180,7 @@ psppire_case_file_delete_cases (PsppireCaseFile *cf, gint n_cases, gint first)
 
   result =  flexifile_delete_cases (FLEXIFILE (cf->flexifile), n_cases,  first);
 
-  g_signal_emit (cf, signal[CASES_DELETED], 0, n_cases, first);
+  g_signal_emit (cf, signals [CASES_DELETED], 0, n_cases, first);
 
   return result;
 }
@@ -209,7 +199,7 @@ psppire_case_file_insert_case (PsppireCaseFile *cf,
   result = flexifile_insert_case (FLEXIFILE (cf->flexifile), cc, posn);
 
   if ( result )
-    g_signal_emit (cf, signal[CASE_INSERTED], 0, posn);
+    g_signal_emit (cf, signals [CASE_INSERTED], 0, posn);
   else
     g_warning ("Cannot insert case at position %d\n", posn);
 
@@ -232,7 +222,7 @@ psppire_case_file_append_case (PsppireCaseFile *cf,
 
   result = casefile_append (cf->flexifile, c);
 
-  g_signal_emit (cf, signal[CASE_INSERTED], 0, posn);
+  g_signal_emit (cf, signals [CASE_INSERTED], 0, posn);
 
   return result;
 }
@@ -276,7 +266,7 @@ psppire_case_file_clear (PsppireCaseFile *cf)
 {
   casefile_destroy (cf->flexifile);
   cf->flexifile = 0;
-  g_signal_emit (cf, signal[CASES_DELETED], 0, 0, -1);
+  g_signal_emit (cf, signals [CASES_DELETED], 0, 0, -1);
 }
 
 /* Set the IDXth value of case C to SYSMIS/EMPTY */
@@ -303,7 +293,7 @@ psppire_case_file_set_value (PsppireCaseFile *cf, gint casenum, gint idx,
   /* Cast away const in flagrant abuse of the casefile */
   memcpy ((union value *)case_data_idx (&cc, idx), v, bytes);
 
-  g_signal_emit (cf, signal[CASE_CHANGED], 0, casenum);
+  g_signal_emit (cf, signals [CASE_CHANGED], 0, casenum);
 
   return TRUE;
 }
@@ -330,7 +320,7 @@ psppire_case_file_data_in (PsppireCaseFile *cf, gint casenum, gint idx,
                 (union value *) case_data_idx (&cc, idx), fmt_var_width (fmt)))
     g_warning ("Cant set value\n");
 
-  g_signal_emit (cf, signal[CASE_CHANGED], 0, casenum);
+  g_signal_emit (cf, signals [CASE_CHANGED], 0, casenum);
 
   return TRUE;
 }
@@ -355,7 +345,7 @@ psppire_case_file_sort (PsppireCaseFile *cf, const struct sort_criteria *sc)
   /* FIXME: Need to have a signal to change a range of cases, instead of
      calling a signal many times */
   for ( c = 0 ; c < casefile_get_case_cnt (cf->flexifile) ; ++c )
-    g_signal_emit (cf, signal[CASE_CHANGED], 0, c);
+    g_signal_emit (cf, signals [CASE_CHANGED], 0, c);
 
   flexifile_factory_destroy (factory);
 }