SPDocument->Document

(bzr r8405)

3 files changed, 17 insertions, 17 deletions

diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 55884fe4a..cd690a0d4 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -841,7 +841,7 @@ static NRArena const *trace_arena = NULL;
 static unsigned trace_visionkey;
 static NRArenaItem *trace_root;
 static gdouble trace_zoom;
-static SPDocument *trace_doc;
+static Document *trace_doc;
 
 static void
 clonetiler_trace_hide_tiled_clones_recursively (SPObject *from)
@@ -857,7 +857,7 @@ clonetiler_trace_hide_tiled_clones_recursively (SPObject *from)
 }
 
 static void
-clonetiler_trace_setup (SPDocument *doc, gdouble zoom, SPItem *original)
+clonetiler_trace_setup (Document *doc, gdouble zoom, SPItem *original)
 {
     trace_arena = NRArena::create();
     /* Create ArenaItem and set transform */
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 0cde76657..56d50596c 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -538,7 +538,7 @@ sp_export_dialog (void)
             if (SP_ACTIVE_DOCUMENT && SP_DOCUMENT_URI (SP_ACTIVE_DOCUMENT))
             {
                 gchar *name;
-                SPDocument * doc = SP_ACTIVE_DOCUMENT;
+                Document * doc = SP_ACTIVE_DOCUMENT;
                 const gchar *uri = SP_DOCUMENT_URI (doc);
                 Inkscape::XML::Node * repr = sp_document_repr_root(doc);
                 const gchar * text_extension = repr->attribute("inkscape:output_extension");
@@ -779,7 +779,7 @@ sp_export_selection_modified ( Inkscape::Application */*inkscape*/,
     switch (current_key) {
         case SELECTION_DRAWING:
             if ( SP_ACTIVE_DESKTOP ) {
-                SPDocument *doc;
+                Document *doc;
                 doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
                 Geom::OptRect bbox = sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc)));
                 if (bbox) {
@@ -839,7 +839,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
 
     if ( SP_ACTIVE_DESKTOP )
     {
-        SPDocument *doc;
+        Document *doc;
         Geom::OptRect bbox;
         doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
 
@@ -906,7 +906,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
         switch (key) {
             case SELECTION_PAGE:
             case SELECTION_DRAWING: {
-                SPDocument * doc = SP_ACTIVE_DOCUMENT;
+                Document * doc = SP_ACTIVE_DOCUMENT;
                 sp_document_get_export_hints (doc, &filename, &xdpi, &ydpi);
 
                 if (filename == NULL) {
@@ -1213,7 +1213,7 @@ sp_export_export_clicked (GtkButton */*button*/, GtkObject *base)
     switch ((selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")))) {
         case SELECTION_PAGE:
         case SELECTION_DRAWING: {
-            SPDocument * doc = SP_ACTIVE_DOCUMENT;
+            Document * doc = SP_ACTIVE_DOCUMENT;
             Inkscape::XML::Node * repr = sp_document_repr_root(doc);
             bool modified = false;
             const gchar * temp_string;
@@ -1245,7 +1245,7 @@ sp_export_export_clicked (GtkButton */*button*/, GtkObject *base)
         }
         case SELECTION_SELECTION: {
             const GSList * reprlst;
-            SPDocument * doc = SP_ACTIVE_DOCUMENT;
+            Document * doc = SP_ACTIVE_DOCUMENT;
             bool modified = false;
 
             bool saved = sp_document_get_undo_sensitive(doc);
@@ -1466,7 +1466,7 @@ sp_export_detect_size(GtkObject * base) {
                 }
                 break;
             case SELECTION_DRAWING: {
-                SPDocument *doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
+                Document *doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
 
                 Geom::OptRect bbox = sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc)));
 
@@ -1478,7 +1478,7 @@ sp_export_detect_size(GtkObject * base) {
             }
 
             case SELECTION_PAGE: {
-                SPDocument *doc;
+                Document *doc;
 
                 doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
 
diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp
index c8644fef9..32dee453a 100644
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
@@ -69,7 +69,7 @@ static SPXMLViewContent *content = NULL;
 
 static gint blocked = 0;
 static SPDesktop *current_desktop = NULL;
-static SPDocument *current_document = NULL;
+static Document *current_document = NULL;
 static gint selected_attr = 0;
 static Inkscape::XML::Node *selected_repr = NULL;
 
@@ -77,7 +77,7 @@ static void sp_xmltree_desktop_activate( Inkscape::Application *inkscape,  SPDes
 static void sp_xmltree_desktop_deactivate( Inkscape::Application *inkscape,  SPDesktop *desktop, GtkWidget *dialog );
 
 static void set_tree_desktop(SPDesktop *desktop);
-static void set_tree_document(SPDocument *document);
+static void set_tree_document(Document *document);
 static void set_tree_repr(Inkscape::XML::Node *repr);
 
 static void set_tree_select(Inkscape::XML::Node *repr);
@@ -119,8 +119,8 @@ static void on_attr_unselect_row_clear_text(GtkCList *list, gint row, gint colum
 static void on_editable_changed_enable_if_valid_xml_name(GtkEditable *editable, gpointer data);
 
 static void on_desktop_selection_changed(Inkscape::Selection *selection);
-static void on_document_replaced(SPDesktop *dt, SPDocument *document);
-static void on_document_uri_set(gchar const *uri, SPDocument *document);
+static void on_document_replaced(SPDesktop *dt, Document *document);
+static void on_document_uri_set(gchar const *uri, Document *document);
 
 static void on_clicked_get_editable_text(GtkWidget *widget, gpointer data);
 
@@ -666,7 +666,7 @@ void set_tree_desktop(SPDesktop *desktop)
 
 
 
-void set_tree_document(SPDocument *document)
+void set_tree_document(Document *document)
 {
     if (document == current_document) {
         return;
@@ -1262,7 +1262,7 @@ void on_desktop_selection_changed(Inkscape::Selection */*selection*/)
     blocked--;
 }
 
-static void on_document_replaced(SPDesktop *dt, SPDocument *doc)
+static void on_document_replaced(SPDesktop *dt, Document *doc)
 {
     if (current_desktop)
         sel_changed_connection.disconnect();
@@ -1271,7 +1271,7 @@ static void on_document_replaced(SPDesktop *dt, SPDocument *doc)
     set_tree_document(doc);
 }
 
-void on_document_uri_set(gchar const */*uri*/, SPDocument *document)
+void on_document_uri_set(gchar const */*uri*/, Document *document)
 {
     gchar title[500];
     sp_ui_dialog_title_string(Inkscape::Verb::get(SP_VERB_DIALOG_XML_EDITOR), title);