Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily.

(bzr r8422)

41 files changed, 78 insertions, 78 deletions

diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index 75d53927d..e907612fd 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -221,7 +221,7 @@ ImageMagick::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::Vi
 Gtk::Widget *
 ImageMagick::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * /*docCache*/)
 {
-    Document * current_document = view->doc();
+    SPDocument * current_document = view->doc();
 
     using Inkscape::Util::GSListConstIterator;
     GSListConstIterator<SPItem *> selected = sp_desktop_selection((SPDesktop *)view)->itemList();
diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp
index d849755b7..c81fdd029 100644
--- a/src/extension/internal/cairo-png-out.cpp
+++ b/src/extension/internal/cairo-png-out.cpp
@@ -48,7 +48,7 @@ CairoRendererOutput::check (Inkscape::Extension::Extension * module)
 }
 
 static bool
-png_render_document_to_file(Document *doc, gchar const *filename)
+png_render_document_to_file(SPDocument *doc, gchar const *filename)
 {
     CairoRenderer *renderer;
     CairoRenderContext *ctx;
@@ -92,7 +92,7 @@ png_render_document_to_file(Document *doc, gchar const *filename)
     \param  uri   Filename to save to (probably will end in .png)
 */
 void
-CairoRendererOutput::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
+CairoRendererOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
 {
     if (!png_render_document_to_file(doc, filename))
         throw Inkscape::Extension::Output::save_failed();
diff --git a/src/extension/internal/cairo-png-out.h b/src/extension/internal/cairo-png-out.h
index a062ec8df..9b9bd6ffe 100644
--- a/src/extension/internal/cairo-png-out.h
+++ b/src/extension/internal/cairo-png-out.h
@@ -27,7 +27,7 @@ class CairoRendererOutput : Inkscape::Extension::Implementation::Implementation
 public:
     bool check(Inkscape::Extension::Extension *module);
     void save(Inkscape::Extension::Output *mod,
-              Document *doc,
+              SPDocument *doc,
               gchar const *filename);
     static void init();
 };
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index d9cac666c..dff89c1ed 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -61,7 +61,7 @@ CairoEpsOutput::check (Inkscape::Extension::Extension * module)
 }
 
 static bool
-ps_print_document_to_file(Document *doc, gchar const *filename, unsigned int level, bool texttopath, bool filtertobitmap, int resolution, const gchar * const exportId, bool exportDrawing, bool exportCanvas, bool eps = false)
+ps_print_document_to_file(SPDocument *doc, gchar const *filename, unsigned int level, bool texttopath, bool filtertobitmap, int resolution, const gchar * const exportId, bool exportDrawing, bool exportCanvas, bool eps = false)
 {
     sp_document_ensure_up_to_date(doc);
 
@@ -124,7 +124,7 @@ ps_print_document_to_file(Document *doc, gchar const *filename, unsigned int lev
     \param  filename   Filename to save to (probably will end in .ps)
 */
 void
-CairoPsOutput::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
+CairoPsOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
 {
     Inkscape::Extension::Extension * ext;
     unsigned int ret;
@@ -188,7 +188,7 @@ CairoPsOutput::save(Inkscape::Extension::Output *mod, Document *doc, gchar const
     \param  filename   Filename to save to (probably will end in .ps)
 */
 void
-CairoEpsOutput::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
+CairoEpsOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
 {
     Inkscape::Extension::Extension * ext;
     unsigned int ret;
diff --git a/src/extension/internal/cairo-ps-out.h b/src/extension/internal/cairo-ps-out.h
index 862571f0b..019b6b810 100644
--- a/src/extension/internal/cairo-ps-out.h
+++ b/src/extension/internal/cairo-ps-out.h
@@ -28,7 +28,7 @@ class CairoPsOutput : Inkscape::Extension::Implementation::Implementation {
 public:
     bool check(Inkscape::Extension::Extension *module);
     void save(Inkscape::Extension::Output *mod,
-              Document *doc,
+              SPDocument *doc,
               gchar const *filename);
     static void init();
     bool textToPath(Inkscape::Extension::Print *ext);
@@ -40,7 +40,7 @@ class CairoEpsOutput : Inkscape::Extension::Implementation::Implementation {
 public:
     bool check(Inkscape::Extension::Extension *module);
     void save(Inkscape::Extension::Output *mod,
-              Document *doc,
+              SPDocument *doc,
               gchar const *uri);
     static void init();
     bool textToPath(Inkscape::Extension::Print *ext);
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 28cf406f2..d1462e52e 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -811,7 +811,7 @@ CairoRenderContext::_finishSurfaceSetup(cairo_surface_t *surface, cairo_matrix_t
         cairo_scale(_cr, PT_PER_PX, PT_PER_PX);
     } else if (cairo_surface_get_content(_surface) != CAIRO_CONTENT_ALPHA) {
         // set background color on non-alpha surfaces
-        // TODO: bgcolor should be derived from Document
+        // TODO: bgcolor should be derived from SPDocument
         cairo_set_source_rgb(_cr, 1.0, 1.0, 1.0);
         cairo_rectangle(_cr, 0, 0, _width, _height);
         cairo_fill(_cr);
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 1e5404c50..b44e83449 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -47,7 +47,7 @@ CairoRendererPdfOutput::check (Inkscape::Extension::Extension * module)
 }
 
 static bool
-pdf_render_document_to_file(Document *doc, gchar const *filename, unsigned int level,
+pdf_render_document_to_file(SPDocument *doc, gchar const *filename, unsigned int level,
                             bool texttopath, bool filtertobitmap, int resolution,
                             const gchar * const exportId, bool exportDrawing, bool exportCanvas)
 {
@@ -118,7 +118,7 @@ pdf_render_document_to_file(Document *doc, gchar const *filename, unsigned int l
     tell the printing system to save to file.
 */
 void
-CairoRendererPdfOutput::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
+CairoRendererPdfOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
 {
     Inkscape::Extension::Extension * ext;
     unsigned int ret;
diff --git a/src/extension/internal/cairo-renderer-pdf-out.h b/src/extension/internal/cairo-renderer-pdf-out.h
index f916eed49..d76ffb4d4 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.h
+++ b/src/extension/internal/cairo-renderer-pdf-out.h
@@ -27,7 +27,7 @@ class CairoRendererPdfOutput : Inkscape::Extension::Implementation::Implementati
 public:
     bool check(Inkscape::Extension::Extension *module);
     void save(Inkscape::Extension::Output *mod,
-              Document *doc,
+              SPDocument *doc,
               gchar const *filename);
     static void init();
 };
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 3414993e5..da88a5eae 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -460,7 +460,7 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx)
     Geom::Matrix t = t_on_document * t_item.inverse();
 
     // Do the export
-    Document *document = SP_OBJECT(item)->document;
+    SPDocument *document = SP_OBJECT(item)->document;
     GSList *items = NULL;
     items = g_slist_append(items, item);
 
@@ -567,7 +567,7 @@ CairoRenderer::renderItem(CairoRenderContext *ctx, SPItem *item)
 }
 
 bool
-CairoRenderer::setupDocument(CairoRenderContext *ctx, Document *doc, bool pageBoundingBox, SPItem *base)
+CairoRenderer::setupDocument(CairoRenderContext *ctx, SPDocument *doc, bool pageBoundingBox, SPItem *base)
 {
     g_assert( ctx != NULL );
 
diff --git a/src/extension/internal/cairo-renderer.h b/src/extension/internal/cairo-renderer.h
index 4197c6784..ab5d4cf58 100644
--- a/src/extension/internal/cairo-renderer.h
+++ b/src/extension/internal/cairo-renderer.h
@@ -50,9 +50,9 @@ public:
     void applyMask(CairoRenderContext *ctx, SPMask const *mask);
 
     /** Initializes the CairoRenderContext according to the specified
-    Document. A set*Target function can only be called on the context
+    SPDocument. A set*Target function can only be called on the context
     before setupDocument. */
-    bool setupDocument(CairoRenderContext *ctx, Document *doc, bool pageBoundingBox, SPItem *base);
+    bool setupDocument(CairoRenderContext *ctx, SPDocument *doc, bool pageBoundingBox, SPItem *base);
 
     /** Traverses the object tree and invokes the render methods. */
     void renderItem(CairoRenderContext *ctx, SPItem *item);
diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp
index ffba5af81..f400a3649 100644
--- a/src/extension/internal/emf-win32-inout.cpp
+++ b/src/extension/internal/emf-win32-inout.cpp
@@ -101,7 +101,7 @@ EmfWin32::check (Inkscape::Extension::Extension * /*module*/)
 
 
 static void
-emf_print_document_to_file(Document *doc, gchar const *filename)
+emf_print_document_to_file(SPDocument *doc, gchar const *filename)
 {
     Inkscape::Extension::Print *mod;
     SPPrintContext context;
@@ -147,7 +147,7 @@ emf_print_document_to_file(Document *doc, gchar const *filename)
 
 
 void
-EmfWin32::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
+EmfWin32::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
 {
     Inkscape::Extension::Extension * ext;
 
@@ -2162,7 +2162,7 @@ typedef struct
 #pragma pack( pop )
 
 
-Document *
+SPDocument *
 EmfWin32::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri )
 {
     EMF_CALLBACK_DATA d;
@@ -2365,7 +2365,7 @@ EmfWin32::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri )
 
 //    std::cout << "SVG Output: " << std::endl << *(d.outsvg) << std::endl;
 
-    Document *doc = sp_document_new_from_mem(d.outsvg->c_str(), d.outsvg->length(), TRUE);
+    SPDocument *doc = sp_document_new_from_mem(d.outsvg->c_str(), d.outsvg->length(), TRUE);
 
     delete d.outsvg;
     delete d.path;
diff --git a/src/extension/internal/emf-win32-inout.h b/src/extension/internal/emf-win32-inout.h
index 544cd75db..c62d7a4e9 100644
--- a/src/extension/internal/emf-win32-inout.h
+++ b/src/extension/internal/emf-win32-inout.h
@@ -28,10 +28,10 @@ public:
     bool check(Inkscape::Extension::Extension *module); //Can this module load (always yes for now)
 
     void save(Inkscape::Extension::Output *mod, // Save the given document to the given filename
-              Document *doc,
+              SPDocument *doc,
               gchar const *filename);
 
-    virtual Document *open( Inkscape::Extension::Input *mod,
+    virtual SPDocument *open( Inkscape::Extension::Input *mod,
                                 const gchar *uri );
 
     static void init(void);//Initialize the class
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp
index 822a0577b..d098f6466 100644
--- a/src/extension/internal/emf-win32-print.cpp
+++ b/src/extension/internal/emf-win32-print.cpp
@@ -116,7 +116,7 @@ PrintEmfWin32::setup (Inkscape::Extension::Print * /*mod*/)
 
 
 unsigned int
-PrintEmfWin32::begin (Inkscape::Extension::Print *mod, Document *doc)
+PrintEmfWin32::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
 {
     gchar const *utf8_fn = mod->get_param_string("destination");
 
diff --git a/src/extension/internal/emf-win32-print.h b/src/extension/internal/emf-win32-print.h
index bec3f9582..5c1d8439d 100644
--- a/src/extension/internal/emf-win32-print.h
+++ b/src/extension/internal/emf-win32-print.h
@@ -55,7 +55,7 @@ public:
     /* Print functions */
     virtual unsigned int setup (Inkscape::Extension::Print * module);
 
-    virtual unsigned int begin (Inkscape::Extension::Print * module, Document *doc);
+    virtual unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc);
     virtual unsigned int finish (Inkscape::Extension::Print * module);
 
     /* Rendering methods */
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index 2aea1cc64..64a099c8a 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -16,10 +16,10 @@ GdkPixbuf* pixbuf_new_from_file( char const *utf8name, GError **error );
 namespace Extension {
 namespace Internal {
 
-Document *
+SPDocument *
 GdkpixbufInput::open(Inkscape::Extension::Input */*mod*/, char const *uri)
 {
-    Document *doc = NULL;
+    SPDocument *doc = NULL;
     GdkPixbuf *pb = Inkscape::IO::pixbuf_new_from_file( uri, NULL );
 
     if (pb) {         /* We are readable */
diff --git a/src/extension/internal/gdkpixbuf-input.h b/src/extension/internal/gdkpixbuf-input.h
index 373d53da3..9d5e6ccf7 100644
--- a/src/extension/internal/gdkpixbuf-input.h
+++ b/src/extension/internal/gdkpixbuf-input.h
@@ -9,7 +9,7 @@ namespace Internal {
 
 class GdkpixbufInput : Inkscape::Extension::Implementation::Implementation {
 public:
-    Document *open(Inkscape::Extension::Input *mod,
+    SPDocument *open(Inkscape::Extension::Input *mod,
                      gchar const *uri);
     static void init();
 };
diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp
index 9510b5ebd..5b3e0c16e 100644
--- a/src/extension/internal/gimpgrad.cpp
+++ b/src/extension/internal/gimpgrad.cpp
@@ -95,7 +95,7 @@ stop_svg(ColorRGBA const in_color, double const location)
 }
 
 /**
-    \brief  Actually open the gradient and turn it into an Document
+    \brief  Actually open the gradient and turn it into an SPDocument
     \param  module    The input module being used
     \param  filename  The filename of the gradient to be opened
     \return A Document with the gradient in it.
@@ -129,7 +129,7 @@ stop_svg(ColorRGBA const in_color, double const location)
     document using the \c sp_document_from_mem.  That is then returned
     to Inkscape.
 */
-Document *
+SPDocument *
 GimpGrad::open (Inkscape::Extension::Input */*module*/, gchar const *filename)
 {
     Inkscape::IO::dump_fopen_call(filename, "I");
diff --git a/src/extension/internal/gimpgrad.h b/src/extension/internal/gimpgrad.h
index 21ccfa215..45b76dd6d 100644
--- a/src/extension/internal/gimpgrad.h
+++ b/src/extension/internal/gimpgrad.h
@@ -26,7 +26,7 @@ class GimpGrad : public Inkscape::Extension::Implementation::Implementation {
 public:
     bool load(Inkscape::Extension::Extension *module);
     void unload(Inkscape::Extension::Extension *module);
-    Document *open(Inkscape::Extension::Input *module, gchar const *filename);
+    SPDocument *open(Inkscape::Extension::Input *module, gchar const *filename);
 
     static void init();
 };
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index 5a0523ba8..d4b35b261 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -81,7 +81,7 @@ Grid::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc
     Geom::Rect bounding_area = Geom::Rect(Geom::Point(0,0), Geom::Point(100,100));
     if (selection->isEmpty()) {
         /* get page size */
-        Document * doc = document->doc();
+        SPDocument * doc = document->doc();
         bounding_area = Geom::Rect(  Geom::Point(0,0),
                                      Geom::Point(sp_document_width(doc), sp_document_height(doc))  );
     } else {
@@ -171,7 +171,7 @@ PrefAdjustment::val_changed (void)
 Gtk::Widget *
 Grid::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * /*docCache*/)
 {
-    Document * current_document = view->doc();
+    SPDocument * current_document = view->doc();
 
     using Inkscape::Util::GSListConstIterator;
     GSListConstIterator<SPItem *> selected = sp_desktop_selection((SPDesktop *)view)->itemList();
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index c1f057071..417755e19 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -701,7 +701,7 @@ bool JavaFXOutput::doCurve(SPItem *item, const String &id)
 /**
  *  Output the tree data to buffer
  */
-bool JavaFXOutput::doTreeRecursive(Document *doc, SPObject *obj)
+bool JavaFXOutput::doTreeRecursive(SPDocument *doc, SPObject *obj)
 {
     /**
      * Check the type of node and process
@@ -749,7 +749,7 @@ bool JavaFXOutput::doTreeRecursive(Document *doc, SPObject *obj)
 /**
  *  Output the curve data to buffer
  */
-bool JavaFXOutput::doTree(Document *doc)
+bool JavaFXOutput::doTree(SPDocument *doc)
 {
 
     double bignum = 1000000.0;
@@ -767,7 +767,7 @@ bool JavaFXOutput::doTree(Document *doc)
 }
 
 
-bool JavaFXOutput::doBody(Document *doc, SPObject *obj)
+bool JavaFXOutput::doBody(SPDocument *doc, SPObject *obj)
 {
     /**
      * Check the type of node and process
@@ -842,7 +842,7 @@ void JavaFXOutput::reset()
 /**
  * Saves the <paths> of an Inkscape SVG file as JavaFX spline definitions
  */
-bool JavaFXOutput::saveDocument(Document *doc, gchar const *filename_utf8)
+bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
 {
     reset();
 
@@ -918,7 +918,7 @@ bool JavaFXOutput::saveDocument(Document *doc, gchar const *filename_utf8)
 */
 void
 JavaFXOutput::save(Inkscape::Extension::Output */*mod*/,
-                        Document *doc, gchar const *filename_utf8)
+                        SPDocument *doc, gchar const *filename_utf8)
 {
     /* N.B. The name `filename_utf8' represents the fact that we want it to be in utf8; whereas in
      * fact we know that some callers of Extension::save pass something in the filesystem's
diff --git a/src/extension/internal/javafx-out.h b/src/extension/internal/javafx-out.h
index 246172c23..9c1c8778b 100644
--- a/src/extension/internal/javafx-out.h
+++ b/src/extension/internal/javafx-out.h
@@ -56,7 +56,7 @@ public:
      * API call to perform the output to a file
      */
     virtual void save(Inkscape::Extension::Output *mod,
-                      Document *doc, gchar const *filename);
+                      SPDocument *doc, gchar const *filename);
 
     /**
      * Inkscape runtime startup call.
@@ -109,10 +109,10 @@ private:
      * Output the SVG document's curve data as JavaFX geometry types
      */
     bool doCurve(SPItem *item, const String &id);
-    bool doTreeRecursive(Document *doc, SPObject *obj);
-    bool doTree(Document *doc);
+    bool doTreeRecursive(SPDocument *doc, SPObject *obj);
+    bool doTree(SPDocument *doc);
 
-    bool doBody(Document *doc, SPObject *obj);
+    bool doBody(SPDocument *doc, SPObject *obj);
 
     /**
      * Output the file footer
@@ -124,7 +124,7 @@ private:
     /**
      * Actual method to save document
      */
-	bool saveDocument(Document *doc, gchar const *filename);
+	bool saveDocument(SPDocument *doc, gchar const *filename);
 
     //For statistics
     int nrNodes;
diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp
index 924f9697e..4a469a750 100644
--- a/src/extension/internal/latex-pstricks-out.cpp
+++ b/src/extension/internal/latex-pstricks-out.cpp
@@ -47,7 +47,7 @@ LatexOutput::check (Inkscape::Extension::Extension * module)
 
 
 void
-LatexOutput::save(Inkscape::Extension::Output *mod2, Document *doc, gchar const *filename)
+LatexOutput::save(Inkscape::Extension::Output *mod2, SPDocument *doc, gchar const *filename)
 {
     Inkscape::Extension::Print *mod;
     SPPrintContext context;
diff --git a/src/extension/internal/latex-pstricks-out.h b/src/extension/internal/latex-pstricks-out.h
index a9910f4cc..a12cdc3c1 100644
--- a/src/extension/internal/latex-pstricks-out.h
+++ b/src/extension/internal/latex-pstricks-out.h
@@ -27,7 +27,7 @@ public:
     bool check(Inkscape::Extension::Extension *module); //Can this module load (always yes for now)
 
     void save(Inkscape::Extension::Output *mod, // Save the given document to the given filename
-              Document *doc,
+              SPDocument *doc,
               gchar const *filename);
 
     static void init(void);//Initialize the class
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index afc985e14..789e5ea34 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -64,7 +64,7 @@ PrintLatex::setup (Inkscape::Extension::Print *mod)
 }
 
 unsigned int
-PrintLatex::begin (Inkscape::Extension::Print *mod, Document *doc)
+PrintLatex::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
 {
     Inkscape::SVGOStringStream os;
     int res;
diff --git a/src/extension/internal/latex-pstricks.h b/src/extension/internal/latex-pstricks.h
index 4e310d6fd..a33e169e8 100644
--- a/src/extension/internal/latex-pstricks.h
+++ b/src/extension/internal/latex-pstricks.h
@@ -43,7 +43,7 @@ public:
         /* Print functions */
         virtual unsigned int setup (Inkscape::Extension::Print * module);
 
-        virtual unsigned int begin (Inkscape::Extension::Print * module, Document *doc);
+        virtual unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc);
         virtual unsigned int finish (Inkscape::Extension::Print * module);
 
         /* Rendering methods */
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index e7e22414a..cc8489302 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -2367,7 +2367,7 @@ OdfOutput::reset()
  * Descends into the SVG tree, mapping things to ODF when appropriate
  */
 void
-OdfOutput::save(Inkscape::Extension::Output */*mod*/, Document *doc, gchar const *filename)
+OdfOutput::save(Inkscape::Extension::Output */*mod*/, SPDocument *doc, gchar const *filename)
 {
     reset();
 
diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h
index 5ad1f1137..3854ddfe1 100644
--- a/src/extension/internal/odf.h
+++ b/src/extension/internal/odf.h
@@ -272,7 +272,7 @@ public:
     bool check (Inkscape::Extension::Extension * module);
 
     void save  (Inkscape::Extension::Output *mod,
-	        Document *doc,
+	        SPDocument *doc,
 	        gchar const *filename);
 
     static void   init  (void);
diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp
index 76759259d..937fefb11 100644
--- a/src/extension/internal/pdf-input-cairo.cpp
+++ b/src/extension/internal/pdf-input-cairo.cpp
@@ -32,7 +32,7 @@ namespace Internal {
 
 static cairo_status_t _write_ustring_cb(void *closure, const unsigned char *data, unsigned int length);
 
-Document *
+SPDocument *
 PdfInputCairo::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
 
     printf("Attempting to open using PdfInputCairo\n");
@@ -58,7 +58,7 @@ PdfInputCairo::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
     cairo_destroy(cr);
     cairo_surface_destroy(surface);
 
-    Document * doc = sp_document_new_from_mem(output->c_str(), output->length(), TRUE);
+    SPDocument * doc = sp_document_new_from_mem(output->c_str(), output->length(), TRUE);
 
     delete output;
     g_object_unref(page);
diff --git a/src/extension/internal/pdf-input-cairo.h b/src/extension/internal/pdf-input-cairo.h
index 15080bc14..5715b57c9 100644
--- a/src/extension/internal/pdf-input-cairo.h
+++ b/src/extension/internal/pdf-input-cairo.h
@@ -27,7 +27,7 @@ namespace Internal {
 class PdfInputCairo: public Inkscape::Extension::Implementation::Implementation {
     PdfInputCairo () { };
 public:
-    Document *open( Inkscape::Extension::Input *mod,
+    SPDocument *open( Inkscape::Extension::Input *mod,
                                 const gchar *uri );
     static void         init( void );
 
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 476f0daf6..c2d417f2c 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -589,7 +589,7 @@ void PdfImportDialog::_setPreviewPage(int page) {
 /**
  * Parses the selected page of the given PDF document using PdfParser.
  */
-Document *
+SPDocument *
 PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
 
     // Initialize the globalParams variable for poppler
@@ -661,7 +661,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
     Catalog *catalog = pdf_doc->getCatalog();
     Page *page = catalog->getPage(page_num);
 
-    Document *doc = sp_document_new(NULL, TRUE, TRUE);
+    SPDocument *doc = sp_document_new(NULL, TRUE, TRUE);
     bool saved = sp_document_get_undo_sensitive(doc);
     sp_document_set_undo_sensitive(doc, false); // No need to undo in this temporary document
 
diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
index 968114ef3..6bf0f11a2 100644
--- a/src/extension/internal/pdfinput/pdf-input.h
+++ b/src/extension/internal/pdfinput/pdf-input.h
@@ -113,7 +113,7 @@ private:
 class PdfInput: public Inkscape::Extension::Implementation::Implementation {
     PdfInput () { };
 public:
-    Document *open( Inkscape::Extension::Input *mod,
+    SPDocument *open( Inkscape::Extension::Input *mod,
                                 const gchar *uri );
     static void         init( void );
 
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 686e44bb1..00bd8fa4d 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -77,7 +77,7 @@ struct SvgTransparencyGroup {
  * 
  */
 
-SvgBuilder::SvgBuilder(Document *document, gchar *docname, XRef *xref) {
+SvgBuilder::SvgBuilder(SPDocument *document, gchar *docname, XRef *xref) {
     _is_top_level = true;
     _doc = document;
     _docname = docname;
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
index 1f84ffcc3..3b9192d31 100644
--- a/src/extension/internal/pdfinput/svg-builder.h
+++ b/src/extension/internal/pdfinput/svg-builder.h
@@ -18,7 +18,7 @@
 
 #ifdef HAVE_POPPLER
 
-class Document;
+class SPDocument;
 namespace Inkscape {
     namespace XML {
         class Document;
@@ -95,7 +95,7 @@ struct SvgGlyph {
  */
 class SvgBuilder {
 public:
-    SvgBuilder(Document *document, gchar *docname, XRef *xref);
+    SvgBuilder(SPDocument *document, gchar *docname, XRef *xref);
     SvgBuilder(SvgBuilder *parent, Inkscape::XML::Node *root);
     virtual ~SvgBuilder();
 
@@ -220,7 +220,7 @@ private:
     std::vector<std::string> _availableFontNames; // Full names, used for matching font names (Bug LP #179589).
 
     bool _is_top_level;  // Whether this SvgBuilder is the top-level one
-    Document *_doc;
+    SPDocument *_doc;
     gchar *_docname;    // Basename of the URI from which this document is created
     XRef *_xref;    // Cross-reference table from the PDF doc we're converting from
     Inkscape::XML::Document *_xml_doc;
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index d3ed39d1f..f30cbc317 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -417,7 +417,7 @@ bool PovOutput::doCurve(SPItem *item, const String &id)
 /**
  *  Descend the svg tree recursively, translating data
  */
-bool PovOutput::doTreeRecursive(Document *doc, SPObject *obj)
+bool PovOutput::doTreeRecursive(SPDocument *doc, SPObject *obj)
 {
 
     String id;
@@ -454,7 +454,7 @@ bool PovOutput::doTreeRecursive(Document *doc, SPObject *obj)
 /**
  *  Output the curve data to buffer
  */
-bool PovOutput::doTree(Document *doc)
+bool PovOutput::doTree(SPDocument *doc)
 {
     double bignum = 1000000.0;
     minx  =  bignum;
@@ -576,7 +576,7 @@ void PovOutput::reset()
 /**
  * Saves the Shapes of an Inkscape SVG file as PovRay spline definitions
  */
-void PovOutput::saveDocument(Document *doc, gchar const *filename_utf8)
+void PovOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
 {
     reset();
 
@@ -641,7 +641,7 @@ void PovOutput::saveDocument(Document *doc, gchar const *filename_utf8)
 */
 void
 PovOutput::save(Inkscape::Extension::Output */*mod*/,
-                        Document *doc, gchar const *filename_utf8)
+                        SPDocument *doc, gchar const *filename_utf8)
 {
     /* See comments in JavaFSOutput::save re the name `filename_utf8'. */
     saveDocument(doc, filename_utf8);
diff --git a/src/extension/internal/pov-out.h b/src/extension/internal/pov-out.h
index 02ba6da82..0c3b73a7f 100644
--- a/src/extension/internal/pov-out.h
+++ b/src/extension/internal/pov-out.h
@@ -57,7 +57,7 @@ public:
      * API call to perform the output to a file
      */
     void save(Inkscape::Extension::Output *mod,
-              Document *doc, gchar const *filename);
+              SPDocument *doc, gchar const *filename);
 
     /**
      * Inkscape runtime startup call.
@@ -120,13 +120,13 @@ private:
      * Output the SVG document's curve data as POV curves
      */
     bool doCurve(SPItem *item, const String &id);
-    bool doTreeRecursive(Document *doc, SPObject *obj);
-    bool doTree(Document *doc);
+    bool doTreeRecursive(SPDocument *doc, SPObject *obj);
+    bool doTree(SPDocument *doc);
 
     /**
      * Actual method to save document
      */
-    void saveDocument(Document *doc, gchar const *filename);
+    void saveDocument(SPDocument *doc, gchar const *filename);
 
 
     /**
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index 317811088..a3589e905 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -138,13 +138,13 @@ _load_uri (const gchar *uri)
 /**
     \return    A new document just for you!
     \brief     This function takes in a filename of a SVG document and
-               turns it into a Document.
+               turns it into a SPDocument.
     \param     mod   Module to use
     \param     uri   The path to the file (UTF-8)
 
     This function is really simple, it just calls sp_document_new...
 */
-Document *
+SPDocument *
 Svg::open (Inkscape::Extension::Input */*mod*/, const gchar *uri)
 {
 #ifdef WITH_GNOME_VFS
@@ -157,7 +157,7 @@ Svg::open (Inkscape::Extension::Input */*mod*/, const gchar *uri)
         g_warning("Error:  Could not open file '%s' with VFS\n", uri);
         return NULL;
     }
-    Document * doc = sp_document_new_from_mem(buffer, strlen(buffer), 1);
+    SPDocument * doc = sp_document_new_from_mem(buffer, strlen(buffer), 1);
 
     g_free(buffer);
     return doc;
@@ -191,7 +191,7 @@ Svg::open (Inkscape::Extension::Input */*mod*/, const gchar *uri)
     all of this code.  I just stole it.
 */
 void
-Svg::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
+Svg::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
 {
     g_return_if_fail(doc != NULL);
     g_return_if_fail(filename != NULL);
diff --git a/src/extension/internal/svg.h b/src/extension/internal/svg.h
index 48b57c8c5..b97735dd8 100644
--- a/src/extension/internal/svg.h
+++ b/src/extension/internal/svg.h
@@ -25,9 +25,9 @@ class Svg : public Inkscape::Extension::Implementation::Implementation {
 
 public:
     virtual void        save( Inkscape::Extension::Output *mod,
-                               Document *doc,
+                               SPDocument *doc,
                                gchar const *filename );
-    virtual Document *open( Inkscape::Extension::Input *mod,
+    virtual SPDocument *open( Inkscape::Extension::Input *mod,
                                 const gchar *uri );
     static void         init( void );
 
diff --git a/src/extension/internal/win32.cpp b/src/extension/internal/win32.cpp
index f272292b5..21f278858 100644
--- a/src/extension/internal/win32.cpp
+++ b/src/extension/internal/win32.cpp
@@ -215,7 +215,7 @@ PrintWin32::setup (Inkscape::Extension::Print *mod)
 }
 
 unsigned int
-PrintWin32::begin (Inkscape::Extension::Print *mod, Document *doc)
+PrintWin32::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
 {
     DOCINFO di = {
         sizeof (DOCINFO),
diff --git a/src/extension/internal/win32.h b/src/extension/internal/win32.h
index 7f4b9352d..9462115c6 100644
--- a/src/extension/internal/win32.h
+++ b/src/extension/internal/win32.h
@@ -65,7 +65,7 @@ public:
     virtual unsigned int setup (Inkscape::Extension::Print * module);
     //virtual unsigned int set_preview (Inkscape::Extension::Print * module);
 
-    virtual unsigned int begin (Inkscape::Extension::Print * module, Document *doc);
+    virtual unsigned int begin (Inkscape::Extension::Print * module, SPDocument *doc);
     virtual unsigned int finish (Inkscape::Extension::Print * module);
 
     /* Rendering methods */
diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index e7177e5e3..c37d5705b 100644
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -59,7 +59,7 @@ namespace Extension {
 namespace Internal {
 
 
-Document *
+SPDocument *
 WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) {
     WPXInputStream* input = new libwpg::WPGFileStream(uri);
     if (input->isOLEStream()) {
@@ -86,7 +86,7 @@ WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) {
 
     //printf("I've got a doc: \n%s", painter.document.c_str());
 
-    Document * doc = sp_document_new_from_mem(output.cstr(), strlen(output.cstr()), TRUE);
+    SPDocument * doc = sp_document_new_from_mem(output.cstr(), strlen(output.cstr()), TRUE);
     delete input;
     return doc;
 }
diff --git a/src/extension/internal/wpg-input.h b/src/extension/internal/wpg-input.h
index e5c2838d5..ca882039b 100644
--- a/src/extension/internal/wpg-input.h
+++ b/src/extension/internal/wpg-input.h
@@ -24,7 +24,7 @@ namespace Internal {
 class WpgInput : public Inkscape::Extension::Implementation::Implementation {
     WpgInput () { };
 public:
-    Document *open( Inkscape::Extension::Input *mod,
+    SPDocument *open( Inkscape::Extension::Input *mod,
                                 const gchar *uri );
     static void         init( void );