SPDocument->Document

(bzr r8407)

9 files changed, 14 insertions, 14 deletions

diff --git a/src/ui/dialog/document-metadata.h b/src/ui/dialog/document-metadata.h
index 7f718e9f7..2bc94836b 100644
--- a/src/ui/dialog/document-metadata.h
+++ b/src/ui/dialog/document-metadata.h
@@ -49,7 +49,7 @@ protected:
     void  build_metadata();
     void  init();
 
-    void _handleDocumentReplaced(SPDesktop* desktop, SPDocument *document);
+    void _handleDocumentReplaced(SPDesktop* desktop, Document *document);
     void _handleActivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
     void _handleDeactivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
 
diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index 136ae2c89..5aa8d446d 100644
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -70,7 +70,7 @@ protected:
     void  removeExternalScript();
     void  scripting_create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem);
 
-    void _handleDocumentReplaced(SPDesktop* desktop, SPDocument *document);
+    void _handleDocumentReplaced(SPDesktop* desktop, Document *document);
     void _handleActivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
     void _handleDeactivateDesktop(Inkscape::Application *application, SPDesktop *desktop);
 
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h
index 90dddce59..bd0477b30 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.h
+++ b/src/ui/dialog/filedialogimpl-gtkmm.h
@@ -99,7 +99,7 @@ public:
 
     ~SVGPreview();
 
-    bool setDocument(SPDocument *doc);
+    bool setDocument(Document *doc);
 
     bool setFileName(Glib::ustring &fileName);
 
@@ -128,7 +128,7 @@ private:
     /**
      * The svg document we are currently showing
      */
-    SPDocument *document;
+    Document *document;
 
     /**
      * The sp_svg_view widget
diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 3fb9a46fb..28c714905 100644
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -88,7 +88,7 @@ private:
 
         static void on_activate_desktop(Application*, SPDesktop*, FilterModifier*);
         static void on_deactivate_desktop(Application*, SPDesktop*, FilterModifier*);
-        void on_document_replaced(SPDesktop*, SPDocument*)
+        void on_document_replaced(SPDesktop*, Document*)
         {
             update_filters();
         }
diff --git a/src/ui/dialog/layers.h b/src/ui/dialog/layers.h
index 16b3be350..c5f945437 100644
--- a/src/ui/dialog/layers.h
+++ b/src/ui/dialog/layers.h
@@ -86,7 +86,7 @@ private:
     bool _checkForSelected(const Gtk::TreePath& path, const Gtk::TreeIter& iter, SPObject* layer);
 
     void _layersChanged();
-    void _addLayer( SPDocument* doc, SPObject* layer, Gtk::TreeModel::Row* parentRow, SPObject* target, int level );
+    void _addLayer( Document* doc, SPObject* layer, Gtk::TreeModel::Row* parentRow, SPObject* target, int level );
 
     SPObject* _selectedLayer();
 
diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h
index 7dbb6dd4a..5fc4a9134 100644
--- a/src/ui/dialog/panel-dialog.h
+++ b/src/ui/dialog/panel-dialog.h
@@ -50,7 +50,7 @@ protected:
         static_cast<PanelDialogBase *>(data)->_propagateDesktopActivated(application, desktop);
     }
 
-    inline virtual void _propagateDocumentReplaced(SPDesktop* desktop, SPDocument *document);
+    inline virtual void _propagateDocumentReplaced(SPDesktop* desktop, Document *document);
     inline virtual void _propagateDesktopActivated(Inkscape::Application *, SPDesktop *);
     inline virtual void _propagateDesktopDeactivated(Inkscape::Application *, SPDesktop *);
 
@@ -106,7 +106,7 @@ private:
 
 
 void
-PanelDialogBase::_propagateDocumentReplaced(SPDesktop *desktop, SPDocument *document)
+PanelDialogBase::_propagateDocumentReplaced(SPDesktop *desktop, Document *document)
 {
     _panel.signalDocumentReplaced().emit(desktop, document);
 }
diff --git a/src/ui/dialog/print.h b/src/ui/dialog/print.h
index ea89ebdf2..e8904d744 100644
--- a/src/ui/dialog/print.h
+++ b/src/ui/dialog/print.h
@@ -30,7 +30,7 @@
  */
 struct workaround_gtkmm
 {
-    SPDocument *_doc;
+    Document *_doc;
     SPItem     *_base;
     Inkscape::UI::Widget::RenderingOptions *_tab;
 };
@@ -41,14 +41,14 @@ namespace Dialog {
 
 class Print {
 public:
-    Print(SPDocument *doc, SPItem *base);
+    Print(Document *doc, SPItem *base);
     Gtk::PrintOperationResult run(Gtk::PrintOperationAction, Gtk::Window &parent_window);
 
 protected:
 
 private:
     GtkPrintOperation *_printop;
-    SPDocument *_doc;
+    Document *_doc;
     SPItem     *_base;
     Inkscape::UI::Widget::RenderingOptions _tab;
 
diff --git a/src/ui/dialog/swatches.h b/src/ui/dialog/swatches.h
index 35bcd8c78..3ad5a38c1 100644
--- a/src/ui/dialog/swatches.h
+++ b/src/ui/dialog/swatches.h
@@ -45,7 +45,7 @@ public:
 protected:
     virtual void _updateFromSelection();
     virtual void _handleAction( int setId, int itemId );
-    virtual void _setDocument( SPDocument *document );
+    virtual void _setDocument( Document *document );
     virtual void _rebuild();
 
 private:
@@ -57,7 +57,7 @@ private:
     ColorItem* _remove;
     int _currentIndex;
     SPDesktop*  _currentDesktop;
-    SPDocument* _currentDocument;
+    Document* _currentDocument;
     void* _ptr;
 
     sigc::connection _documentConnection;
diff --git a/src/ui/dialog/undo-history.h b/src/ui/dialog/undo-history.h
index 82e04f3c9..0e14b7d7b 100644
--- a/src/ui/dialog/undo-history.h
+++ b/src/ui/dialog/undo-history.h
@@ -122,7 +122,7 @@ public:
 
 protected:
 
-    SPDocument *_document;
+    Document *_document;
     EventLog *_event_log;
 
     const EventLog::EventModelColumns *_columns;