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]
/
src
/
ui
/
gui
/
psppire-window.c
diff --git
a/src/ui/gui/psppire-window.c
b/src/ui/gui/psppire-window.c
index 7ad2c5a384cb9e6e84c981fdf407b9d59bd2a38a..4b40f94d1e04e0a055a58703ad21d47b66adfc8a 100644
(file)
--- a/
src/ui/gui/psppire-window.c
+++ b/
src/ui/gui/psppire-window.c
@@
-32,8
+32,7
@@
#include "data/file-handle-def.h"
#include "data/dataset.h"
#include "libpspp/version.h"
#include "data/file-handle-def.h"
#include "data/dataset.h"
#include "libpspp/version.h"
-#include "output/group-item.h"
-#include "output/image-item.h"
+#include "output/output-item.h"
#include "output/pivot-table.h"
#include "output/spv/spv.h"
#include "output/spv/spv-output.h"
#include "output/pivot-table.h"
#include "output/spv/spv.h"
#include "output/spv/spv-output.h"
@@
-764,9
+763,9
@@
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 (
+
output
_item_submit (group_open_item_create (
new_path.nodes[i]->command_id,
new_path.nodes[i]->label));
new_path.nodes[i]->command_id,
new_path.nodes[i]->label));
@@
-802,8
+801,8
@@
read_spv_file (const char *filename)
else if (items[i]->type == SPV_ITEM_IMAGE)
{
cairo_surface_t *image = spv_item_get_image (items[i]);
else if (items[i]->type == SPV_ITEM_IMAGE)
{
cairo_surface_t *image = spv_item_get_image (items[i]);
-
image
_item_submit (image_item_create (cairo_surface_reference (
- image)));
+
output
_item_submit (image_item_create (cairo_surface_reference (
+
image)));
}
prev_heading = heading;
}
}
prev_heading = heading;
}