output-item: Collapse the inheritance hierarchy into a single struct.

[pspp] / src / output / charts / barchart.h

diff --git a/src/output/charts/barchart.h b/src/output/charts/barchart.h
index a9eb5812ac5b2a265b194cadb3f1d141c5adf411..df27304c568149930637eb2cfa80b62c97c73688 100644 (file)
--- a/src/output/charts/barchart.h
+++ b/src/output/charts/barchart.h
@@ -20,7 +20,7 @@
 #include "libpspp/str.h"
 #include "libpspp/hmap.h"
 #include "data/value.h"
-#include "output/chart-item.h"
+#include "output/chart.h"
 
 
 struct category
@@ -35,7 +35,7 @@ struct category
 
 struct barchart
   {
-    struct chart_item chart_item;
+    struct chart chart;
 
     /* Should the chart be displayed as percentages */
     bool percent;
@@ -79,21 +79,21 @@ struct barchart
 struct variable;
 struct freq;
 
-struct chart_item *barchart_create (const struct variable **, int n_vars,
+struct chart *barchart_create (const struct variable **, int n_vars,
                                    const char *ylabel, bool percent,
                                     struct freq *const *, int n_cats);
 \f
-/* This boilerplate for barchart, a subclass of chart_item, was
+/* This boilerplate for barchart, a subclass of chart, was
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
 #include "libpspp/cast.h"
 
-extern const struct chart_item_class barchart_class;
+extern const struct chart_class barchart_class;
 
 /* Returns true if SUPER is a barchart, otherwise false. */
 static inline bool
-is_barchart (const struct chart_item *super)
+is_barchart (const struct chart *super)
 {
   return super->class == &barchart_class;
 }
@@ -101,24 +101,24 @@ is_barchart (const struct chart_item *super)
 /* Returns SUPER converted to barchart.  SUPER must be a barchart, as
    reported by is_barchart. */
 static inline struct barchart *
-to_barchart (const struct chart_item *super)
+to_barchart (const struct chart *super)
 {
   assert (is_barchart (super));
-  return UP_CAST (super, struct barchart, chart_item);
+  return UP_CAST (super, struct barchart, chart);
 }
 
-/* Returns INSTANCE converted to chart_item. */
-static inline struct chart_item *
+/* Returns INSTANCE converted to chart. */
+static inline struct chart *
 barchart_super (const struct barchart *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 barchart *
 barchart_ref (const struct barchart *instance)
 {
-  return to_barchart (chart_item_ref (&instance->chart_item));
+  return to_barchart (chart_ref (&instance->chart));
 }
 
 /* Decrements INSTANCE's reference count, then destroys INSTANCE if
@@ -126,7 +126,7 @@ barchart_ref (const struct barchart *instance)
 static inline void
 barchart_unref (struct barchart *instance)
 {
-  chart_item_unref (&instance->chart_item);
+  chart_unref (&instance->chart);
 }
 
 /* Returns true if INSTANCE's reference count is greater than 1,
@@ -134,13 +134,13 @@ barchart_unref (struct barchart *instance)
 static inline bool
 barchart_is_shared (const struct barchart *instance)
 {
-  return chart_item_is_shared (&instance->chart_item);
+  return chart_is_shared (&instance->chart);
 }
 
 static inline void
 barchart_submit (struct barchart *instance)
 {
-  chart_item_submit (&instance->chart_item);
+  chart_submit (&instance->chart);
 }
 \f
 #endif /* output/charts/barchart.h */