X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-import-assistant.h;h=3de7e08ff82ce2c123972e2a9f6f85da55e36a42;hb=5b2ed095a8aaa98adaea4922855edcbfb619c728;hp=0610fad29ba548d4712d2a9282698962276aa77e;hpb=d383cf8b05093b2286a8a6122b91cec353e838db;p=pspp diff --git a/src/ui/gui/psppire-import-assistant.h b/src/ui/gui/psppire-import-assistant.h index 0610fad29b..3de7e08ff8 100644 --- 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 -#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,10 @@ struct _PsppireImportAssistant int response; PsppireTextFile *text_file; - - GtkTreeModel *delimiters_model; - - struct sheet_spec_page *sheet_spec; + PsppireDelimitedText *delimiters_model; struct dictionary *dict; + struct dictionary *casereader_dict; GtkWidget *var_sheet; GtkWidget *data_sheet;