SPDocument->Document

(bzr r8407)

30 files changed, 73 insertions, 73 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; }