From: John Darrington Date: Sun, 17 Feb 2013 07:21:48 +0000 (+0100) Subject: Add prototypes for syntax generation functions X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c2dea449f517a982d9d7d6171ab0dfe5792ffa9;p=pspp Add prototypes for syntax generation functions --- diff --git a/src/ui/gui/page-first-line.c b/src/ui/gui/page-first-line.c index 3296b50a43..d3191e78ca 100644 --- a/src/ui/gui/page-first-line.c +++ b/src/ui/gui/page-first-line.c @@ -237,7 +237,7 @@ get_first_line (struct import_assistant *ia) void -first_line_append_syntax (struct import_assistant *ia, struct string *s) +first_line_append_syntax (const struct import_assistant *ia, struct string *s) { if (ia->skip_lines > 0) ds_put_format (s, " /FIRSTCASE=%d\n", ia->skip_lines + 1); diff --git a/src/ui/gui/page-first-line.h b/src/ui/gui/page-first-line.h index 291ffd21db..70118b340a 100644 --- a/src/ui/gui/page-first-line.h +++ b/src/ui/gui/page-first-line.h @@ -20,7 +20,9 @@ struct first_line_page ; struct import_assistant; +struct string; struct first_line_page *first_line_page_create (struct import_assistant *ia); +void first_line_append_syntax (const struct import_assistant *ia, struct string *s); #endif diff --git a/src/ui/gui/page-formats.c b/src/ui/gui/page-formats.c index d3d379a4f4..eb863bdd12 100644 --- a/src/ui/gui/page-formats.c +++ b/src/ui/gui/page-formats.c @@ -271,7 +271,7 @@ on_variable_change (PsppireDict *dict, int dict_idx, void -formats_append_syntax (struct import_assistant *ia, struct string *s) +formats_append_syntax (const struct import_assistant *ia, struct string *s) { int i; int var_cnt; diff --git a/src/ui/gui/page-formats.h b/src/ui/gui/page-formats.h index 2e532068bf..750b6cbc52 100644 --- a/src/ui/gui/page-formats.h +++ b/src/ui/gui/page-formats.h @@ -19,8 +19,10 @@ struct formats_page; struct import_assistant; +struct string; struct formats_page *formats_page_create (struct import_assistant *ia); +void formats_append_syntax (const struct import_assistant *ia, struct string *s); #endif diff --git a/src/ui/gui/page-intro.h b/src/ui/gui/page-intro.h index d0de8bfad4..87848abb4c 100644 --- a/src/ui/gui/page-intro.h +++ b/src/ui/gui/page-intro.h @@ -19,8 +19,10 @@ struct intro_page; struct import_assistant; +struct string; struct intro_page *intro_page_create (struct import_assistant *ia); +void intro_append_syntax (const struct intro_page *p, struct string *s); #endif diff --git a/src/ui/gui/page-separators.c b/src/ui/gui/page-separators.c index 185fa5b9a4..e147881730 100644 --- a/src/ui/gui/page-separators.c +++ b/src/ui/gui/page-separators.c @@ -50,6 +50,7 @@ #include "ui/gui/psppire-var-sheet.h" #include "ui/gui/psppire-var-store.h" #include "ui/gui/psppire-scanf.h" +#include "ui/syntax-gen.h" #include "gl/error.h" #include "gl/intprops.h" @@ -591,7 +592,7 @@ on_separator_toggle (GtkToggleButton *toggle UNUSED, void -separators_append_syntax (struct import_assistant *ia, struct string *s) +separators_append_syntax (const struct import_assistant *ia, struct string *s) { int i; ds_put_cstr (s, " /DELIMITERS=\""); diff --git a/src/ui/gui/page-separators.h b/src/ui/gui/page-separators.h index 273bcaab72..cbc32ee15e 100644 --- a/src/ui/gui/page-separators.h +++ b/src/ui/gui/page-separators.h @@ -20,7 +20,10 @@ struct separators_page; struct import_assistant; +struct string; struct separators_page *separators_page_create (struct import_assistant *ia); +void separators_append_syntax (const struct import_assistant *ia, struct string *s); + #endif