SPDocument->Document

(bzr r8408)

8 files changed, 25 insertions, 25 deletions

diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index e9f09f574..f42b29760 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -81,7 +81,7 @@ EntityLineEntry::~EntityLineEntry()
 }
 
 void 
-EntityLineEntry::update (SPDocument *doc)
+EntityLineEntry::update (Document *doc)
 {
     const char *text = rdf_get_work_entity (doc, _entity);
     static_cast<Gtk::Entry*>(_packable)->set_text (text ? text : "");
@@ -93,7 +93,7 @@ EntityLineEntry::on_changed()
     if (_wr->isUpdating()) return;
 
     _wr->setUpdating (true);
-    SPDocument *doc = SP_ACTIVE_DOCUMENT;
+    Document *doc = SP_ACTIVE_DOCUMENT;
     Glib::ustring text = static_cast<Gtk::Entry*>(_packable)->get_text();
     if (rdf_set_work_entity (doc, _entity, text.c_str()))
         sp_document_done (doc, SP_VERB_NONE, 
@@ -122,7 +122,7 @@ EntityMultiLineEntry::~EntityMultiLineEntry()
 }
 
 void 
-EntityMultiLineEntry::update (SPDocument *doc)
+EntityMultiLineEntry::update (Document *doc)
 {
     const char *text = rdf_get_work_entity (doc, _entity);
     Gtk::ScrolledWindow *s = static_cast<Gtk::ScrolledWindow*>(_packable);
@@ -136,7 +136,7 @@ EntityMultiLineEntry::on_changed()
     if (_wr->isUpdating()) return;
 
     _wr->setUpdating (true);
-    SPDocument *doc = SP_ACTIVE_DOCUMENT;
+    Document *doc = SP_ACTIVE_DOCUMENT;
     Gtk::ScrolledWindow *s = static_cast<Gtk::ScrolledWindow*>(_packable);
     Gtk::TextView *tv = static_cast<Gtk::TextView*>(s->get_child());
     Glib::ustring text = tv->get_buffer()->get_text();
diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index 6a817e30d..ead32b4b7 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -94,13 +94,13 @@ void ImageIcon::init()
 }
 
 
-bool ImageIcon::showSvgDocument(const SPDocument *docArg)
+bool ImageIcon::showSvgDocument(const Document *docArg)
 {
 
     if (document)
         sp_document_unref(document);
 
-    SPDocument *doc = (SPDocument *)docArg;
+    Document *doc = (Document *)docArg;
 
     sp_document_ref(doc);
     document = doc;
@@ -127,7 +127,7 @@ bool ImageIcon::showSvgFile(const Glib::ustring &theFileName)
 
     fileName = Glib::filename_to_utf8(fileName);
 
-    SPDocument *doc = sp_document_new (fileName.c_str(), 0);
+    Document *doc = sp_document_new (fileName.c_str(), 0);
     if (!doc) {
         g_warning("SVGView: error loading document '%s'\n", fileName.c_str());
         return false;
@@ -148,7 +148,7 @@ bool ImageIcon::showSvgFromMemory(const char *xmlBuffer)
         return false;
 
     gint len = (gint)strlen(xmlBuffer);
-    SPDocument *doc = sp_document_new_from_mem(xmlBuffer, len, 0);
+    Document *doc = sp_document_new_from_mem(xmlBuffer, len, 0);
     if (!doc) {
         g_warning("SVGView: error loading buffer '%s'\n",xmlBuffer);
         return false;
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index a5f1d89be..778fbc6cc 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -119,7 +119,7 @@ Licensor::init (Gtk::Tooltips& tt, Registry& wr)
 }
 
 void 
-Licensor::update (SPDocument *doc)
+Licensor::update (Document *doc)
 {
     /* identify the license info */
     struct rdf_license_t * license = rdf_get_license (doc);
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index bfc291bc0..1b4251143 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -117,7 +117,7 @@ ObjectCompositeSettings::_blendBlurValueChanged()
     if (!desktop) {
         return;
     }
-    SPDocument *document = sp_desktop_document (desktop);
+    Document *document = sp_desktop_document (desktop);
 
     if (_blocked)
         return;
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 02688a55e..429442779 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -346,7 +346,7 @@ PageSizer::setDim (double w, double h, bool changeList)
     _changedh_connection.block();
 
     if (SP_ACTIVE_DESKTOP && !_widgetRegistry->isUpdating()) {
-        SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
+        Document *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
         double const old_height = sp_document_height(doc);
         sp_document_set_width (doc, w, &_px_unit);
         sp_document_set_height (doc, h, &_px_unit);
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 93a950d1a..c2fafa001 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -566,7 +566,7 @@ Panel::setResponseSensitive(int response_id, bool setting)
         _response_map[response_id]->set_sensitive(setting);
 }
 
-sigc::signal<void, SPDesktop *, SPDocument *> &
+sigc::signal<void, SPDesktop *, Document *> &
 Panel::signalDocumentReplaced()
 {
     return _signal_document_replaced;
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 95ddec286..5780f74ed 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -50,7 +50,7 @@ RegisteredCheckButton::~RegisteredCheckButton()
     _toggled_connection.disconnect();
 }
 
-RegisteredCheckButton::RegisteredCheckButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right, Inkscape::XML::Node* repr_in, SPDocument *doc_in)
+RegisteredCheckButton::RegisteredCheckButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right, Inkscape::XML::Node* repr_in, Document *doc_in)
     : RegisteredWidget<Gtk::CheckButton>()
 {
     init_parent(key, wr, repr_in, doc_in);
@@ -108,7 +108,7 @@ RegisteredUnitMenu::~RegisteredUnitMenu()
     _changed_connection.disconnect();
 }
 
-RegisteredUnitMenu::RegisteredUnitMenu (const Glib::ustring& label, const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in)
+RegisteredUnitMenu::RegisteredUnitMenu (const Glib::ustring& label, const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, Document *doc_in)
     :  RegisteredWidget<Labelled> (label, "" /*tooltip*/, new UnitMenu())
 {
     init_parent(key, wr, repr_in, doc_in);
@@ -149,7 +149,7 @@ RegisteredScalarUnit::~RegisteredScalarUnit()
     _value_changed_connection.disconnect();
 }
 
-RegisteredScalarUnit::RegisteredScalarUnit (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, const RegisteredUnitMenu &rum, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in)
+RegisteredScalarUnit::RegisteredScalarUnit (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, const RegisteredUnitMenu &rum, Registry& wr, Inkscape::XML::Node* repr_in, Document *doc_in)
     : RegisteredWidget<ScalarUnit>(label, tip, UNIT_TYPE_LINEAR, "", "", rum.getUnitMenu()),
       _um(0)
 {
@@ -200,7 +200,7 @@ RegisteredScalar::~RegisteredScalar()
 
 RegisteredScalar::RegisteredScalar ( const Glib::ustring& label, const Glib::ustring& tip,
                          const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in,
-                         SPDocument * doc_in )
+                         Document * doc_in )
     : RegisteredWidget<Scalar>(label, tip)
 {
     init_parent(key, wr, repr_in, doc_in);
@@ -248,7 +248,7 @@ RegisteredText::~RegisteredText()
 
 RegisteredText::RegisteredText ( const Glib::ustring& label, const Glib::ustring& tip,
                          const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in,
-                         SPDocument * doc_in )
+                         Document * doc_in )
     : RegisteredWidget<Text>(label, tip)
 {
     init_parent(key, wr, repr_in, doc_in);
@@ -296,7 +296,7 @@ RegisteredColorPicker::RegisteredColorPicker(const Glib::ustring& label,
                                              const Glib::ustring& akey,
                                              Registry& wr,
                                              Inkscape::XML::Node* repr_in,
-                                             SPDocument *doc_in)
+                                             Document *doc_in)
     : RegisteredWidget<ColorPicker> (title, tip, 0, true)
 {
     init_parent("", wr, repr_in, doc_in);
@@ -337,7 +337,7 @@ RegisteredColorPicker::on_changed (guint32 rgba)
     // 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;
@@ -372,7 +372,7 @@ RegisteredSuffixedInteger::~RegisteredSuffixedInteger()
     _changed_connection.disconnect();
 }
 
-RegisteredSuffixedInteger::RegisteredSuffixedInteger (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& suffix, const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in)
+RegisteredSuffixedInteger::RegisteredSuffixedInteger (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& suffix, const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, Document *doc_in)
     : RegisteredWidget<Scalar>(label, tip, 0, suffix),
       setProgrammatically(false)
 {
@@ -419,7 +419,7 @@ RegisteredRadioButtonPair::~RegisteredRadioButtonPair()
 RegisteredRadioButtonPair::RegisteredRadioButtonPair (const Glib::ustring& label,
         const Glib::ustring& label1, const Glib::ustring& label2,
         const Glib::ustring& tip1, const Glib::ustring& tip2,
-        const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in)
+        const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, Document *doc_in)
     : RegisteredWidget<Gtk::HBox>(),
       _rb1(NULL),
       _rb2(NULL)
@@ -486,7 +486,7 @@ RegisteredPoint::~RegisteredPoint()
 
 RegisteredPoint::RegisteredPoint ( const Glib::ustring& label, const Glib::ustring& tip,
                         const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in,
-                        SPDocument* doc_in )
+                        Document* doc_in )
     : RegisteredWidget<Point> (label, tip)
 {
     init_parent(key, wr, repr_in, doc_in);
@@ -531,7 +531,7 @@ RegisteredTransformedPoint::~RegisteredTransformedPoint()
 
 RegisteredTransformedPoint::RegisteredTransformedPoint ( const Glib::ustring& label, const Glib::ustring& tip,
                         const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in,
-                        SPDocument* doc_in )
+                        Document* doc_in )
     : RegisteredWidget<Point> (label, tip),
       to_svg(Geom::identity())
 {
@@ -598,7 +598,7 @@ RegisteredRandom::~RegisteredRandom()
 
 RegisteredRandom::RegisteredRandom ( const Glib::ustring& label, const Glib::ustring& tip,
                          const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in,
-                         SPDocument * doc_in )
+                         Document * doc_in )
     : RegisteredWidget<Random> (label, tip)
 {
     init_parent(key, wr, repr_in, doc_in);
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 3a36127f4..bc5b45979 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -185,7 +185,7 @@ ToleranceSlider::update (double val)
 
     _wr->setUpdating (true);
 
-    SPDocument *doc = sp_desktop_document(dt);
+    Document *doc = sp_desktop_document(dt);
     bool saved = sp_document_get_undo_sensitive (doc);
     sp_document_set_undo_sensitive (doc, false);
     Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));