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

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

diff --git a/src/output/charts/scree.h b/src/output/charts/scree.h
index 43f5b822482c066bbf7b7364ce301f4fdd3e02a2..3475ad17ffbea402b8839e1c5f6b709e568a68a9 100644 (file)
--- a/src/output/charts/scree.h
+++ b/src/output/charts/scree.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,12 +18,12 @@
 #define OUTPUT_CHARTS_SCREE_H 1
 
 #include <gsl/gsl_vector.h>
-#include <output/chart-item.h>
+#include "output/chart.h"
 
 /* A scree plot. */
 struct scree
   {
-    struct chart_item chart_item;
+    struct chart chart;
     gsl_vector *eval;
     char *xlabel;
   };
@@ -34,17 +34,17 @@ struct scree *scree_create (const gsl_vector *eigenvalues, const char *label);
 /* Return the chart underlying SCREE */
 struct chart *scree_get_chart (struct scree *scree);
 \f
-/* This boilerplate for scree, a subclass of chart_item, was
+/* This boilerplate for scree, a subclass of chart, was
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
-extern const struct chart_item_class scree_class;
+extern const struct chart_class scree_class;
 
 /* Returns true if SUPER is a scree, otherwise false. */
 static inline bool
-is_scree (const struct chart_item *super)
+is_scree (const struct chart *super)
 {
   return super->class == &scree_class;
 }
@@ -52,24 +52,24 @@ is_scree (const struct chart_item *super)
 /* Returns SUPER converted to scree.  SUPER must be a scree, as
    reported by is_scree. */
 static inline struct scree *
-to_scree (const struct chart_item *super)
+to_scree (const struct chart *super)
 {
   assert (is_scree (super));
-  return UP_CAST (super, struct scree, chart_item);
+  return UP_CAST (super, struct scree, chart);
 }
 
-/* Returns INSTANCE converted to chart_item. */
-static inline struct chart_item *
+/* Returns INSTANCE converted to chart. */
+static inline struct chart *
 scree_super (const struct scree *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 scree *
 scree_ref (const struct scree *instance)
 {
-  return to_scree (chart_item_ref (&instance->chart_item));
+  return to_scree (chart_ref (&instance->chart));
 }
 
 /* Decrements INSTANCE's reference count, then destroys INSTANCE if
@@ -77,7 +77,7 @@ scree_ref (const struct scree *instance)
 static inline void
 scree_unref (struct scree *instance)
 {
-  chart_item_unref (&instance->chart_item);
+  chart_unref (&instance->chart);
 }
 
 /* Returns true if INSTANCE's reference count is greater than 1,
@@ -85,13 +85,13 @@ scree_unref (struct scree *instance)
 static inline bool
 scree_is_shared (const struct scree *instance)
 {
-  return chart_item_is_shared (&instance->chart_item);
+  return chart_is_shared (&instance->chart);
 }
 
 static inline void
 scree_submit (struct scree *instance)
 {
-  chart_item_submit (&instance->chart_item);
+  chart_submit (&instance->chart);
 }
 \f
 #endif /* output/charts/scree.h */