Rewrite and improve formatted output routines.

[pspp] / src / ui / gui / psppire-variable.h

diff --git a/src/ui/gui/psppire-variable.h b/src/ui/gui/psppire-variable.h
index 19e7ecc80d74ce3c01351da4efb20871f934e1d1..248844eb84a77d4036a5bbbfb0c552797b541330 100644 (file)
--- a/src/ui/gui/psppire-variable.h
+++ b/src/ui/gui/psppire-variable.h
@@ -25,7 +25,7 @@
 #include <glib-object.h>
 #include <glib.h>
 
-#include <variable.h>
+#include <data/variable.h>
 #include "psppire-dict.h"
 
 /* Don't use any of these members.
@@ -82,12 +82,13 @@ gint psppire_variable_get_alignment(const struct PsppireVariable *pv);
 
 gint psppire_variable_get_measure(const struct PsppireVariable *pv);
 
-gint psppire_variable_get_index(const struct PsppireVariable *pv);
+gint psppire_variable_get_fv(const struct PsppireVariable *pv);
 
 gint psppire_variable_get_type(const struct PsppireVariable *pv);
 
 gint psppire_variable_get_width(const struct PsppireVariable *pv);
 
+gint psppire_variable_get_index(const struct PsppireVariable *pv);
 
 
 #endif /* __PSPPIRE_VARIABLE_H__ */