Remove some unused variables

[pspp] / src / ui / gui / psppire-import-assistant.h

diff --git a/src/ui/gui/psppire-import-assistant.h b/src/ui/gui/psppire-import-assistant.h
index fe8040130d103adb1eb0c3ad2b92339b86422dc9..853db8eb458abb062e013ea6a1946706bc3fcd7a 100644 (file)
--- a/src/ui/gui/psppire-import-assistant.h
+++ b/src/ui/gui/psppire-import-assistant.h
@@ -26,6 +26,7 @@
 #include "libpspp/str.h"
 #include "psppire-dict.h"
 #include "data/spreadsheet-reader.h"
+#include "psppire-text-file.h"
 
 G_BEGIN_DECLS
 
@@ -58,12 +59,8 @@ typedef struct _PsppireImportAssistant       PsppireImportAssistant;
 typedef struct _PsppireImportAssistantClass  PsppireImportAssistantClass;
 
 
-struct first_line_page;
-
 typedef void page_func (PsppireImportAssistant *, GtkWidget *page);
 
-enum { MAX_PREVIEW_LINES = 1000 }; /* Max number of lines to read. */
-
 struct _PsppireImportAssistant
 {
   GtkAssistant parent;
@@ -72,6 +69,8 @@ struct _PsppireImportAssistant
 
   gint current_page;
 
+  gchar *file_name;
+
   /* START The chooser page of the assistant. */
   GtkWidget *encoding_selector;
   GtkFileFilter *default_filter;
@@ -104,15 +103,13 @@ struct _PsppireImportAssistant
 
 
 /* START Page where the user verifies and adjusts input formats. */
-  GtkWidget *data_tree_view;
-  PsppireDict *psppire_dict;
-  struct variable **modified_vars;
-  size_t modified_var_cnt;
+   struct variable **modified_vars;
+   size_t modified_var_cnt;
 /* END Page where the user verifies and adjusts input formats. */
 
 
   /* START first line page */
-  GtkWidget *tree_view;
+  GtkWidget *first_line_tree_view;
   GtkWidget *variable_names_cb;
   /* END first line page */
 
@@ -125,32 +122,26 @@ struct _PsppireImportAssistant
   GtkCellRenderer *prop_renderer;
   GtkCellRenderer *fixed_renderer;
 
-  // START     struct file file;
-  char *file_name;        /* File name. */
-
-  /* Relevant only for text files */
+  PsppireTextFile *text_file;
 
-  gchar *encoding;        /* Encoding. */
-  unsigned long int total_lines; /* Number of lines in file. */
-  gboolean total_is_exact;    /* Is total_lines exact (or an estimate)? */
-
-  /* The first several lines of the file. */
-  struct string lines[MAX_PREVIEW_LINES];
-  size_t line_cnt;
-
-  // END     struct file file;
+  GtkTreeModel *delimiters_model;
 
   struct sheet_spec_page *sheet_spec;
-  struct first_line_page *first_line;
 
+#if MERGE_SHEET
   /* The columns produced. */
   struct column *columns;     /* Information about each column. */
   size_t column_cnt;          /* Number of columns. */
 
   int skip_lines;             /* Number of initial lines to skip? */
   gboolean variable_names;        /* Variable names above first line of data? */
+#endif
+
   struct dictionary *dict;
 
+  GtkWidget *var_sheet;
+  GtkWidget *data_sheet;
+
   struct spreadsheet *spreadsheet;
 };