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

[pspp] / src / output / charts / barchart-cairo.c

diff --git a/src/output/charts/barchart-cairo.c b/src/output/charts/barchart-cairo.c
index 00b33fc6b0f182b5fa7f92b6dd97c3e0d5f6af5a..4663471e566e9c81b22ac0fb9d3bc3435d4e5a39 100644 (file)
--- a/src/output/charts/barchart-cairo.c
+++ b/src/output/charts/barchart-cairo.c
@@ -56,16 +56,16 @@ abscissa_label (const struct barchart *bc, cairo_t *cr,
 
 
 void
-xrchart_draw_barchart (const struct chart_item *chart_item, cairo_t *cr,
+xrchart_draw_barchart (const struct chart *chart, cairo_t *cr,
                        struct xrchart_geometry *geom)
 {
-  struct barchart *bc = to_barchart (chart_item);
+  struct barchart *bc = to_barchart (chart);
   int i;
 
   xrchart_write_title (cr, geom, _("Bar Chart"));
 
   xrchart_write_ylabel (cr, geom, bc->ylabel);
-  xrchart_write_xlabel (cr, geom, chart_item_get_title (chart_item));
+  xrchart_write_xlabel (cr, geom, chart_get_title (chart));
 
   if (! xrchart_write_yscale (cr, geom, 0,
                               bc->percent ? bc->largest * 100.0 / bc->total_count : bc->largest))