X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcharts%2Froc-chart.h;h=583bb7cfe9aa0c602a4c29451a09a91c6a0245ec;hb=2bf186a3ffb77c2706223d24bad200cb3148cc8a;hp=309ac38e987a432c67454b0e6c2996b9cd725a54;hpb=81579d9e9f994fb2908f50af41c3eb033d216e58;p=pspp

diff --git a/src/output/charts/roc-chart.h b/src/output/charts/roc-chart.h
index 309ac38e98..583bb7cfe9 100644
--- a/src/output/charts/roc-chart.h
+++ b/src/output/charts/roc-chart.h
@@ -19,11 +19,11 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include "output/chart-item.h"
+#include "output/chart.h"
 
 struct roc_chart
   {
-    struct chart_item chart_item;
+    struct chart chart;
     bool reference;
     struct roc_var *vars;
     size_t n_vars;
@@ -40,17 +40,17 @@ struct roc_chart *roc_chart_create (bool reference);
 void roc_chart_add_var (struct roc_chart *, const char *var_name,
                         const struct casereader *cutpoint_reader);
 
-/* This boilerplate for roc_chart, a subclass of chart_item, was
+/* This boilerplate for roc_chart, a subclass of chart, was
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
 #include "libpspp/cast.h"
 
-extern const struct chart_item_class roc_chart_class;
+extern const struct chart_class roc_chart_class;
 
 /* Returns true if SUPER is a roc_chart, otherwise false. */
 static inline bool
-is_roc_chart (const struct chart_item *super)
+is_roc_chart (const struct chart *super)
 {
   return super->class == &roc_chart_class;
 }
@@ -58,24 +58,24 @@ is_roc_chart (const struct chart_item *super)
 /* Returns SUPER converted to roc_chart.  SUPER must be a roc_chart, as
    reported by is_roc_chart. */
 static inline struct roc_chart *
-to_roc_chart (const struct chart_item *super)
+to_roc_chart (const struct chart *super)
 {
   assert (is_roc_chart (super));
-  return UP_CAST (super, struct roc_chart, chart_item);
+  return UP_CAST (super, struct roc_chart, chart);
 }
 
-/* Returns INSTANCE converted to chart_item. */
-static inline struct chart_item *
+/* Returns INSTANCE converted to chart. */
+static inline struct chart *
 roc_chart_super (const struct roc_chart *instance)
 {
-  return CONST_CAST (struct chart_item *, &instance->chart_item);
+  return CONST_CAST (struct chart *, &instance->chart);
 }
 
 /* Increments INSTANCE's reference count and returns INSTANCE. */
 static inline struct roc_chart *
 roc_chart_ref (const struct roc_chart *instance)
 {
-  return to_roc_chart (chart_item_ref (&instance->chart_item));
+  return to_roc_chart (chart_ref (&instance->chart));
 }
 
 /* Decrements INSTANCE's reference count, then destroys INSTANCE if
@@ -83,7 +83,7 @@ roc_chart_ref (const struct roc_chart *instance)
 static inline void
 roc_chart_unref (struct roc_chart *instance)
 {
-  chart_item_unref (&instance->chart_item);
+  chart_unref (&instance->chart);
 }
 
 /* Returns true if INSTANCE's reference count is greater than 1,
@@ -91,13 +91,13 @@ roc_chart_unref (struct roc_chart *instance)
 static inline bool
 roc_chart_is_shared (const struct roc_chart *instance)
 {
-  return chart_item_is_shared (&instance->chart_item);
+  return chart_is_shared (&instance->chart);
 }
 
 static inline void
 roc_chart_submit (struct roc_chart *instance)
 {
-  chart_item_submit (&instance->chart_item);
+  chart_submit (&instance->chart);
 }
 
 #endif /* output/charts/roc-chart.h */