projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output-item: Collapse the inheritance hierarchy into a single struct.
[pspp]
/
utilities
/
pspp-output.c
diff --git
a/utilities/pspp-output.c
b/utilities/pspp-output.c
index 5332f2f1a52e46e18d21fdf4da18030bf7ee72ad..971d86b8c9fad36e01e54e5c342b1db77a136886 100644
(file)
--- a/
utilities/pspp-output.c
+++ b/
utilities/pspp-output.c
@@
-31,9
+31,7
@@
#include "libpspp/string-map.h"
#include "libpspp/string-set.h"
#include "output/driver.h"
#include "libpspp/string-map.h"
#include "libpspp/string-set.h"
#include "output/driver.h"
-#include "output/group-item.h"
-#include "output/image-item.h"
-#include "output/page-setup-item.h"
+#include "output/output-item.h"
#include "output/pivot-table.h"
#include "output/spv/light-binary-parser.h"
#include "output/spv/spv-legacy-data.h"
#include "output/pivot-table.h"
#include "output/spv/light-binary-parser.h"
#include "output/spv/spv-legacy-data.h"
@@
-42,8
+40,6
@@
#include "output/spv/spv-select.h"
#include "output/spv/spv-table-look.h"
#include "output/spv/spv.h"
#include "output/spv/spv-select.h"
#include "output/spv/spv-table-look.h"
#include "output/spv/spv.h"
-#include "output/table-item.h"
-#include "output/text-item.h"
#include "gl/c-ctype.h"
#include "gl/error.h"
#include "gl/c-ctype.h"
#include "gl/error.h"
@@
-112,8
+108,8
@@
dump_item (const struct spv_item *item)
char *s = (x && b
? xasprintf ("%s and %s:", x, b)
: xasprintf ("%s:", x ? x : b));
char *s = (x && b
? xasprintf ("%s and %s:", x, b)
: xasprintf ("%s:", x ? x : b));
-
tex
t_item_submit (text_item_create_nocopy (TEXT_ITEM_TITLE, s,
- xstrdup ("Member Names")));
+
outpu
t_item_submit (text_item_create_nocopy (TEXT_ITEM_TITLE, s,
+
xstrdup ("Member Names")));
}
switch (spv_item_get_type (item))
}
switch (spv_item_get_type (item))
@@
-136,8
+132,8
@@
dump_item (const struct spv_item *item)
break;
case SPV_ITEM_IMAGE:
break;
case SPV_ITEM_IMAGE:
-
image
_item_submit (image_item_create (cairo_surface_reference (
- spv_item_get_image (item))));
+
output
_item_submit (image_item_create (cairo_surface_reference (
+
spv_item_get_image (item))));
break;
case SPV_ITEM_TREE:
break;
case SPV_ITEM_TREE:
@@
-288,11
+284,11
@@
dump_heading_transition (const struct spv_item *old,
break;
for (size_t i = common; i < old_path.n; i++)
break;
for (size_t i = common; i < old_path.n; i++)
-
group_close
_item_submit (group_close_item_create ());
+
output
_item_submit (group_close_item_create ());
for (size_t i = common; i < new_path.n; i++)
for (size_t i = common; i < new_path.n; i++)
-
group_open
_item_submit (group_open_item_create (
-
new_path.nodes[i]->command_id,
-
new_path.nodes[i]->label));
+
output
_item_submit (group_open_item_create (
+ new_path.nodes[i]->command_id,
+ new_path.nodes[i]->label));
free_path (&old_path);
free_path (&new_path);
free_path (&old_path);
free_path (&new_path);
@@
-319,7
+315,7
@@
run_convert (int argc UNUSED, char **argv)
const struct page_setup *ps = spv_get_page_setup (spv);
if (ps)
const struct page_setup *ps = spv_get_page_setup (spv);
if (ps)
-
page_setup
_item_submit (page_setup_item_create (ps));
+
output
_item_submit (page_setup_item_create (ps));
struct spv_item **items;
size_t n_items;
struct spv_item **items;
size_t n_items;