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

[pspp] / src / output / charts / scatterplot.c

diff --git a/src/output/charts/scatterplot.c b/src/output/charts/scatterplot.c
index 2c3ffd683f23c7aa1e8d70ca7c7d9e73b8194b8c..9c9c42a71ebf0fd06b22e3a451e4befc9e78ddaa 100644 (file)
--- a/src/output/charts/scatterplot.c
+++ b/src/output/charts/scatterplot.c
@@ -21,14 +21,15 @@
 #include <gsl/gsl_cdf.h>
 
 #include "data/casereader.h"
+#include "data/variable.h"
 #include "libpspp/cast.h"
-#include "output/chart-item-provider.h"
+#include "output/chart-provider.h"
 
 #include "gl/minmax.h"
 
 /* Creates a scatterplot */
 struct scatterplot_chart *
-scatterplot_create (const struct casereader *reader, 
+scatterplot_create (struct casereader *reader,
                    const char *xlabel,
                    const char *ylabel,
                    const struct variable *byvar,
@@ -39,7 +40,7 @@ scatterplot_create (const struct casereader *reader,
   struct scatterplot_chart *spc;
 
   spc = xzalloc (sizeof *spc);
-  chart_item_init (&spc->chart_item, &scatterplot_chart_class, label);
+  chart_init (&spc->chart, &scatterplot_chart_class, label);
   spc->data = reader;
 
   spc->y_min = ymin;
@@ -58,18 +59,18 @@ scatterplot_create (const struct casereader *reader,
 }
 
 static void
-scatterplot_chart_destroy (struct chart_item *chart_item)
+scatterplot_chart_destroy (struct chart *chart)
 {
-  struct scatterplot_chart *spc = to_scatterplot_chart (chart_item);
+  struct scatterplot_chart *spc = to_scatterplot_chart (chart);
   casereader_destroy (spc->data);
   free (spc->xlabel);
   free (spc->ylabel);
   if (spc->byvar)
-    var_destroy (spc->byvar);
+    var_unref (spc->byvar);
   free (spc);
 }
 
-const struct chart_item_class scatterplot_chart_class =
+const struct chart_class scatterplot_chart_class =
   {
     scatterplot_chart_destroy
   };