Revert "Keep systems happy which do not have sys/resource.h"

[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 0610fad29ba548d4712d2a9282698962276aa77e..c983c92496a427e8fcc49588f5ba46de43e4f254 100644 (file)
--- a/src/ui/gui/psppire-import-assistant.h
+++ b/src/ui/gui/psppire-import-assistant.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2015  Free Software Foundation
+   Copyright (C) 2015, 2017, 2020  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,10 +23,10 @@
 
 #include <gtk/gtk.h>
 
-#include "libpspp/str.h"
 #include "psppire-dict.h"
 #include "data/spreadsheet-reader.h"
 #include "psppire-text-file.h"
+#include "psppire-delimited-text.h"
 
 G_BEGIN_DECLS
 
@@ -96,7 +96,6 @@ struct _PsppireImportAssistant
   GtkWidget *quote_cb;
   GtkWidget *quote_combo;
 
-  GtkEntry *quote_entry;
   GtkWidget *fields_tree_view;
 
 /* END Page where the user chooses field separators. */
@@ -113,12 +112,12 @@ struct _PsppireImportAssistant
   int response;
 
   PsppireTextFile *text_file;
-
-  GtkTreeModel *delimiters_model;
+  PsppireDelimitedText *delimiters_model;
 
   struct sheet_spec_page *sheet_spec;
 
   struct dictionary *dict;
+  struct dictionary *casereader_dict;
 
   GtkWidget *var_sheet;
   GtkWidget *data_sheet;