projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Warnings: function type cast for g_list_foreach
[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 0a87892a77ff70b8a0bf60e4c3416804358b2dbf..3de7e08ff82ce2c123972e2a9f6f85da55e36a42 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.
/* 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
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 <gtk/gtk.h>
-#include "libpspp/str.h"
#include "psppire-dict.h"
#include "data/spreadsheet-reader.h"
#include "psppire-text-file.h"
#include "psppire-dict.h"
#include "data/spreadsheet-reader.h"
#include "psppire-text-file.h"
+#include "psppire-delimited-text.h"
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-89,7
+89,6
@@
struct _PsppireImportAssistant
/* START Page where the user chooses field separators. */
/* How to break lines into columns. */
/* START Page where the user chooses field separators. */
/* How to break lines into columns. */
- // struct string separators; /* Field separators. */
struct string quotes; /* Quote characters. */
GtkWidget *custom_cb;
struct string quotes; /* Quote characters. */
GtkWidget *custom_cb;
@@
-97,7
+96,6
@@
struct _PsppireImportAssistant
GtkWidget *quote_cb;
GtkWidget *quote_combo;
GtkWidget *quote_cb;
GtkWidget *quote_combo;
- GtkEntry *quote_entry;
GtkWidget *fields_tree_view;
/* END Page where the user chooses field separators. */
GtkWidget *fields_tree_view;
/* END Page where the user chooses field separators. */
@@
-114,12
+112,10
@@
struct _PsppireImportAssistant
int response;
PsppireTextFile *text_file;
int response;
PsppireTextFile *text_file;
-
- GtkTreeModel *delimiters_model;
-
- struct sheet_spec_page *sheet_spec;
+ PsppireDelimitedText *delimiters_model;
struct dictionary *dict;
struct dictionary *dict;
+ struct dictionary *casereader_dict;
GtkWidget *var_sheet;
GtkWidget *data_sheet;
GtkWidget *var_sheet;
GtkWidget *data_sheet;
@@
-139,6
+135,8
@@
GtkWidget *psppire_import_assistant_new (GtkWindow *toplevel);
gchar *psppire_import_assistant_generate_syntax (PsppireImportAssistant *);
gchar *psppire_import_assistant_generate_syntax (PsppireImportAssistant *);
+int psppire_import_assistant_run (PsppireImportAssistant *asst);
+
G_END_DECLS
#endif /* __PSPPIRE_IMPORT_ASSISTANT_H__ */
G_END_DECLS
#endif /* __PSPPIRE_IMPORT_ASSISTANT_H__ */