From a32c46f6d904b4cf75ea5cb133f49a2fea91a82b Mon Sep 17 00:00:00 2001 From: johnce Date: Wed, 5 Aug 2009 17:25:25 +0000 Subject: [PATCH] SPDocument->Document --- src/document.cpp | 2 +- src/extension/internal/gdkpixbuf-input.cpp | 2 +- src/file.cpp | 2 +- src/xml/repr-css.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/document.cpp b/src/document.cpp index 750b29301..4289205c1 100644 --- 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 2f52561d1..2aea1cc64 100644 --- 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 afca379ca..22425547e 100644 --- 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 be125f453..172cfa6f3 100644 --- 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); -- 2.30.2