SPDocument->Document

(bzr r8407)

48 files changed, 122 insertions, 122 deletions

diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h
index 9de70dce7..9f1894d95 100644
--- a/src/extension/implementation/implementation.h
+++ b/src/extension/implementation/implementation.h
@@ -70,13 +70,13 @@ public:
     virtual Gtk::Widget *prefs_input(Inkscape::Extension::Input *module,
                              gchar const *filename);
 
-    virtual SPDocument *open(Inkscape::Extension::Input *module,
+    virtual Document *open(Inkscape::Extension::Input *module,
                              gchar const *filename);
 
     /* ----- Output functions ----- */
     /** Find out information about the file. */
     virtual Gtk::Widget *prefs_output(Inkscape::Extension::Output *module);
-    virtual void save(Inkscape::Extension::Output *module, SPDocument *doc, gchar const *filename);
+    virtual void save(Inkscape::Extension::Output *module, Document *doc, gchar const *filename);
 
     /* ----- Effect functions ----- */
     /** Find out information about the file. */
@@ -93,7 +93,7 @@ public:
     virtual unsigned set_preview(Inkscape::Extension::Print *module);
 
     virtual unsigned begin(Inkscape::Extension::Print *module,
-                           SPDocument *doc);
+                           Document *doc);
     virtual unsigned finish(Inkscape::Extension::Print *module);
     virtual bool     textToPath(Inkscape::Extension::Print *ext);
     virtual bool     fontEmbedded(Inkscape::Extension::Print * ext);
diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index 8e25fb351..0769c9a18 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -73,7 +73,7 @@ public:
     /**
      *
      */
-    virtual SPDocument *open(Inkscape::Extension::Input *module,
+    virtual Document *open(Inkscape::Extension::Input *module,
                              gchar const *filename);
 
     /**
@@ -85,7 +85,7 @@ public:
      *
      */
     virtual void save(Inkscape::Extension::Output *module,
-                      SPDocument *doc,
+                      Document *doc,
                       gchar const *filename);
 
     /**
diff --git a/src/extension/implementation/xslt.h b/src/extension/implementation/xslt.h
index 45befb529..df9467d9e 100644
--- a/src/extension/implementation/xslt.h
+++ b/src/extension/implementation/xslt.h
@@ -44,9 +44,9 @@ public:
 
     bool check(Inkscape::Extension::Extension *module);
 
-    SPDocument *open(Inkscape::Extension::Input *module,
+    Document *open(Inkscape::Extension::Input *module,
                      gchar const *filename);
-    void save(Inkscape::Extension::Output *module, SPDocument *doc, gchar const *filename);
+    void save(Inkscape::Extension::Output *module, Document *doc, gchar const *filename);
 };
 
 }  /* Inkscape  */
diff --git a/src/extension/internal/cairo-png-out.h b/src/extension/internal/cairo-png-out.h
index 9b9bd6ffe..a062ec8df 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,
-              SPDocument *doc,
+              Document *doc,
               gchar const *filename);
     static void init();
 };
diff --git a/src/extension/internal/cairo-ps-out.h b/src/extension/internal/cairo-ps-out.h
index 019b6b810..862571f0b 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,
-              SPDocument *doc,
+              Document *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,
-              SPDocument *doc,
+              Document *doc,
               gchar const *uri);
     static void init();
     bool textToPath(Inkscape::Extension::Print *ext);
diff --git a/src/extension/internal/cairo-renderer-pdf-out.h b/src/extension/internal/cairo-renderer-pdf-out.h
index d76ffb4d4..f916eed49 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,
-              SPDocument *doc,
+              Document *doc,
               gchar const *filename);
     static void init();
 };
diff --git a/src/extension/internal/cairo-renderer.h b/src/extension/internal/cairo-renderer.h
index ab5d4cf58..4197c6784 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
-    SPDocument. A set*Target function can only be called on the context
+    Document. A set*Target function can only be called on the context
     before setupDocument. */
-    bool setupDocument(CairoRenderContext *ctx, SPDocument *doc, bool pageBoundingBox, SPItem *base);
+    bool setupDocument(CairoRenderContext *ctx, Document *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.h b/src/extension/internal/emf-win32-inout.h
index c62d7a4e9..544cd75db 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
-              SPDocument *doc,
+              Document *doc,
               gchar const *filename);
 
-    virtual SPDocument *open( Inkscape::Extension::Input *mod,
+    virtual Document *open( Inkscape::Extension::Input *mod,
                                 const gchar *uri );
 
     static void init(void);//Initialize the class
diff --git a/src/extension/internal/emf-win32-print.h b/src/extension/internal/emf-win32-print.h
index 5c1d8439d..bec3f9582 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, SPDocument *doc);
+    virtual unsigned int begin (Inkscape::Extension::Print * module, Document *doc);
     virtual unsigned int finish (Inkscape::Extension::Print * module);
 
     /* Rendering methods */
diff --git a/src/extension/internal/gdkpixbuf-input.h b/src/extension/internal/gdkpixbuf-input.h
index 9d5e6ccf7..373d53da3 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:
-    SPDocument *open(Inkscape::Extension::Input *mod,
+    Document *open(Inkscape::Extension::Input *mod,
                      gchar const *uri);
     static void init();
 };
diff --git a/src/extension/internal/gimpgrad.h b/src/extension/internal/gimpgrad.h
index 45b76dd6d..21ccfa215 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);
-    SPDocument *open(Inkscape::Extension::Input *module, gchar const *filename);
+    Document *open(Inkscape::Extension::Input *module, gchar const *filename);
 
     static void init();
 };
diff --git a/src/extension/internal/javafx-out.h b/src/extension/internal/javafx-out.h
index 9c1c8778b..246172c23 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,
-                      SPDocument *doc, gchar const *filename);
+                      Document *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(SPDocument *doc, SPObject *obj);
-    bool doTree(SPDocument *doc);
+    bool doTreeRecursive(Document *doc, SPObject *obj);
+    bool doTree(Document *doc);
 
-    bool doBody(SPDocument *doc, SPObject *obj);
+    bool doBody(Document *doc, SPObject *obj);
 
     /**
      * Output the file footer
@@ -124,7 +124,7 @@ private:
     /**
      * Actual method to save document
      */
-	bool saveDocument(SPDocument *doc, gchar const *filename);
+	bool saveDocument(Document *doc, gchar const *filename);
 
     //For statistics
     int nrNodes;
diff --git a/src/extension/internal/latex-pstricks-out.h b/src/extension/internal/latex-pstricks-out.h
index a12cdc3c1..a9910f4cc 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
-              SPDocument *doc,
+              Document *doc,
               gchar const *filename);
 
     static void init(void);//Initialize the class
diff --git a/src/extension/internal/latex-pstricks.h b/src/extension/internal/latex-pstricks.h
index a33e169e8..4e310d6fd 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, SPDocument *doc);
+        virtual unsigned int begin (Inkscape::Extension::Print * module, Document *doc);
         virtual unsigned int finish (Inkscape::Extension::Print * module);
 
         /* Rendering methods */
diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h
index 3854ddfe1..5ad1f1137 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,
-	        SPDocument *doc,
+	        Document *doc,
 	        gchar const *filename);
 
     static void   init  (void);
diff --git a/src/extension/internal/pdf-input-cairo.h b/src/extension/internal/pdf-input-cairo.h
index 5715b57c9..15080bc14 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:
-    SPDocument *open( Inkscape::Extension::Input *mod,
+    Document *open( Inkscape::Extension::Input *mod,
                                 const gchar *uri );
     static void         init( void );
 
diff --git a/src/extension/internal/pov-out.h b/src/extension/internal/pov-out.h
index 0c3b73a7f..02ba6da82 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,
-              SPDocument *doc, gchar const *filename);
+              Document *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(SPDocument *doc, SPObject *obj);
-    bool doTree(SPDocument *doc);
+    bool doTreeRecursive(Document *doc, SPObject *obj);
+    bool doTree(Document *doc);
 
     /**
      * Actual method to save document
      */
-    void saveDocument(SPDocument *doc, gchar const *filename);
+    void saveDocument(Document *doc, gchar const *filename);
 
 
     /**
diff --git a/src/extension/internal/svg.h b/src/extension/internal/svg.h
index b97735dd8..48b57c8c5 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,
-                               SPDocument *doc,
+                               Document *doc,
                                gchar const *filename );
-    virtual SPDocument *open( Inkscape::Extension::Input *mod,
+    virtual Document *open( Inkscape::Extension::Input *mod,
                                 const gchar *uri );
     static void         init( void );
 
diff --git a/src/extension/internal/win32.h b/src/extension/internal/win32.h
index 9462115c6..7f4b9352d 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, SPDocument *doc);
+    virtual unsigned int begin (Inkscape::Extension::Print * module, Document *doc);
     virtual unsigned int finish (Inkscape::Extension::Print * module);
 
     /* Rendering methods */
diff --git a/src/extension/internal/wpg-input.h b/src/extension/internal/wpg-input.h
index ca882039b..e5c2838d5 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:
-    SPDocument *open( Inkscape::Extension::Input *mod,
+    Document *open( Inkscape::Extension::Input *mod,
                                 const gchar *uri );
     static void         init( void );
 
diff --git a/src/extension/param/bool.h b/src/extension/param/bool.h
index a1cd4ce4a..23b15596d 100644
--- a/src/extension/param/bool.h
+++ b/src/extension/param/bool.h
@@ -22,9 +22,9 @@ private:
     bool _value;
 public:
     ParamBool(const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml);
-    bool get (const SPDocument * doc, const Inkscape::XML::Node * node);
-    bool set (bool in, SPDocument * doc, Inkscape::XML::Node * node);
-    Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+    bool get (const Document * doc, const Inkscape::XML::Node * node);
+    bool set (bool in, Document * doc, Inkscape::XML::Node * node);
+    Gtk::Widget * get_widget(Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
     void string (std::string &string);
 };
 
diff --git a/src/extension/param/color.h b/src/extension/param/color.h
index e6b44fbcb..89aac7be7 100644
--- a/src/extension/param/color.h
+++ b/src/extension/param/color.h
@@ -23,9 +23,9 @@ public:
     ParamColor(const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml);
     virtual ~ParamColor(void);
     /** \brief  Returns \c _value, with a \i const to protect it. */
-    guint32 get( const SPDocument * /*doc*/, const Inkscape::XML::Node * /*node*/ ) { return _value; }
-    guint32 set (guint32 in, SPDocument * doc, Inkscape::XML::Node * node);
-    Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+    guint32 get( const Document * /*doc*/, const Inkscape::XML::Node * /*node*/ ) { return _value; }
+    guint32 set (guint32 in, Document * doc, Inkscape::XML::Node * node);
+    Gtk::Widget * get_widget(Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
     void string (std::string &string);
     sigc::signal<void> * _changeSignal;
 }; /* class ParamColor */
diff --git a/src/extension/param/description.h b/src/extension/param/description.h
index c305ea6df..42441e5a9 100644
--- a/src/extension/param/description.h
+++ b/src/extension/param/description.h
@@ -23,7 +23,7 @@ private:
     gchar * _value;
 public:
     ParamDescription(const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml);
-    Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+    Gtk::Widget * get_widget(Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
 };
 
 }  /* namespace Extension */
diff --git a/src/extension/param/enum.h b/src/extension/param/enum.h
index 3f9707c34..e1af8fd2b 100644
--- a/src/extension/param/enum.h
+++ b/src/extension/param/enum.h
@@ -39,11 +39,11 @@ private:
 public:
     ParamComboBox(const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml);
     virtual ~ParamComboBox(void);
-    Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+    Gtk::Widget * get_widget(Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
     void string (std::string &string);
 
-    const gchar * get (const SPDocument * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
-    const gchar * set (const gchar * in, SPDocument * doc, Inkscape::XML::Node * node);
+    const gchar * get (const Document * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
+    const gchar * set (const gchar * in, Document * doc, Inkscape::XML::Node * node);
 
     void changed (void);
 }; /* class ParamComboBox */
diff --git a/src/extension/param/float.h b/src/extension/param/float.h
index f105d8f0e..32ab7a796 100644
--- a/src/extension/param/float.h
+++ b/src/extension/param/float.h
@@ -26,12 +26,12 @@ private:
 public:
     ParamFloat (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml);
     /** \brief  Returns \c _value */
-    float get (const SPDocument * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
-    float set (float in, SPDocument * doc, Inkscape::XML::Node * node);
+    float get (const Document * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
+    float set (float in, Document * doc, Inkscape::XML::Node * node);
     float max (void) { return _max; }
     float min (void) { return _min; }
     float precision (void) { return _precision; }
-    Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+    Gtk::Widget * get_widget(Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
     void string (std::string &string);
 };
 
diff --git a/src/extension/param/int.h b/src/extension/param/int.h
index a4eb54c81..6d44a10b3 100644
--- a/src/extension/param/int.h
+++ b/src/extension/param/int.h
@@ -25,11 +25,11 @@ private:
 public:
     ParamInt (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml);
     /** \brief  Returns \c _value */
-    int get (const SPDocument * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
-    int set (int in, SPDocument * doc, Inkscape::XML::Node * node);
+    int get (const Document * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
+    int set (int in, Document * doc, Inkscape::XML::Node * node);
     int max (void) { return _max; }
     int min (void) { return _min; }
-    Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+    Gtk::Widget * get_widget(Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
     void string (std::string &string);
 };
 
diff --git a/src/extension/param/notebook.h b/src/extension/param/notebook.h
index 24d4ebfc1..6efd3c5f1 100644
--- a/src/extension/param/notebook.h
+++ b/src/extension/param/notebook.h
@@ -40,11 +40,11 @@ private:
 public:
     ParamNotebook(const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml);
     virtual ~ParamNotebook(void);
-    Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+    Gtk::Widget * get_widget(Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
     void string (std::list <std::string> &list);
 
-    const gchar * get (const SPDocument * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
-    const gchar * set (const int in, SPDocument * doc, Inkscape::XML::Node * node);
+    const gchar * get (const Document * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
+    const gchar * set (const int in, Document * doc, Inkscape::XML::Node * node);
 }; /* class ParamNotebook */
 
 
diff --git a/src/extension/param/parameter.h b/src/extension/param/parameter.h
index 54249c12e..a79b2fd6b 100644
--- a/src/extension/param/parameter.h
+++ b/src/extension/param/parameter.h
@@ -68,7 +68,7 @@ protected:
     /* **** funcs **** */
     gchar *               pref_name (void);
     Inkscape::XML::Node * find_child (Inkscape::XML::Node * adult);
-    Inkscape::XML::Node * document_param_node (SPDocument * doc);
+    Inkscape::XML::Node * document_param_node (Document * doc);
     Inkscape::XML::Node * new_child (Inkscape::XML::Node * parent);
 
 public:
@@ -85,29 +85,29 @@ public:
                       Parameter(name, guitext, NULL, Parameter::SCOPE_USER, false, NULL, ext);
                   };
     virtual      ~Parameter  (void);
-    bool          get_bool   (const SPDocument * doc,
+    bool          get_bool   (const Document * doc,
                               const Inkscape::XML::Node * node);
-    int           get_int    (const SPDocument * doc,
+    int           get_int    (const Document * doc,
                               const Inkscape::XML::Node * node);
-    float         get_float  (const SPDocument * doc,
+    float         get_float  (const Document * doc,
                               const Inkscape::XML::Node * node);
-    const gchar * get_string (const SPDocument * doc,
+    const gchar * get_string (const Document * doc,
                               const Inkscape::XML::Node * node);
-    guint32       get_color  (const SPDocument * doc,
+    guint32       get_color  (const Document * doc,
                               const Inkscape::XML::Node * node);
-    const gchar * get_enum   (const SPDocument * doc,
+    const gchar * get_enum   (const Document * doc,
                               const Inkscape::XML::Node * node);
 
-    bool          set_bool   (bool in,          SPDocument * doc, Inkscape::XML::Node * node);
-    int           set_int    (int  in,          SPDocument * doc, Inkscape::XML::Node * node);
-    float         set_float  (float in,         SPDocument * doc, Inkscape::XML::Node * node);
-    const gchar * set_string (const gchar * in, SPDocument * doc, Inkscape::XML::Node * node);
-    guint32       set_color  (guint32 in, SPDocument * doc, Inkscape::XML::Node * node);
+    bool          set_bool   (bool in,          Document * doc, Inkscape::XML::Node * node);
+    int           set_int    (int  in,          Document * doc, Inkscape::XML::Node * node);
+    float         set_float  (float in,         Document * doc, Inkscape::XML::Node * node);
+    const gchar * set_string (const gchar * in, Document * doc, Inkscape::XML::Node * node);
+    guint32       set_color  (guint32 in, Document * doc, Inkscape::XML::Node * node);
 
     const gchar * name       (void) {return _name;}
 
     static Parameter * make (Inkscape::XML::Node * in_repr, Inkscape::Extension::Extension * in_ext);
-    virtual Gtk::Widget * get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+    virtual Gtk::Widget * get_widget (Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
 
     gchar const * get_tooltip (void) { return _desc; }
 
diff --git a/src/extension/param/radiobutton.h b/src/extension/param/radiobutton.h
index ea8440de2..ec35c2c53 100644
--- a/src/extension/param/radiobutton.h
+++ b/src/extension/param/radiobutton.h
@@ -43,11 +43,11 @@ public:
                      Inkscape::XML::Node * xml,
                      AppearanceMode mode);
     virtual ~ParamRadioButton(void);
-    Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+    Gtk::Widget * get_widget(Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
     void string (std::string &string);
 
-    const gchar * get (const SPDocument * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
-    const gchar * set (const gchar * in, SPDocument * doc, Inkscape::XML::Node * node);
+    const gchar * get (const Document * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
+    const gchar * set (const gchar * in, Document * doc, Inkscape::XML::Node * node);
 
 private:
     /** \brief  Internal value.  This should point to a string that has
diff --git a/src/extension/param/string.h b/src/extension/param/string.h
index 10f45e5ac..0eb116a53 100644
--- a/src/extension/param/string.h
+++ b/src/extension/param/string.h
@@ -28,9 +28,9 @@ public:
     ParamString(const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml);
     virtual ~ParamString(void);
     /** \brief  Returns \c _value, with a \i const to protect it. */
-    const gchar * get (const SPDocument * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
-    const gchar * set (const gchar * in, SPDocument * doc, Inkscape::XML::Node * node);
-    Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+    const gchar * get (const Document * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
+    const gchar * set (const gchar * in, Document * doc, Inkscape::XML::Node * node);
+    Gtk::Widget * get_widget(Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
     void string (std::string &string);
     void setMaxLength(int maxLenght) { _max_length = maxLenght; }
     int getMaxLength(void) { return _max_length; }
diff --git a/src/ui/dialog/document-metadata.h b/src/ui/dialog/document-metadata.h
index 7f718e9f7..2bc94836b 100644
--- a/src/ui/dialog/document-metadata.h
+++ b/src/ui/dialog/document-metadata.h
@@ -49,7 +49,7 @@ protected:
     void  build_metadata();
     void  init();
 
-    void _handleDocumentReplaced(SPDesktop* desktop, SPDocument *document);
+    void _handleDocumentReplaced(SPDesktop* desktop, Document *document);
     void _handleActivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
     void _handleDeactivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
 
diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index 136ae2c89..5aa8d446d 100644
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -70,7 +70,7 @@ protected:
     void  removeExternalScript();
     void  scripting_create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem);
 
-    void _handleDocumentReplaced(SPDesktop* desktop, SPDocument *document);
+    void _handleDocumentReplaced(SPDesktop* desktop, Document *document);
     void _handleActivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
     void _handleDeactivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
 
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h
index 90dddce59..bd0477b30 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.h
+++ b/src/ui/dialog/filedialogimpl-gtkmm.h
@@ -99,7 +99,7 @@ public:
 
     ~SVGPreview();
 
-    bool setDocument(SPDocument *doc);
+    bool setDocument(Document *doc);
 
     bool setFileName(Glib::ustring &fileName);
 
@@ -128,7 +128,7 @@ private:
     /**
      * The svg document we are currently showing
      */
-    SPDocument *document;
+    Document *document;
 
     /**
      * The sp_svg_view widget
diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 3fb9a46fb..28c714905 100644
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -88,7 +88,7 @@ private:
 
         static void on_activate_desktop(Application*, SPDesktop*, FilterModifier*);
         static void on_deactivate_desktop(Application*, SPDesktop*, FilterModifier*);
-        void on_document_replaced(SPDesktop*, SPDocument*)
+        void on_document_replaced(SPDesktop*, Document*)
         {
             update_filters();
         }
diff --git a/src/ui/dialog/layers.h b/src/ui/dialog/layers.h
index 16b3be350..c5f945437 100644
--- a/src/ui/dialog/layers.h
+++ b/src/ui/dialog/layers.h
@@ -86,7 +86,7 @@ private:
     bool _checkForSelected(const Gtk::TreePath& path, const Gtk::TreeIter& iter, SPObject* layer);
 
     void _layersChanged();
-    void _addLayer( SPDocument* doc, SPObject* layer, Gtk::TreeModel::Row* parentRow, SPObject* target, int level );
+    void _addLayer( Document* doc, SPObject* layer, Gtk::TreeModel::Row* parentRow, SPObject* target, int level );
 
     SPObject* _selectedLayer();
 
diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h
index 7dbb6dd4a..5fc4a9134 100644
--- a/src/ui/dialog/panel-dialog.h
+++ b/src/ui/dialog/panel-dialog.h
@@ -50,7 +50,7 @@ protected:
         static_cast<PanelDialogBase *>(data)->_propagateDesktopActivated(application, desktop);
     }
 
-    inline virtual void _propagateDocumentReplaced(SPDesktop* desktop, SPDocument *document);
+    inline virtual void _propagateDocumentReplaced(SPDesktop* desktop, Document *document);
     inline virtual void _propagateDesktopActivated(Inkscape::Application *, SPDesktop *);
     inline virtual void _propagateDesktopDeactivated(Inkscape::Application *, SPDesktop *);
 
@@ -106,7 +106,7 @@ private:
 
 
 void
-PanelDialogBase::_propagateDocumentReplaced(SPDesktop *desktop, SPDocument *document)
+PanelDialogBase::_propagateDocumentReplaced(SPDesktop *desktop, Document *document)
 {
     _panel.signalDocumentReplaced().emit(desktop, document);
 }
diff --git a/src/ui/dialog/print.h b/src/ui/dialog/print.h
index ea89ebdf2..e8904d744 100644
--- a/src/ui/dialog/print.h
+++ b/src/ui/dialog/print.h
@@ -30,7 +30,7 @@
  */
 struct workaround_gtkmm
 {
-    SPDocument *_doc;
+    Document *_doc;
     SPItem     *_base;
     Inkscape::UI::Widget::RenderingOptions *_tab;
 };
@@ -41,14 +41,14 @@ namespace Dialog {
 
 class Print {
 public:
-    Print(SPDocument *doc, SPItem *base);
+    Print(Document *doc, SPItem *base);
     Gtk::PrintOperationResult run(Gtk::PrintOperationAction, Gtk::Window &parent_window);
 
 protected:
 
 private:
     GtkPrintOperation *_printop;
-    SPDocument *_doc;
+    Document *_doc;
     SPItem     *_base;
     Inkscape::UI::Widget::RenderingOptions _tab;
 
diff --git a/src/ui/dialog/swatches.h b/src/ui/dialog/swatches.h
index 35bcd8c78..3ad5a38c1 100644
--- a/src/ui/dialog/swatches.h
+++ b/src/ui/dialog/swatches.h
@@ -45,7 +45,7 @@ public:
 protected:
     virtual void _updateFromSelection();
     virtual void _handleAction( int setId, int itemId );
-    virtual void _setDocument( SPDocument *document );
+    virtual void _setDocument( Document *document );
     virtual void _rebuild();
 
 private:
@@ -57,7 +57,7 @@ private:
     ColorItem* _remove;
     int _currentIndex;
     SPDesktop*  _currentDesktop;
-    SPDocument* _currentDocument;
+    Document* _currentDocument;
     void* _ptr;
 
     sigc::connection _documentConnection;
diff --git a/src/ui/dialog/undo-history.h b/src/ui/dialog/undo-history.h
index 82e04f3c9..0e14b7d7b 100644
--- a/src/ui/dialog/undo-history.h
+++ b/src/ui/dialog/undo-history.h
@@ -122,7 +122,7 @@ public:
 
 protected:
 
-    SPDocument *_document;
+    Document *_document;
     EventLog *_event_log;
 
     const EventLog::EventModelColumns *_columns;
diff --git a/src/ui/view/edit-widget.h b/src/ui/view/edit-widget.h
index 2bb708305..28b4b52d2 100644
--- a/src/ui/view/edit-widget.h
+++ b/src/ui/view/edit-widget.h
@@ -36,7 +36,7 @@
 #include "ui/widget/zoom-status.h"
 
 struct SPDesktop;
-struct SPDocument;
+struct Document;
 struct SPNamedView;
 
 namespace Inkscape {
@@ -46,14 +46,14 @@ namespace View {
 class EditWidget : public Gtk::Window,
                    public EditWidgetInterface {
 public:
-    EditWidget (SPDocument*);
+    EditWidget (Document*);
     ~EditWidget();
 
     // Initialization
     void initActions();
     void initUIManager();
     void initLayout();
-    void initEdit (SPDocument*);
+    void initEdit (Document*);
     void destroyEdit();
 
     // Actions
diff --git a/src/ui/view/view.h b/src/ui/view/view.h
index 882746cea..6465807d6 100644
--- a/src/ui/view/view.h
+++ b/src/ui/view/view.h
@@ -53,7 +53,7 @@ struct StopOnNonZero {
   }
 };
 
-class SPDocument;
+class Document;
 
 namespace Inkscape {
     class MessageContext;
@@ -80,7 +80,7 @@ public:
     void close() { _close(); }
 
     /// Returns a pointer to the view's document.
-    SPDocument *doc() const
+    Document *doc() const
       { return _doc; }
     /// Returns a pointer to the view's message stack.
     Inkscape::MessageStack *messageStack() const
@@ -108,12 +108,12 @@ public:
     virtual void onDocumentResized (double, double) = 0;
 
 protected:
-    SPDocument *_doc;
+    Document *_doc;
     Inkscape::MessageStack *_message_stack;
     Inkscape::MessageContext *_tips_message_context;
 
     virtual void _close();
-    virtual void setDocument(SPDocument *doc);
+    virtual void setDocument(Document *doc);
 
     sigc::signal<void,double,double>   _position_set_signal;
     sigc::signal<void,double,double>   _resized_signal;
diff --git a/src/ui/widget/entity-entry.h b/src/ui/widget/entity-entry.h
index 5bdee9a90..d080787c1 100644
--- a/src/ui/widget/entity-entry.h
+++ b/src/ui/widget/entity-entry.h
@@ -16,7 +16,7 @@
 #include <gtkmm/tooltips.h>
 
 struct rdf_work_entity_t;
-class SPDocument;
+class Document;
 
 namespace Gtk {
 class TextBuffer;
@@ -32,7 +32,7 @@ class EntityEntry {
 public:
     static EntityEntry* create (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr);
     virtual ~EntityEntry() = 0;
-    virtual void update (SPDocument *doc) = 0;
+    virtual void update (Document *doc) = 0;
     virtual void on_changed() = 0;
     Gtk::Label _label;
     Gtk::Widget *_packable;
@@ -49,7 +49,7 @@ class EntityLineEntry : public EntityEntry {
 public:
     EntityLineEntry (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr);
     ~EntityLineEntry();
-    void update (SPDocument *doc);
+    void update (Document *doc);
 
 protected:
     virtual void on_changed();
@@ -59,7 +59,7 @@ class EntityMultiLineEntry : public EntityEntry {
 public:
     EntityMultiLineEntry (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr);
     ~EntityMultiLineEntry();
-    void update (SPDocument *doc);
+    void update (Document *doc);
 
 protected: 
     virtual void on_changed();
diff --git a/src/ui/widget/imageicon.h b/src/ui/widget/imageicon.h
index 803b2f53f..3819a3c77 100644
--- a/src/ui/widget/imageicon.h
+++ b/src/ui/widget/imageicon.h
@@ -16,7 +16,7 @@
 #include <gtkmm/box.h>
 
 
-class SPDocument;
+class Document;
 
 namespace Inkscape
 {
@@ -62,7 +62,7 @@ public:
     /**
      *
      */
-    bool showSvgDocument(const SPDocument *doc);
+    bool showSvgDocument(const Document *doc);
 
     /**
      *
@@ -99,7 +99,7 @@ private:
     /**
      * The svg document we are currently showing
      */
-    SPDocument *document;
+    Document *document;
 
     /**
      * The sp_svg_view widget
diff --git a/src/ui/widget/layer-selector.h b/src/ui/widget/layer-selector.h
index 0b5300272..d9ef558a5 100644
--- a/src/ui/widget/layer-selector.h
+++ b/src/ui/widget/layer-selector.h
@@ -23,7 +23,7 @@
 #include "util/list.h"
 
 class SPDesktop;
-class SPDocument;
+class Document;
 class SPObject;
 namespace Inkscape {
 namespace XML {
diff --git a/src/ui/widget/licensor.h b/src/ui/widget/licensor.h
index 9f41a6d0d..6738c48df 100644
--- a/src/ui/widget/licensor.h
+++ b/src/ui/widget/licensor.h
@@ -15,7 +15,7 @@
 
 #include <gtkmm/box.h>
 
-class SPDocument;
+class Document;
 
 namespace Gtk {
     class Tooltips;
@@ -34,7 +34,7 @@ public:
     Licensor();
     virtual ~Licensor();
     void init (Gtk::Tooltips&, Registry&);
-    void update (SPDocument *doc);
+    void update (Document *doc);
 
 protected: 
     EntityEntry          *_eentry;
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index d42548f16..36f5ea804 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -71,7 +71,7 @@ public:
     void setDefaultResponse(int response_id);
     void setResponseSensitive(int response_id, bool setting);
 
-    virtual sigc::signal<void, SPDesktop *, SPDocument *> &signalDocumentReplaced();
+    virtual sigc::signal<void, SPDesktop *, Document *> &signalDocumentReplaced();
     virtual sigc::signal<void, Inkscape::Application *, SPDesktop *> &signalActivateDesktop();
     virtual sigc::signal<void, Inkscape::Application *, SPDesktop *> &signalDeactiveDesktop();
 
@@ -100,7 +100,7 @@ protected:
     /** Signals */
     sigc::signal<void, int> _signal_response;
     sigc::signal<void>      _signal_present;
-    sigc::signal<void, SPDesktop *, SPDocument *> _signal_document_replaced;
+    sigc::signal<void, SPDesktop *, Document *> _signal_document_replaced;
     sigc::signal<void, Inkscape::Application *, SPDesktop *> _signal_activate_desktop;
     sigc::signal<void, Inkscape::Application *, SPDesktop *> _signal_deactive_desktop;
 
diff --git a/src/ui/widget/registered-enums.h b/src/ui/widget/registered-enums.h
index 739745817..f9195d1f2 100644
--- a/src/ui/widget/registered-enums.h
+++ b/src/ui/widget/registered-enums.h
@@ -32,7 +32,7 @@ public:
                 const Util::EnumDataConverter<E>& c,
                 Registry& wr,
                 Inkscape::XML::Node* repr_in = NULL,
-                SPDocument *doc_in = NULL )
+                Document *doc_in = NULL )
         : RegisteredWidget< LabelledComboBoxEnum<E> >(label, tip, c)
     {
         RegisteredWidget< LabelledComboBoxEnum<E> >::init_parent(key, wr, repr_in, doc_in);
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index a5c61f68a..32d6c93fa 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -35,7 +35,7 @@
 #include "sp-namedview.h"
 
 class SPUnit;
-class SPDocument;
+class Document;
 
 namespace Gtk {
     class HScale;
@@ -81,7 +81,7 @@ protected:
 
     virtual ~RegisteredWidget() {};
 
-    void init_parent(const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in)
+    void init_parent(const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, Document *doc_in)
     {
         _wr = &wr;
         _key = key;
@@ -96,7 +96,7 @@ protected:
         // Use local repr here. When repr is specified, use that one, but
         // if repr==NULL, get the repr of namedview of active desktop.
         Inkscape::XML::Node *local_repr = repr;
-        SPDocument *local_doc = doc;
+        Document *local_doc = doc;
         if (!local_repr) {
             // no repr specified, use active desktop's namedview's repr
             SPDesktop* dt = SP_ACTIVE_DESKTOP;
@@ -120,7 +120,7 @@ protected:
     Registry * _wr;
     Glib::ustring _key;
     Inkscape::XML::Node * repr;
-    SPDocument * doc;
+    Document * doc;
     unsigned int event_type;
     Glib::ustring event_description;
     bool write_undo;
@@ -139,7 +139,7 @@ private:
 class RegisteredCheckButton : public RegisteredWidget<Gtk::CheckButton> {
 public:
     virtual ~RegisteredCheckButton();
-    RegisteredCheckButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL);
+    RegisteredCheckButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, Document *doc_in=NULL);
 
     void setActive (bool);
 
@@ -168,7 +168,7 @@ public:
                          const Glib::ustring& key,
                          Registry& wr,
                          Inkscape::XML::Node* repr_in = NULL,
-                         SPDocument *doc_in = NULL );
+                         Document *doc_in = NULL );
 
     void setUnit (const SPUnit*);
     Unit getUnit() const { return static_cast<UnitMenu*>(_widget)->getUnit(); };
@@ -188,7 +188,7 @@ public:
                            const RegisteredUnitMenu &rum,
                            Registry& wr,
                            Inkscape::XML::Node* repr_in = NULL,
-                           SPDocument *doc_in = NULL );
+                           Document *doc_in = NULL );
 
 protected:
     sigc::connection  _value_changed_connection;
@@ -204,7 +204,7 @@ public:
             const Glib::ustring& key,
             Registry& wr,
             Inkscape::XML::Node* repr_in = NULL,
-            SPDocument *doc_in = NULL );
+            Document *doc_in = NULL );
 
 protected:
     sigc::connection  _value_changed_connection;
@@ -219,7 +219,7 @@ public:
             const Glib::ustring& key,
             Registry& wr,
             Inkscape::XML::Node* repr_in = NULL,
-            SPDocument *doc_in = NULL );
+            Document *doc_in = NULL );
 
 protected:
     sigc::connection  _activate_connection;
@@ -237,7 +237,7 @@ public:
                            const Glib::ustring& akey,
                            Registry& wr,
                            Inkscape::XML::Node* repr_in = NULL,
-                           SPDocument *doc_in = NULL);
+                           Document *doc_in = NULL);
 
     void setRgba32 (guint32);
     void closeWindow();
@@ -259,7 +259,7 @@ public:
                                 const Glib::ustring& key,
                                 Registry& wr,
                                 Inkscape::XML::Node* repr_in = NULL,
-                                SPDocument *doc_in = NULL );
+                                Document *doc_in = NULL );
 
     bool setProgrammatically; // true if the value was set by setValue, not changed by the user;
                                 // if a callback checks it, it must reset it back to false
@@ -280,7 +280,7 @@ public:
                                 const Glib::ustring& key,
                                 Registry& wr,
                                 Inkscape::XML::Node* repr_in = NULL,
-                                SPDocument *doc_in = NULL );
+                                Document *doc_in = NULL );
 
     void setValue (bool second);
 
@@ -301,7 +301,7 @@ public:
                       const Glib::ustring& key,
                       Registry& wr,
                       Inkscape::XML::Node* repr_in = NULL,
-                      SPDocument *doc_in = NULL );
+                      Document *doc_in = NULL );
 
 protected:
     sigc::connection  _value_x_changed_connection;
@@ -318,7 +318,7 @@ public:
                                   const Glib::ustring& key,
                                   Registry& wr,
                                   Inkscape::XML::Node* repr_in = NULL,
-                                  SPDocument *doc_in = NULL );
+                                  Document *doc_in = NULL );
 
     // redefine setValue, because transform must be applied
     void setValue(Geom::Point const & p);
@@ -342,7 +342,7 @@ public:
                        const Glib::ustring& key,
                        Registry& wr,
                        Inkscape::XML::Node* repr_in = NULL,
-                       SPDocument *doc_in = NULL);
+                       Document *doc_in = NULL);
 
     void setValue (double val, long startseed);