summaryrefslogtreecommitdiffstats
path: root/src/extension/internal
diff options
context:
space:
mode:
authorjohnce <johnce@users.sourceforge.net>2009-08-05 06:38:07 +0000
committerjohnce <johnce@users.sourceforge.net>2009-08-05 06:38:07 +0000
commit4cd79453c07adefb912a4dbd0afb2e7c2722bd90 (patch)
tree66389573099d623138a62cb88f082ccbadc0c11e /src/extension/internal
parentSPDocument->Document (diff)
downloadinkscape-4cd79453c07adefb912a4dbd0afb2e7c2722bd90.tar.gz
inkscape-4cd79453c07adefb912a4dbd0afb2e7c2722bd90.zip
SPDocument->Document
(bzr r8408)
Diffstat (limited to 'src/extension/internal')
-rw-r--r--src/extension/internal/bitmap/imagemagick.cpp2
-rw-r--r--src/extension/internal/cairo-png-out.cpp4
-rw-r--r--src/extension/internal/cairo-ps-out.cpp6
-rw-r--r--src/extension/internal/cairo-render-context.cpp2
-rw-r--r--src/extension/internal/cairo-renderer-pdf-out.cpp4
-rw-r--r--src/extension/internal/cairo-renderer.cpp4
-rw-r--r--src/extension/internal/emf-win32-inout.cpp8
-rw-r--r--src/extension/internal/emf-win32-print.cpp2
-rw-r--r--src/extension/internal/gdkpixbuf-input.cpp4
-rw-r--r--src/extension/internal/gimpgrad.cpp4
-rw-r--r--src/extension/internal/grid.cpp4
-rw-r--r--src/extension/internal/javafx-out.cpp10
-rw-r--r--src/extension/internal/latex-pstricks-out.cpp2
-rw-r--r--src/extension/internal/latex-pstricks.cpp2
-rw-r--r--src/extension/internal/odf.cpp2
-rw-r--r--src/extension/internal/pdf-input-cairo.cpp4
-rw-r--r--src/extension/internal/pdfinput/pdf-input.cpp4
-rw-r--r--src/extension/internal/pdfinput/svg-builder.cpp2
-rw-r--r--src/extension/internal/pov-out.cpp8
-rw-r--r--src/extension/internal/svg.cpp8
-rw-r--r--src/extension/internal/win32.cpp2
-rw-r--r--src/extension/internal/wpg-input.cpp4
22 files changed, 46 insertions, 46 deletions
diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index e907612fd..75d53927d 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -221,7 +221,7 @@ ImageMagick::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::Vi
Gtk::Widget *
ImageMagick::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * /*docCache*/)
{
- SPDocument * current_document = view->doc();
+ Document * current_document = view->doc();
using Inkscape::Util::GSListConstIterator;
GSListConstIterator<SPItem *> selected = sp_desktop_selection((SPDesktop *)view)->itemList();
diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp
index c81fdd029..d849755b7 100644
--- a/src/extension/internal/cairo-png-out.cpp
+++ b/src/extension/internal/cairo-png-out.cpp
@@ -48,7 +48,7 @@ CairoRendererOutput::check (Inkscape::Extension::Extension * module)
}
static bool
-png_render_document_to_file(SPDocument *doc, gchar const *filename)
+png_render_document_to_file(Document *doc, gchar const *filename)
{
CairoRenderer *renderer;
CairoRenderContext *ctx;
@@ -92,7 +92,7 @@ png_render_document_to_file(SPDocument *doc, gchar const *filename)
\param uri Filename to save to (probably will end in .png)
*/
void
-CairoRendererOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
+CairoRendererOutput::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
{
if (!png_render_document_to_file(doc, filename))
throw Inkscape::Extension::Output::save_failed();
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index dff89c1ed..d9cac666c 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -61,7 +61,7 @@ CairoEpsOutput::check (Inkscape::Extension::Extension * module)
}
static bool
-ps_print_document_to_file(SPDocument *doc, gchar const *filename, unsigned int level, bool texttopath, bool filtertobitmap, int resolution, const gchar * const exportId, bool exportDrawing, bool exportCanvas, bool eps = false)
+ps_print_document_to_file(Document *doc, gchar const *filename, unsigned int level, bool texttopath, bool filtertobitmap, int resolution, const gchar * const exportId, bool exportDrawing, bool exportCanvas, bool eps = false)
{
sp_document_ensure_up_to_date(doc);
@@ -124,7 +124,7 @@ ps_print_document_to_file(SPDocument *doc, gchar const *filename, unsigned int l
\param filename Filename to save to (probably will end in .ps)
*/
void
-CairoPsOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
+CairoPsOutput::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
{
Inkscape::Extension::Extension * ext;
unsigned int ret;
@@ -188,7 +188,7 @@ CairoPsOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar con
\param filename Filename to save to (probably will end in .ps)
*/
void
-CairoEpsOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
+CairoEpsOutput::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
{
Inkscape::Extension::Extension * ext;
unsigned int ret;
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index d1462e52e..28cf406f2 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -811,7 +811,7 @@ CairoRenderContext::_finishSurfaceSetup(cairo_surface_t *surface, cairo_matrix_t
cairo_scale(_cr, PT_PER_PX, PT_PER_PX);
} else if (cairo_surface_get_content(_surface) != CAIRO_CONTENT_ALPHA) {
// set background color on non-alpha surfaces
- // TODO: bgcolor should be derived from SPDocument
+ // TODO: bgcolor should be derived from Document
cairo_set_source_rgb(_cr, 1.0, 1.0, 1.0);
cairo_rectangle(_cr, 0, 0, _width, _height);
cairo_fill(_cr);
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index b44e83449..1e5404c50 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -47,7 +47,7 @@ CairoRendererPdfOutput::check (Inkscape::Extension::Extension * module)
}
static bool
-pdf_render_document_to_file(SPDocument *doc, gchar const *filename, unsigned int level,
+pdf_render_document_to_file(Document *doc, gchar const *filename, unsigned int level,
bool texttopath, bool filtertobitmap, int resolution,
const gchar * const exportId, bool exportDrawing, bool exportCanvas)
{
@@ -118,7 +118,7 @@ pdf_render_document_to_file(SPDocument *doc, gchar const *filename, unsigned int
tell the printing system to save to file.
*/
void
-CairoRendererPdfOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
+CairoRendererPdfOutput::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
{
Inkscape::Extension::Extension * ext;
unsigned int ret;
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index da88a5eae..3414993e5 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -460,7 +460,7 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx)
Geom::Matrix t = t_on_document * t_item.inverse();
// Do the export
- SPDocument *document = SP_OBJECT(item)->document;
+ Document *document = SP_OBJECT(item)->document;
GSList *items = NULL;
items = g_slist_append(items, item);
@@ -567,7 +567,7 @@ CairoRenderer::renderItem(CairoRenderContext *ctx, SPItem *item)
}
bool
-CairoRenderer::setupDocument(CairoRenderContext *ctx, SPDocument *doc, bool pageBoundingBox, SPItem *base)
+CairoRenderer::setupDocument(CairoRenderContext *ctx, Document *doc, bool pageBoundingBox, SPItem *base)
{
g_assert( ctx != NULL );
diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp
index f400a3649..ffba5af81 100644
--- a/src/extension/internal/emf-win32-inout.cpp
+++ b/src/extension/internal/emf-win32-inout.cpp
@@ -101,7 +101,7 @@ EmfWin32::check (Inkscape::Extension::Extension * /*module*/)
static void
-emf_print_document_to_file(SPDocument *doc, gchar const *filename)
+emf_print_document_to_file(Document *doc, gchar const *filename)
{
Inkscape::Extension::Print *mod;
SPPrintContext context;
@@ -147,7 +147,7 @@ emf_print_document_to_file(SPDocument *doc, gchar const *filename)
void
-EmfWin32::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
+EmfWin32::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
{
Inkscape::Extension::Extension * ext;
@@ -2162,7 +2162,7 @@ typedef struct
#pragma pack( pop )
-SPDocument *
+Document *
EmfWin32::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri )
{
EMF_CALLBACK_DATA d;
@@ -2365,7 +2365,7 @@ EmfWin32::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri )
// std::cout << "SVG Output: " << std::endl << *(d.outsvg) << std::endl;
- SPDocument *doc = sp_document_new_from_mem(d.outsvg->c_str(), d.outsvg->length(), TRUE);
+ Document *doc = sp_document_new_from_mem(d.outsvg->c_str(), d.outsvg->length(), TRUE);
delete d.outsvg;
delete d.path;
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp
index d098f6466..822a0577b 100644
--- a/src/extension/internal/emf-win32-print.cpp
+++ b/src/extension/internal/emf-win32-print.cpp
@@ -116,7 +116,7 @@ PrintEmfWin32::setup (Inkscape::Extension::Print * /*mod*/)
unsigned int
-PrintEmfWin32::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
+PrintEmfWin32::begin (Inkscape::Extension::Print *mod, Document *doc)
{
gchar const *utf8_fn = mod->get_param_string("destination");
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index 64a099c8a..2f52561d1 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -16,10 +16,10 @@ GdkPixbuf* pixbuf_new_from_file( char const *utf8name, GError **error );
namespace Extension {
namespace Internal {
-SPDocument *
+Document *
GdkpixbufInput::open(Inkscape::Extension::Input */*mod*/, char const *uri)
{
- SPDocument *doc = NULL;
+ PDocument *doc = NULL;
GdkPixbuf *pb = Inkscape::IO::pixbuf_new_from_file( uri, NULL );
if (pb) { /* We are readable */
diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp
index 5b3e0c16e..9510b5ebd 100644
--- a/src/extension/internal/gimpgrad.cpp
+++ b/src/extension/internal/gimpgrad.cpp
@@ -95,7 +95,7 @@ stop_svg(ColorRGBA const in_color, double const location)
}
/**
- \brief Actually open the gradient and turn it into an SPDocument
+ \brief Actually open the gradient and turn it into an Document
\param module The input module being used
\param filename The filename of the gradient to be opened
\return A Document with the gradient in it.
@@ -129,7 +129,7 @@ stop_svg(ColorRGBA const in_color, double const location)
document using the \c sp_document_from_mem. That is then returned
to Inkscape.
*/
-SPDocument *
+Document *
GimpGrad::open (Inkscape::Extension::Input */*module*/, gchar const *filename)
{
Inkscape::IO::dump_fopen_call(filename, "I");
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index d4b35b261..5a0523ba8 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -81,7 +81,7 @@ Grid::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc
Geom::Rect bounding_area = Geom::Rect(Geom::Point(0,0), Geom::Point(100,100));
if (selection->isEmpty()) {
/* get page size */
- SPDocument * doc = document->doc();
+ Document * doc = document->doc();
bounding_area = Geom::Rect( Geom::Point(0,0),
Geom::Point(sp_document_width(doc), sp_document_height(doc)) );
} else {
@@ -171,7 +171,7 @@ PrefAdjustment::val_changed (void)
Gtk::Widget *
Grid::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * /*docCache*/)
{
- SPDocument * current_document = view->doc();
+ Document * current_document = view->doc();
using Inkscape::Util::GSListConstIterator;
GSListConstIterator<SPItem *> selected = sp_desktop_selection((SPDesktop *)view)->itemList();
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index 417755e19..c1f057071 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -701,7 +701,7 @@ bool JavaFXOutput::doCurve(SPItem *item, const String &id)
/**
* Output the tree data to buffer
*/
-bool JavaFXOutput::doTreeRecursive(SPDocument *doc, SPObject *obj)
+bool JavaFXOutput::doTreeRecursive(Document *doc, SPObject *obj)
{
/**
* Check the type of node and process
@@ -749,7 +749,7 @@ bool JavaFXOutput::doTreeRecursive(SPDocument *doc, SPObject *obj)
/**
* Output the curve data to buffer
*/
-bool JavaFXOutput::doTree(SPDocument *doc)
+bool JavaFXOutput::doTree(Document *doc)
{
double bignum = 1000000.0;
@@ -767,7 +767,7 @@ bool JavaFXOutput::doTree(SPDocument *doc)
}
-bool JavaFXOutput::doBody(SPDocument *doc, SPObject *obj)
+bool JavaFXOutput::doBody(Document *doc, SPObject *obj)
{
/**
* Check the type of node and process
@@ -842,7 +842,7 @@ void JavaFXOutput::reset()
/**
* Saves the <paths> of an Inkscape SVG file as JavaFX spline definitions
*/
-bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
+bool JavaFXOutput::saveDocument(Document *doc, gchar const *filename_utf8)
{
reset();
@@ -918,7 +918,7 @@ bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
*/
void
JavaFXOutput::save(Inkscape::Extension::Output */*mod*/,
- SPDocument *doc, gchar const *filename_utf8)
+ Document *doc, gchar const *filename_utf8)
{
/* N.B. The name `filename_utf8' represents the fact that we want it to be in utf8; whereas in
* fact we know that some callers of Extension::save pass something in the filesystem's
diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp
index 4a469a750..924f9697e 100644
--- a/src/extension/internal/latex-pstricks-out.cpp
+++ b/src/extension/internal/latex-pstricks-out.cpp
@@ -47,7 +47,7 @@ LatexOutput::check (Inkscape::Extension::Extension * module)
void
-LatexOutput::save(Inkscape::Extension::Output *mod2, SPDocument *doc, gchar const *filename)
+LatexOutput::save(Inkscape::Extension::Output *mod2, Document *doc, gchar const *filename)
{
Inkscape::Extension::Print *mod;
SPPrintContext context;
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index 789e5ea34..afc985e14 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -64,7 +64,7 @@ PrintLatex::setup (Inkscape::Extension::Print *mod)
}
unsigned int
-PrintLatex::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
+PrintLatex::begin (Inkscape::Extension::Print *mod, Document *doc)
{
Inkscape::SVGOStringStream os;
int res;
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index cc8489302..e7e22414a 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -2367,7 +2367,7 @@ OdfOutput::reset()
* Descends into the SVG tree, mapping things to ODF when appropriate
*/
void
-OdfOutput::save(Inkscape::Extension::Output */*mod*/, SPDocument *doc, gchar const *filename)
+OdfOutput::save(Inkscape::Extension::Output */*mod*/, Document *doc, gchar const *filename)
{
reset();
diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp
index 937fefb11..76759259d 100644
--- a/src/extension/internal/pdf-input-cairo.cpp
+++ b/src/extension/internal/pdf-input-cairo.cpp
@@ -32,7 +32,7 @@ namespace Internal {
static cairo_status_t _write_ustring_cb(void *closure, const unsigned char *data, unsigned int length);
-SPDocument *
+Document *
PdfInputCairo::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
printf("Attempting to open using PdfInputCairo\n");
@@ -58,7 +58,7 @@ PdfInputCairo::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
cairo_destroy(cr);
cairo_surface_destroy(surface);
- SPDocument * doc = sp_document_new_from_mem(output->c_str(), output->length(), TRUE);
+ Document * doc = sp_document_new_from_mem(output->c_str(), output->length(), TRUE);
delete output;
g_object_unref(page);
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index c2d417f2c..476f0daf6 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -589,7 +589,7 @@ void PdfImportDialog::_setPreviewPage(int page) {
/**
* Parses the selected page of the given PDF document using PdfParser.
*/
-SPDocument *
+Document *
PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
// Initialize the globalParams variable for poppler
@@ -661,7 +661,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
Catalog *catalog = pdf_doc->getCatalog();
Page *page = catalog->getPage(page_num);
- SPDocument *doc = sp_document_new(NULL, TRUE, TRUE);
+ Document *doc = sp_document_new(NULL, TRUE, TRUE);
bool saved = sp_document_get_undo_sensitive(doc);
sp_document_set_undo_sensitive(doc, false); // No need to undo in this temporary document
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 00bd8fa4d..686e44bb1 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -77,7 +77,7 @@ struct SvgTransparencyGroup {
*
*/
-SvgBuilder::SvgBuilder(SPDocument *document, gchar *docname, XRef *xref) {
+SvgBuilder::SvgBuilder(Document *document, gchar *docname, XRef *xref) {
_is_top_level = true;
_doc = document;
_docname = docname;
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index f30cbc317..d3ed39d1f 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -417,7 +417,7 @@ bool PovOutput::doCurve(SPItem *item, const String &id)
/**
* Descend the svg tree recursively, translating data
*/
-bool PovOutput::doTreeRecursive(SPDocument *doc, SPObject *obj)
+bool PovOutput::doTreeRecursive(Document *doc, SPObject *obj)
{
String id;
@@ -454,7 +454,7 @@ bool PovOutput::doTreeRecursive(SPDocument *doc, SPObject *obj)
/**
* Output the curve data to buffer
*/
-bool PovOutput::doTree(SPDocument *doc)
+bool PovOutput::doTree(Document *doc)
{
double bignum = 1000000.0;
minx = bignum;
@@ -576,7 +576,7 @@ void PovOutput::reset()
/**
* Saves the Shapes of an Inkscape SVG file as PovRay spline definitions
*/
-void PovOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
+void PovOutput::saveDocument(Document *doc, gchar const *filename_utf8)
{
reset();
@@ -641,7 +641,7 @@ void PovOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
*/
void
PovOutput::save(Inkscape::Extension::Output */*mod*/,
- SPDocument *doc, gchar const *filename_utf8)
+ Document *doc, gchar const *filename_utf8)
{
/* See comments in JavaFSOutput::save re the name `filename_utf8'. */
saveDocument(doc, filename_utf8);
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index a3589e905..317811088 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -138,13 +138,13 @@ _load_uri (const gchar *uri)
/**
\return A new document just for you!
\brief This function takes in a filename of a SVG document and
- turns it into a SPDocument.
+ turns it into a Document.
\param mod Module to use
\param uri The path to the file (UTF-8)
This function is really simple, it just calls sp_document_new...
*/
-SPDocument *
+Document *
Svg::open (Inkscape::Extension::Input */*mod*/, const gchar *uri)
{
#ifdef WITH_GNOME_VFS
@@ -157,7 +157,7 @@ Svg::open (Inkscape::Extension::Input */*mod*/, const gchar *uri)
g_warning("Error: Could not open file '%s' with VFS\n", uri);
return NULL;
}
- SPDocument * doc = sp_document_new_from_mem(buffer, strlen(buffer), 1);
+ Document * doc = sp_document_new_from_mem(buffer, strlen(buffer), 1);
g_free(buffer);
return doc;
@@ -191,7 +191,7 @@ Svg::open (Inkscape::Extension::Input */*mod*/, const gchar *uri)
all of this code. I just stole it.
*/
void
-Svg::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
+Svg::save(Inkscape::Extension::Output *mod, Document *doc, gchar const *filename)
{
g_return_if_fail(doc != NULL);
g_return_if_fail(filename != NULL);
diff --git a/src/extension/internal/win32.cpp b/src/extension/internal/win32.cpp
index 21f278858..f272292b5 100644
--- a/src/extension/internal/win32.cpp
+++ b/src/extension/internal/win32.cpp
@@ -215,7 +215,7 @@ PrintWin32::setup (Inkscape::Extension::Print *mod)
}
unsigned int
-PrintWin32::begin (Inkscape::Extension::Print *mod, SPDocument *doc)
+PrintWin32::begin (Inkscape::Extension::Print *mod, Document *doc)
{
DOCINFO di = {
sizeof (DOCINFO),
diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index c37d5705b..e7177e5e3 100644
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -59,7 +59,7 @@ namespace Extension {
namespace Internal {
-SPDocument *
+Document *
WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) {
WPXInputStream* input = new libwpg::WPGFileStream(uri);
if (input->isOLEStream()) {
@@ -86,7 +86,7 @@ WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) {
//printf("I've got a doc: \n%s", painter.document.c_str());
- SPDocument * doc = sp_document_new_from_mem(output.cstr(), strlen(output.cstr()), TRUE);
+ Document * doc = sp_document_new_from_mem(output.cstr(), strlen(output.cstr()), TRUE);
delete input;
return doc;
}