SPDocument->Document

(bzr r8405)

8 files changed, 23 insertions, 23 deletions

diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index afc0668a9..c6b731a84 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -358,7 +358,7 @@ void
 Effect::EffectVerb::perform( SPAction *action, void * data, void */*pdata*/ )
 {
     Inkscape::UI::View::View * current_view = sp_action_get_view(action);
-//  SPDocument * current_document = current_view->doc;
+//  Document * current_document = current_view->doc;
     Effect::EffectVerb * ev = reinterpret_cast<Effect::EffectVerb *>(data);
     Effect * effect = ev->_effect;
 
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 4a13890d7..a87cc6b64 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -179,7 +179,7 @@ ExecutionEnv::commit (void) {
 void
 ExecutionEnv::reselect (void) {
     if (_doc == NULL) { return; }
-    SPDocument * doc = _doc->doc();
+    Document * doc = _doc->doc();
     if (doc == NULL) { return; }
 
     SPDesktop *desktop = (SPDesktop *)_doc;
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 52d5f5148..c8dc30d8b 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -423,7 +423,7 @@ param_shared (const gchar * name, GSList * list)
     found parameter.
 */
 const gchar *
-Extension::get_param_string (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_string (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
 {
     Parameter * param;
 
@@ -432,7 +432,7 @@ Extension::get_param_string (const gchar * name, const SPDocument * doc, const I
 }
 
 const gchar *
-Extension::get_param_enum (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_enum (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
 {
     Parameter* param = param_shared(name, parameters);
     return param->get_enum(doc, node);
@@ -450,7 +450,7 @@ Extension::get_param_enum (const gchar * name, const SPDocument * doc, const Ink
     found parameter.
 */
 bool
-Extension::get_param_bool (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_bool (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
 {
     Parameter * param;
 
@@ -470,7 +470,7 @@ Extension::get_param_bool (const gchar * name, const SPDocument * doc, const Ink
     found parameter.
 */
 int
-Extension::get_param_int (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_int (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
 {
     Parameter * param;
 
@@ -490,7 +490,7 @@ Extension::get_param_int (const gchar * name, const SPDocument * doc, const Inks
     found parameter.
 */
 float
-Extension::get_param_float (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_float (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
 {
     Parameter * param;
     param = param_shared(name, parameters);
@@ -509,7 +509,7 @@ Extension::get_param_float (const gchar * name, const SPDocument * doc, const In
     found parameter.
 */
 guint32
-Extension::get_param_color (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_color (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
 {
     Parameter* param = param_shared(name, parameters);
     return param->get_color(doc, node);
@@ -528,7 +528,7 @@ Extension::get_param_color (const gchar * name, const SPDocument * doc, const In
     found parameter.
 */
 bool
-Extension::set_param_bool (const gchar * name, bool value, SPDocument * doc, Inkscape::XML::Node * node)
+Extension::set_param_bool (const gchar * name, bool value, Document * doc, Inkscape::XML::Node * node)
 {
     Parameter * param;
     param = param_shared(name, parameters);
@@ -548,7 +548,7 @@ Extension::set_param_bool (const gchar * name, bool value, SPDocument * doc, Ink
     found parameter.
 */
 int
-Extension::set_param_int (const gchar * name, int value, SPDocument * doc, Inkscape::XML::Node * node)
+Extension::set_param_int (const gchar * name, int value, Document * doc, Inkscape::XML::Node * node)
 {
     Parameter * param;
     param = param_shared(name, parameters);
@@ -568,7 +568,7 @@ Extension::set_param_int (const gchar * name, int value, SPDocument * doc, Inksc
     found parameter.
 */
 float
-Extension::set_param_float (const gchar * name, float value, SPDocument * doc, Inkscape::XML::Node * node)
+Extension::set_param_float (const gchar * name, float value, Document * doc, Inkscape::XML::Node * node)
 {
     Parameter * param;
     param = param_shared(name, parameters);
@@ -588,7 +588,7 @@ Extension::set_param_float (const gchar * name, float value, SPDocument * doc, I
     found parameter.
 */
 const gchar *
-Extension::set_param_string (const gchar * name, const gchar * value, SPDocument * doc, Inkscape::XML::Node * node)
+Extension::set_param_string (const gchar * name, const gchar * value, Document * doc, Inkscape::XML::Node * node)
 {
     Parameter * param;
     param = param_shared(name, parameters);
@@ -608,7 +608,7 @@ Extension::set_param_string (const gchar * name, const gchar * value, SPDocument
     found parameter.
 */
 guint32
-Extension::set_param_color (const gchar * name, guint32 color, SPDocument * doc, Inkscape::XML::Node * node)
+Extension::set_param_color (const gchar * name, guint32 color, Document * doc, Inkscape::XML::Node * node)
 {
     Parameter* param = param_shared(name, parameters);
     return param->set_color(color, doc, node);
@@ -671,7 +671,7 @@ public:
     If all parameters are gui_visible = false NULL is returned as well.    
 */
 Gtk::Widget *
-Extension::autogui (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
+Extension::autogui (Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
 {
     if (param_visible_count() == 0) return NULL;
 
diff --git a/src/extension/input.cpp b/src/extension/input.cpp
index 689c1286f..ca5fdc29f 100644
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
@@ -145,7 +145,7 @@ Input::check (void)
     Adobe Illustrator file can be transparent (not recommended, but
     transparent).  This is all done with undo being turned off.
 */
-SPDocument *
+Document *
 Input::open (const gchar *uri)
 {
     if (!loaded()) {
@@ -156,7 +156,7 @@ Input::open (const gchar *uri)
     }
     timer->touch();
 
-    SPDocument *const doc = imp->open(this, uri);
+    Document *const doc = imp->open(this, uri);
     if (doc != NULL) {
         Inkscape::XML::Node * repr = sp_document_repr_root(doc);
         bool saved = sp_document_get_undo_sensitive(doc);
diff --git a/src/extension/output.cpp b/src/extension/output.cpp
index 742e938de..8e2fa5486 100644
--- a/src/extension/output.cpp
+++ b/src/extension/output.cpp
@@ -212,7 +212,7 @@ Output::prefs (void)
 	could be changed, and old files will still work properly.
 */
 void
-Output::save(SPDocument *doc, gchar const *filename)
+Output::save(Document *doc, gchar const *filename)
 {
         try {
             imp->save(this, doc, filename);
diff --git a/src/extension/patheffect.cpp b/src/extension/patheffect.cpp
index 8e3fc13f1..f6fa84f5b 100644
--- a/src/extension/patheffect.cpp
+++ b/src/extension/patheffect.cpp
@@ -28,14 +28,14 @@ PathEffect::~PathEffect (void)
 }
 
 void
-PathEffect::processPath (SPDocument * /*doc*/, Inkscape::XML::Node * /*path*/, Inkscape::XML::Node * /*def*/)
+PathEffect::processPath (Document * /*doc*/, Inkscape::XML::Node * /*path*/, Inkscape::XML::Node * /*def*/)
 {
 
 
 }
 
 void
-PathEffect::processPathEffects (SPDocument * doc, Inkscape::XML::Node * path)
+PathEffect::processPathEffects (Document * doc, Inkscape::XML::Node * path)
 {
     gchar const * patheffectlist = path->attribute("inkscape:path-effects");
     if (patheffectlist == NULL)
diff --git a/src/extension/print.cpp b/src/extension/print.cpp
index 2d4177d60..f6f6bb1e5 100644
--- a/src/extension/print.cpp
+++ b/src/extension/print.cpp
@@ -49,7 +49,7 @@ Print::set_preview (void)
 }
 
 unsigned int
-Print::begin (SPDocument *doc)
+Print::begin (Document *doc)
 {
     return imp->begin(this, doc);
 }
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index d7e0eebf3..ad49c3d2a 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -59,7 +59,7 @@ static Extension *build_from_reprdoc(Inkscape::XML::Document *doc, Implementatio
  *
  * Lastly, the open function is called in the module itself.
  */
-SPDocument *
+Document *
 open(Extension *key, gchar const *filename)
 {
     Input *imod = NULL;
@@ -91,7 +91,7 @@ open(Extension *key, gchar const *filename)
     if (!imod->prefs(filename))
         return NULL;
 
-    SPDocument *doc = imod->open(filename);
+    Document *doc = imod->open(filename);
     if (!doc) {
         throw Input::open_failed();
     }
@@ -184,7 +184,7 @@ open_internal(Extension *in_plug, gpointer in_data)
  * Lastly, the save function is called in the module itself.
  */
 void
-save(Extension *key, SPDocument *doc, gchar const *filename, bool setextension, bool check_overwrite, bool official)
+save(Extension *key, Document *doc, gchar const *filename, bool setextension, bool check_overwrite, bool official)
 {
     Output *omod;
     if (key == NULL) {