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

[pspp] / src / output / charts / spreadlevel-plot.h

diff --git a/src/output/charts/spreadlevel-plot.h b/src/output/charts/spreadlevel-plot.h
index 550ccb9893a1719542e641684098cf8dcb189408..b0029f6a847c7a92479ed86d93c7fb3070ddfbc6 100644 (file)
--- a/src/output/charts/spreadlevel-plot.h
+++ b/src/output/charts/spreadlevel-plot.h
@@ -17,9 +17,10 @@
 #ifndef OUTPUT_CHARTS_SL_PLOT_H
 #define OUTPUT_CHARTS_SL_PLOT_H 1
 
-#include "output/chart-item.h"
+#include "output/chart.h"
+#include <stddef.h>
 
-struct datum 
+struct datum
 {
   double x;
   double y;
@@ -27,7 +28,7 @@ struct datum
 
 struct spreadlevel_plot_chart
   {
-    struct chart_item chart_item;
+    struct chart chart;
 
     /* Calculated parameters */
     double y_lower, y_upper;
@@ -39,23 +40,23 @@ struct spreadlevel_plot_chart
     struct datum *data;
   };
 
-struct chart_item *spreadlevel_plot_create (const char *label, double slp);
+struct chart *spreadlevel_plot_create (const char *label, double slp);
 
-void spreadlevel_plot_add (struct chart_item *, double spread, double level);
+void spreadlevel_plot_add (struct chart *, double spread, double level);
 
 
 \f
-/* This boilerplate for spreadlevel_plot_chart, a subclass of chart_item, was
+/* This boilerplate for spreadlevel_plot_chart, a subclass of chart, was
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
 #include "libpspp/cast.h"
 
-extern const struct chart_item_class spreadlevel_plot_chart_class;
+extern const struct chart_class spreadlevel_plot_chart_class;
 
 /* Returns true if SUPER is a spreadlevel_plot_chart, otherwise false. */
 static inline bool
-is_spreadlevel_plot_chart (const struct chart_item *super)
+is_spreadlevel_plot_chart (const struct chart *super)
 {
   return super->class == &spreadlevel_plot_chart_class;
 }
@@ -63,24 +64,24 @@ is_spreadlevel_plot_chart (const struct chart_item *super)
 /* Returns SUPER converted to spreadlevel_plot_chart.  SUPER must be a spreadlevel_plot_chart, as
    reported by is_spreadlevel_plot_chart. */
 static inline struct spreadlevel_plot_chart *
-to_spreadlevel_plot_chart (const struct chart_item *super)
+to_spreadlevel_plot_chart (const struct chart *super)
 {
   assert (is_spreadlevel_plot_chart (super));
-  return UP_CAST (super, struct spreadlevel_plot_chart, chart_item);
+  return UP_CAST (super, struct spreadlevel_plot_chart, chart);
 }
 
-/* Returns INSTANCE converted to chart_item. */
-static inline struct chart_item *
+/* Returns INSTANCE converted to chart. */
+static inline struct chart *
 spreadlevel_plot_chart_super (const struct spreadlevel_plot_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 spreadlevel_plot_chart *
 spreadlevel_plot_chart_ref (const struct spreadlevel_plot_chart *instance)
 {
-  return to_spreadlevel_plot_chart (chart_item_ref (&instance->chart_item));
+  return to_spreadlevel_plot_chart (chart_ref (&instance->chart));
 }
 
 /* Decrements INSTANCE's reference count, then destroys INSTANCE if
@@ -88,7 +89,7 @@ spreadlevel_plot_chart_ref (const struct spreadlevel_plot_chart *instance)
 static inline void
 spreadlevel_plot_chart_unref (struct spreadlevel_plot_chart *instance)
 {
-  chart_item_unref (&instance->chart_item);
+  chart_unref (&instance->chart);
 }
 
 /* Returns true if INSTANCE's reference count is greater than 1,
@@ -96,13 +97,13 @@ spreadlevel_plot_chart_unref (struct spreadlevel_plot_chart *instance)
 static inline bool
 spreadlevel_plot_chart_is_shared (const struct spreadlevel_plot_chart *instance)
 {
-  return chart_item_is_shared (&instance->chart_item);
+  return chart_is_shared (&instance->chart);
 }
 
 static inline void
 spreadlevel_plot_chart_submit (struct spreadlevel_plot_chart *instance)
 {
-  chart_item_submit (&instance->chart_item);
+  chart_submit (&instance->chart);
 }
 \f
-#endif 
+#endif