Merge commit 'origin/stable'

[pspp-builds.git] / src / ui / gui / var-display.h

diff --git a/src/ui/gui/var-display.h b/src/ui/gui/var-display.h
index a67a7cbc5d8ce5100930e0924db7e623b8d96fcc..927e235c21419d48e80875284412dd9268424f3e 100644 (file)
--- a/src/ui/gui/var-display.h
+++ b/src/ui/gui/var-display.h
@@ -1,10 +1,9 @@
-/*
-   PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
    Copyright (C) 2007  Free Software Foundation
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -13,27 +12,24 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 
 #ifndef VAR_DISPLAY_H
 #define VAR_DISPLAY 1
 
 #include <glib.h>
+#include <data/variable.h>
+#include "psppire-dict.h"
 
 struct variable;
 
+#define n_ALIGNMENTS 3
 
-gchar * name_to_string (const struct variable *var, GError **err);
-
-
-gchar * missing_values_to_string (const struct variable *pv, GError **err);
-
-gchar * measure_to_string (const struct variable *var, GError **err);
-
-gchar * label_to_string (const struct variable *var, GError **err);
+extern const gchar *const alignments[n_ALIGNMENTS + 1];
+extern const gchar *const measures[n_MEASURES + 1];
 
+gchar *missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GError **err);
+gchar *measure_to_string (const struct variable *var, GError **err);
 
 #endif