X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable-item.h;h=be0987659684ef68fdeba2f23e9d80d9e0506074;hb=4bb1368b5040adb4083cf8d186024a7294456f24;hp=855324416fa066cd73d6c03896567071e4279d7a;hpb=0df9cdd3df66caf4353128feff3008289cda8115;p=pspp

diff --git a/src/output/table-item.h b/src/output/table-item.h
index 855324416f..be09876596 100644
--- a/src/output/table-item.h
+++ b/src/output/table-item.h
@@ -27,6 +27,7 @@
 
 #include "libpspp/compiler.h"
 #include "output/output-item.h"
+#include "output/table.h"
 
 /* A table item.
 
@@ -34,22 +35,13 @@
    of the accessor functions defined below. */
 struct table_item
   {
-    struct output_item output_item; /* Superclass. */
-    struct table *table;        /* The table to be rendered. */
-    char *title;                /* May be null if there is no title. */
-    char *caption;              /* May be null if there is no caption. */
-  };
-
-struct table_item *table_item_create (struct table *, const char *title,
-                                      const char *caption);
-
-const struct table *table_item_get_table (const struct table_item *);
+    struct output_item output_item;   /* Superclass. */
+    struct pivot_table *pt;           /* The table to be rendered. */
 
-const char *table_item_get_title (const struct table_item *);
-void table_item_set_title (struct table_item *, const char *);
+    char *cached_label;
+  };
 
-const char *table_item_get_caption (const struct table_item *);
-void table_item_set_caption (struct table_item *, const char *);
+struct table_item *table_item_create (struct pivot_table *);
 
 /* This boilerplate for table_item, a subclass of output_item, was
    autogenerated by mk-class-boilerplate. */
@@ -106,5 +98,5 @@ table_item_is_shared (const struct table_item *instance)
 }
 
 void table_item_submit (struct table_item *);
-
+
 #endif /* output/table-item.h */