SPDocument->Document

(bzr r8405)

4 files changed, 17 insertions, 17 deletions

diff --git a/src/helper/action.cpp b/src/helper/action.cpp
index 84d150615..8c2705e45 100644
--- a/src/helper/action.cpp
+++ b/src/helper/action.cpp
@@ -132,7 +132,7 @@ public:
     {
         _addProperty(share_static_string("timestamp"), timestamp());
         if (action->view) {
-            SPDocument *document = action->view->doc();
+            Document *document = action->view->doc();
             if (document) {
                 _addProperty(share_static_string("document"), document->serial());
             }
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index f41342e42..1e364a37c 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -66,7 +66,7 @@ hide_other_items_recursively(SPObject *o, GSList *list, unsigned dkey)
 // to the call for the interface to the png writing.
 
 bool
-sp_export_jpg_file(SPDocument *doc, gchar const *filename,
+sp_export_jpg_file(Document *doc, gchar const *filename,
                    double x0, double y0, double x1, double y1,
                    unsigned width, unsigned height, double xdpi, double ydpi,
                    unsigned long bgcolor, double quality,GSList *items)
@@ -90,7 +90,7 @@ sp_export_jpg_file(SPDocument *doc, gchar const *filename,
 }
 
 GdkPixbuf*
-sp_generate_internal_bitmap(SPDocument *doc, gchar const */*filename*/,
+sp_generate_internal_bitmap(Document *doc, gchar const */*filename*/,
                             double x0, double y0, double x1, double y1,
                             unsigned width, unsigned height, double xdpi, double ydpi,
                             unsigned long bgcolor,
diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
index 3ac900680..ad1b43c55 100644
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
@@ -120,7 +120,7 @@ void PngTextList::add(gchar const* key, gchar const* text)
 }
 
 static bool
-sp_png_write_rgba_striped(SPDocument *doc,
+sp_png_write_rgba_striped(Document *doc,
                           gchar const *filename, unsigned long int width, unsigned long int height, double xdpi, double ydpi,
                           int (* get_rows)(guchar const **rows, int row, int num_rows, void *data),
                           void *data)
@@ -388,7 +388,7 @@ hide_other_items_recursively(SPObject *o, GSList *list, unsigned dkey)
  *
  * \return true if succeeded (or if no action was taken), false if an error occurred.
  */
-bool sp_export_png_file (SPDocument *doc, gchar const *filename,
+bool sp_export_png_file (Document *doc, gchar const *filename,
                    double x0, double y0, double x1, double y1,
                    unsigned long int width, unsigned long int height, double xdpi, double ydpi,
                    unsigned long bgcolor,
@@ -400,7 +400,7 @@ bool sp_export_png_file (SPDocument *doc, gchar const *filename,
                               width, height, xdpi, ydpi, bgcolor, status, data, force_overwrite, items_only);
 }
 bool
-sp_export_png_file(SPDocument *doc, gchar const *filename,
+sp_export_png_file(Document *doc, gchar const *filename,
                    Geom::Rect const &area,
                    unsigned long width, unsigned long height, double xdpi, double ydpi,
                    unsigned long bgcolor,
diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp
index 575197fee..936397480 100644
--- a/src/helper/stock-items.cpp
+++ b/src/helper/stock-items.cpp
@@ -35,9 +35,9 @@
 
 
 
-static SPObject *sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc);
-static SPObject *sp_marker_load_from_svg(gchar const *name, SPDocument *current_doc);
-static SPObject *sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc);
+static SPObject *sp_gradient_load_from_svg(gchar const *name, Document *current_doc);
+static SPObject *sp_marker_load_from_svg(gchar const *name, Document *current_doc);
+static SPObject *sp_gradient_load_from_svg(gchar const *name, Document *current_doc);
 
 
 // FIXME: these should be merged with the icon loading code so they
@@ -45,9 +45,9 @@ static SPObject *sp_gradient_load_from_svg(gchar const *name, SPDocument *curren
 // take the dir to look in, and the file to check for, and cache
 // against that, rather than the existing copy/paste code seen here.
 
-static SPObject * sp_marker_load_from_svg(gchar const *name, SPDocument *current_doc)
+static SPObject * sp_marker_load_from_svg(gchar const *name, Document *current_doc)
 {
-    static SPDocument *doc = NULL;
+    static Document *doc = NULL;
     static unsigned int edoc = FALSE;
     if (!current_doc) {
         return NULL;
@@ -83,9 +83,9 @@ static SPObject * sp_marker_load_from_svg(gchar const *name, SPDocument *current
 
 
 static SPObject *
-sp_pattern_load_from_svg(gchar const *name, SPDocument *current_doc)
+sp_pattern_load_from_svg(gchar const *name, Document *current_doc)
 {
-    static SPDocument *doc = NULL;
+    static Document *doc = NULL;
     static unsigned int edoc = FALSE;
     if (!current_doc) {
         return NULL;
@@ -126,9 +126,9 @@ sp_pattern_load_from_svg(gchar const *name, SPDocument *current_doc)
 
 
 static SPObject *
-sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc)
+sp_gradient_load_from_svg(gchar const *name, Document *current_doc)
 {
-    static SPDocument *doc = NULL;
+    static Document *doc = NULL;
     static unsigned int edoc = FALSE;
     if (!current_doc) {
         return NULL;
@@ -194,7 +194,7 @@ SPObject *get_stock_item(gchar const *urn)
         gchar * base = g_strndup(e, a);
 
         SPDesktop *desktop = inkscape_active_desktop();
-        SPDocument *doc = sp_desktop_document(desktop);
+        Document *doc = sp_desktop_document(desktop);
         SPDefs *defs= (SPDefs *) SP_DOCUMENT_DEFS(doc);
 
         SPObject *object = NULL;
@@ -263,7 +263,7 @@ SPObject *get_stock_item(gchar const *urn)
     else {
         
         SPDesktop *desktop = inkscape_active_desktop();
-        SPDocument *doc = sp_desktop_document(desktop);
+        Document *doc = sp_desktop_document(desktop);
         SPObject *object = doc->getObjectById(urn);
 
         return object;