Removed my authorship lines.

[pspp-builds.git] / src / ui / gui / psppire-dict.h

diff --git a/src/ui/gui/psppire-dict.h b/src/ui/gui/psppire-dict.h
index b36ccf9e6156297ade8b892e74ef3ef798f4ae47..3aac1ced4d5f3d47c47ef2b70c00173e8e179a34 100644 (file)
--- a/src/ui/gui/psppire-dict.h
+++ b/src/ui/gui/psppire-dict.h
@@ -1,7 +1,6 @@
 /* 
     PSPPIRE --- A Graphical User Interface for PSPP
     Copyright (C) 2004  Free Software Foundation
-    Written by John Darrington
 
     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
@@ -26,8 +25,8 @@
 #include <glib-object.h>
 #include <glib.h>
 
-#include <dictionary.h>
-#include <variable.h>
+#include <data/dictionary.h>
+#include <data/variable.h>
 
 
 G_BEGIN_DECLS
@@ -47,15 +46,15 @@ G_BEGIN_DECLS
 typedef struct _PsppireDict       PsppireDict;
 typedef struct _PsppireDictClass PsppireDictClass;
 
+enum {DICT_TVM_COL_NAME=0, DICT_TVM_COL_VAR, n_DICT_COLS} ;
+
 struct _PsppireDict
 {
   GObject             parent;
   struct dictionary *dict;
 
-  /* Cache of variables */
-  struct PsppireVariable **variables;
-
-  gint cache_size;
+  /* For GtkTreeModelIface */
+  gint stamp;
 };
 
 struct _PsppireDictClass
@@ -72,11 +71,6 @@ PsppireDict*     psppire_dict_new_from_dict (struct dictionary *d);
 void           psppire_dict_set_name (PsppireDict* s, gint idx, const gchar *name);
 void           psppire_dict_delete_var (PsppireDict *s, gint idx);
 
-/* Return the variable indexed by IDX.
-   returns NULL if IDX is not valid.
-*/
-struct variable *psppire_dict_get_var(PsppireDict *d, gint idx);
-
 /* Return the number of variables in the dictionary */
 gint psppire_dict_get_var_cnt(const PsppireDict *d);
 
@@ -94,7 +88,7 @@ void psppire_dict_clear(PsppireDict *d);
 
 /* Return the IDXth variable */
 
-struct PsppireVariable * psppire_dict_get_variable(PsppireDict *d, gint idx);
+struct variable * psppire_dict_get_variable (PsppireDict *d, gint idx);
 
 /* Delete N variables beginning at FIRST */
 void psppire_dict_delete_variables(PsppireDict *d, gint first, gint n);
@@ -102,9 +96,18 @@ void psppire_dict_delete_variables(PsppireDict *d, gint first, gint n);
 /* Insert a new variable at posn IDX */
 void psppire_dict_insert_variable(PsppireDict *d, gint idx, const gchar *name);
 
+void psppire_dict_resize_variable(PsppireDict *, 
+                                 const struct variable *,
+                                 gint, gint );
+
 gboolean psppire_dict_check_name(const PsppireDict *dict, 
                              const gchar *name, gboolean report);
 
+gint psppire_dict_get_next_value_idx (const PsppireDict *dict);
+
+void psppire_dict_rename_var (PsppireDict *dict, struct variable *v,
+                             const gchar *text);
+
 
 G_END_DECLS