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

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

diff --git a/src/output/charts/scree.c b/src/output/charts/scree.c
index ffa77568bd975a4c537beef1541d4169cb0cb701..049087a47cb01dd9419dec2847f131f368dc6745 100644 (file)
--- a/src/output/charts/scree.c
+++ b/src/output/charts/scree.c
@@ -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
@@ -16,9 +16,9 @@
 
 #include <config.h>
 
-#include <output/charts/scree.h>
+#include "output/charts/scree.h"
 
-#include <output/chart-item-provider.h>
+#include "output/chart-provider.h"
 
 #include "gl/xalloc.h"
 
@@ -29,7 +29,7 @@ struct scree *
 scree_create (const gsl_vector *eigenvalues, const char *xlabel)
 {
   struct scree *rc = xmalloc (sizeof *rc);
-  chart_item_init (&rc->chart_item, &scree_class, NULL);
+  chart_init (&rc->chart, &scree_class, NULL);
 
   rc->eval = gsl_vector_alloc (eigenvalues->size);
   gsl_vector_memcpy (rc->eval, eigenvalues);
@@ -40,16 +40,16 @@ scree_create (const gsl_vector *eigenvalues, const char *xlabel)
 }
 
 static void
-scree_destroy (struct chart_item *chart_item)
+scree_destroy (struct chart *chart)
 {
-  struct scree *rc = to_scree (chart_item);
+  struct scree *rc = to_scree (chart);
 
   gsl_vector_free (rc->eval);
   free (rc->xlabel);
   free (rc);
 }
 
-const struct chart_item_class scree_class =
+const struct chart_class scree_class =
   {
     scree_destroy
   };