Rewrite NRArenaItem hierarchy into C++

(bzr r10347.1.21)

7 files changed, 14 insertions, 19 deletions

diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp
index f741c9f39..4b551e730 100644
--- a/src/extension/internal/cairo-png-out.cpp
+++ b/src/extension/internal/cairo-png-out.cpp
@@ -28,7 +28,6 @@
 #include "extension/db.h"
 #include "extension/output.h"
 #include "display/nr-arena.h"
-#include "display/nr-arena-item.h"
 
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
@@ -61,7 +60,7 @@ png_render_document_to_file(SPDocument *doc, gchar const *filename)
     SPItem *base = doc->getRoot();
     NRArena *arena = NRArena::create();
     unsigned dkey = SPItem::display_key_new(1);
-    NRArenaItem *root = base->invoke_show(arena, dkey, SP_ITEM_SHOW_DISPLAY);
+    base->invoke_show(arena, dkey, SP_ITEM_SHOW_DISPLAY);
     
     /* Create renderer and context */
     renderer = new CairoRenderer();
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 7fdfaf8df..7e5324e57 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -30,7 +30,6 @@
 #include "extension/db.h"
 #include "extension/output.h"
 #include "display/nr-arena.h"
-#include "display/nr-arena-item.h"
 
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 22b68b0ca..c7cba09bb 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -33,8 +33,7 @@
 
 #include <glibmm/i18n.h>
 #include "display/nr-arena.h"
-#include "display/nr-arena-item.h"
-#include "display/nr-arena-group.h"
+#include "display/display-forward.h"
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
@@ -91,14 +90,14 @@
 struct SPClipPathView {
     SPClipPathView *next;
     unsigned int key;
-    NRArenaItem *arenaitem;
+    Inkscape::DrawingItem *arenaitem;
     NRRect bbox;
 };
 
 struct SPMaskView {
     SPMaskView *next;
     unsigned int key;
-    NRArenaItem *arenaitem;
+    Inkscape::DrawingItem *arenaitem;
     NRRect bbox;
 };
 
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 5d7c82bff..5be9e15c3 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -30,7 +30,6 @@
 #include "extension/db.h"
 #include "extension/output.h"
 #include "display/nr-arena.h"
-#include "display/nr-arena-item.h"
 
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 7eb7881dc..76fc5073f 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -37,8 +37,7 @@
 
 #include <glibmm/i18n.h>
 #include "display/nr-arena.h"
-#include "display/nr-arena-item.h"
-#include "display/nr-arena-group.h"
+#include "display/display-forward.h"
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
@@ -88,14 +87,14 @@
 struct SPClipPathView {
     SPClipPathView *next;
     unsigned int key;
-    NRArenaItem *arenaitem;
+    Inkscape::DrawingItem *arenaitem;
     NRRect bbox;
 };
 
 struct SPMaskView {
     SPMaskView *next;
     unsigned int key;
-    NRArenaItem *arenaitem;
+    Inkscape::DrawingItem *arenaitem;
     NRRect bbox;
 };
 
diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp
index 376db7ee3..000280158 100644
--- a/src/extension/internal/latex-pstricks-out.cpp
+++ b/src/extension/internal/latex-pstricks-out.cpp
@@ -19,7 +19,7 @@
 #include "extension/print.h"
 #include "extension/db.h"
 #include "display/nr-arena.h"
-#include "display/nr-arena-item.h"
+#include "display/display-forward.h"
 #include "sp-root.h"
 
 
@@ -73,7 +73,7 @@ void LatexOutput::save(Inkscape::Extension::Output * /*mod2*/, SPDocument *doc,
     /* Release arena */
     (mod->base)->invoke_hide (mod->dkey);
     mod->base = NULL;
-    mod->root = NULL;
+    mod->root = NULL; // should have been deleted by invoke_hide
     nr_object_unref ((NRObject *) mod->arena);
     mod->arena = NULL;
     /* end */
diff --git a/src/extension/print.h b/src/extension/print.h
index d5218aed8..b3c686d26 100644
--- a/src/extension/print.h
+++ b/src/extension/print.h
@@ -13,7 +13,7 @@
 
 #include "extension.h"
 
-#include "display/nr-arena-forward.h"
+#include "display/display-forward.h"
 #include "forward.h"
 #include "sp-item.h"
 namespace Inkscape {
@@ -22,10 +22,10 @@ namespace Extension {
 class Print : public Extension {
 
 public: /* TODO: These are public for the short term, but this should be fixed */
-    SPItem *base;            /**< TODO: Document these */
-    NRArena *arena;          /**< TODO: Document these */
-    NRArenaItem *root;       /**< TODO: Document these */
-    unsigned int dkey;       /**< TODO: Document these */
+    SPItem *base;
+    NRArena *arena;
+    Inkscape::DrawingItem *root;
+    unsigned int dkey;
 
 public:
                   Print       (Inkscape::XML::Node * in_repr,