SPDocument->Document

diff --git a/src/document.cpp b/src/document.cpp
index 750b2930120649f74f0506a3ee3f81b0220103b3..4289205c121b45d9223c75a4d728983a6e975165 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -638,7 +638,7 @@ do_change_uri(Document *const document, gchar const *const filename, bool const
     sp_document_set_undo_sensitive(document, false);
 
     if (rebase) {
-        Inkscape::XML::rebase_hrefs(document, new_base, true);
+        Inkscape::XML::rebase_hrefs((Inkscape::XML::Document *)document, new_base, true);
     }
 
     repr->setAttribute("sodipodi:docname", document->name);

diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index 2f52561d117f959a432e533bd3fd68628883dc3b..2aea1cc6449942bf9d636edf33a2310a28021f6c 100644 (file)
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -19,7 +19,7 @@ namespace Internal {
 Document *
 GdkpixbufInput::open(Inkscape::Extension::Input */*mod*/, char const *uri)
 {
-    PDocument *doc = NULL;
+    Document *doc = NULL;
     GdkPixbuf *pb = Inkscape::IO::pixbuf_new_from_file( uri, NULL );
 
     if (pb) {         /* We are readable */

diff --git a/src/file.cpp b/src/file.cpp
index afca379ca58e0b024e6fa5cee6d34591a9398c77..22425547e33669d21d77afce7edf6e4a54591fd9 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -1070,7 +1070,7 @@ file_import(Document *in_doc, const Glib::ustring &uri,
     }
 
     if (doc != NULL) {
-        Inkscape::XML::rebase_hrefs(doc, in_doc->base, true);
+        Inkscape::XML::rebase_hrefs((Inkscape::XML::Document *)doc, in_doc->base, true);
         Inkscape::XML::Document *xml_in_doc = sp_document_repr_doc(in_doc);
 
         prevent_id_clashes(doc, in_doc);

diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index be125f45358481f40259bb75bbc6ad297897872f..172cfa6f3f68694d47f99e24b963adf1e5c387b0 100644 (file)
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -18,7 +18,7 @@ using Inkscape::XML::AttributeRecord;
 using Inkscape::XML::SimpleNode;
 using Inkscape::XML::Node;
 using Inkscape::XML::NodeType;
-using Inkscape::XML::Document;
+//using Inkscape::XML::Document;
 
 struct SPCSSAttrImpl : public SimpleNode, public SPCSSAttr {
 public:
@@ -30,7 +30,7 @@ public:
     NodeType type() const { return Inkscape::XML::ELEMENT_NODE; }
 
 protected:
-    SimpleNode *_duplicate(Document* doc) const { return new SPCSSAttrImpl(*this, doc); }
+    SimpleNode *_duplicate(Inkscape::XML::Document* doc) const { return new SPCSSAttrImpl(*this, doc); }
 };
 
 static void sp_repr_css_add_components(SPCSSAttr *css, Node *repr, gchar const *attr);