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 83b05aec54933923d019193cf4070a6164c50fc8..927e235c21419d48e80875284412dd9268424f3e 100644 (file)
--- a/src/ui/gui/var-display.h
+++ b/src/ui/gui/var-display.h
@@ -19,18 +19,17 @@
 #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