X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-case-file.h;h=f274624fa9c69731770cb6ec925ac77778cda043;hb=1c9e32859d6da9505e1904d5b0f95cfd276a734e;hp=878fc4744ce5a9ce708e8634cfbf13bc7715a48a;hpb=cf63d499efd5e6ca3a7dcc6386b3b87bd31bfda9;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-case-file.h b/src/ui/gui/psppire-case-file.h
index 878fc474..f274624f 100644
--- a/src/ui/gui/psppire-case-file.h
+++ b/src/ui/gui/psppire-case-file.h
@@ -26,6 +26,7 @@
 #include <glib.h>
 
 #include <libpspp/str.h>
+#include <data/case.h>
 
 
 
@@ -48,14 +49,15 @@ typedef struct _PsppireCaseFile	   PsppireCaseFile;
 typedef struct _PsppireCaseFileClass PsppireCaseFileClass;
 
 struct ccase;
-struct flexifile;
-struct casefile;
+struct casereader;
 
 struct _PsppireCaseFile
 {
   GObject             parent;
 
-  struct casefile *flexifile;
+  /* <private> */
+  struct datasheet *datasheet;
+  gboolean      accessible;
 };
 
 
@@ -68,41 +70,40 @@ struct _PsppireCaseFileClass
 /* -- PsppireCaseFile --- */
 GType          psppire_case_file_get_type (void);
 
-PsppireCaseFile *psppire_case_file_new (gint var_cnt);
-PsppireCaseFile* psppire_case_file_new_from_flexifile (struct flexifile *ff);
+PsppireCaseFile *psppire_case_file_new (struct casereader *);
 
+gboolean psppire_case_file_insert_case (PsppireCaseFile *cf, struct ccase *c, gint row);
 
-gboolean psppire_case_file_insert_case(PsppireCaseFile *cf, struct ccase *c, gint row);
+gint psppire_case_file_get_case_count (const PsppireCaseFile *cf);
 
-gint psppire_case_file_get_case_count(const PsppireCaseFile *cf);
 
-
-const union value * psppire_case_file_get_value(const PsppireCaseFile *cf,
-					      gint c, gint idx);
+union value * psppire_case_file_get_value (const PsppireCaseFile *cf,
+                                           casenumber, size_t idx,
+                                           union value *, int width);
 
 struct fmt_spec;
 
-gboolean psppire_case_file_data_in(PsppireCaseFile *cf, gint c, gint idx,
+gboolean psppire_case_file_data_in (PsppireCaseFile *cf, gint c, gint idx,
                                    struct substring input,
                                    const struct fmt_spec *);
 
-gboolean psppire_case_file_set_value(PsppireCaseFile *cf, gint casenum,
+gboolean psppire_case_file_set_value (PsppireCaseFile *cf, gint casenum,
 				     gint idx, union value *v, gint width);
 
-void psppire_case_file_clear(PsppireCaseFile *cf);
+void psppire_case_file_clear (PsppireCaseFile *cf);
 
 
-gboolean psppire_case_file_delete_cases(PsppireCaseFile *cf, gint n_rows,
+gboolean psppire_case_file_delete_cases (PsppireCaseFile *cf, gint n_rows,
 					gint first);
 
-gboolean psppire_case_file_insert_values(PsppireCaseFile *cf, gint n_values, gint before);
+gboolean psppire_case_file_insert_values (PsppireCaseFile *cf, gint n_values, gint before);
 
-struct sort_criteria;
-void psppire_case_file_sort(PsppireCaseFile *cf, const struct sort_criteria *);
+struct case_ordering;
 
-gboolean psppire_case_file_get_case(const PsppireCaseFile *cf, gint casenum,
-				    struct ccase *c);
+void psppire_case_file_sort (PsppireCaseFile *cf, struct case_ordering *);
 
+gboolean psppire_case_file_get_case (const PsppireCaseFile *cf, gint casenum,
+				    struct ccase *c);
 
 G_END_DECLS