X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.h;h=76c3aa42e88a195f9528720e41d80c11cbf49c47;hb=766e653e08dc6bd4e4b9db9e8404ae5e2adff07f;hp=4d78807cba2d97464d9b9a052b8df5904207587d;hpb=7293c1a383d325c371bd708401e5a1d7586a4d90;p=pspp

diff --git a/src/ui/gui/psppire-dict.h b/src/ui/gui/psppire-dict.h
index 4d78807cba..76c3aa42e8 100644
--- a/src/ui/gui/psppire-dict.h
+++ b/src/ui/gui/psppire-dict.h
@@ -59,7 +59,9 @@ enum {DICT_TVM_COL_NAME=0,
 struct _PsppireDict
 {
   GObject             parent;
-  struct dictionary *dict;
+  struct dictionary   *dict;
+
+  gboolean dispose_has_run;
 
   gboolean disable_insert_signal;
   /* For GtkTreeModelIface */
@@ -79,10 +81,10 @@ gboolean       psppire_dict_set_name (PsppireDict* s, gint idx, const gchar *nam
 void           psppire_dict_delete_var (PsppireDict *s, gint idx);
 
 /* Return the number of variables in the dictionary */
-gint psppire_dict_get_var_cnt (const PsppireDict *d);
+gint psppire_dict_get_n_vars (const PsppireDict *d);
 
 /* Return the number of `union value's in the dictionary */
-size_t psppire_dict_get_value_cnt (const PsppireDict *d);
+size_t psppire_dict_get_n_values (const PsppireDict *d);
 
 /* Returns the prototype for the cases that match the dictionary */
 const struct caseproto *psppire_dict_get_proto (const PsppireDict *d);
@@ -119,10 +121,6 @@ void psppire_dict_replace_dictionary (PsppireDict *, struct dictionary *);
 
 struct variable * psppire_dict_get_weight_variable (const PsppireDict *);
 
-#if DEBUGGING
-void psppire_dict_dump (const PsppireDict *);
-#endif
-
 const gchar *psppire_dict_encoding (const PsppireDict *);
 
 G_END_DECLS