4 files changed, 12 insertions, 12 deletions
diff --git a/src/ui/view/edit-widget.cpp b/src/ui/view/edit-widget.cpp
index 9619380bb..756f4df73 100644
--- a/src/ui/view/edit-widget.cpp
+++ b/src/ui/view/edit-widget.cpp
@@ -71,7 +71,7 @@ namespace Inkscape {
 namespace UI {
 namespace View {
 
-EditWidget::EditWidget (Document *doc)
+EditWidget::EditWidget (SPDocument *doc)
     : _main_window_table(4),
       _viewport_table(3,3),
       _act_grp(Gtk::ActionGroup::create()),
@@ -1191,7 +1191,7 @@ EditWidget::shutdown()
     if (Inkscape::NSApplication::Editor::isDuplicatedView (_desktop))
         return false;
 
-    Document *doc = _desktop->doc();
+    SPDocument *doc = _desktop->doc();
     if (doc->isModifiedSinceSave()) {
         gchar *markup;
         /// \todo FIXME !!! obviously this will have problems if the document
@@ -1389,7 +1389,7 @@ EditWidget::updateScrollbars (double scale)
     _update_s_f = true;
 
     /* The desktop region we always show unconditionally */
-    Document *doc = _desktop->doc();
+    SPDocument *doc = _desktop->doc();
     Geom::Rect darea ( Geom::Point(-sp_document_width(doc), -sp_document_height(doc)),
                      Geom::Point(2 * sp_document_width(doc), 2 * sp_document_height(doc))  );
     SPObject* root = doc->root;
@@ -1548,7 +1548,7 @@ void EditWidget::_namedview_modified (SPObject *obj, guint flags) {
 }
 
 void
-EditWidget::initEdit (Document *doc)
+EditWidget::initEdit (SPDocument *doc)
 {
     _desktop = new SPDesktop();
     _desktop->registerEditWidget (this);
diff --git a/src/ui/view/edit-widget.h b/src/ui/view/edit-widget.h
index 28b4b52d2..2bb708305 100644
--- a/src/ui/view/edit-widget.h
+++ b/src/ui/view/edit-widget.h
@@ -36,7 +36,7 @@
 #include "ui/widget/zoom-status.h"
 
 struct SPDesktop;
-struct Document;
+struct SPDocument;
 struct SPNamedView;
 
 namespace Inkscape {
@@ -46,14 +46,14 @@ namespace View {
 class EditWidget : public Gtk::Window,
                    public EditWidgetInterface {
 public:
-    EditWidget (Document*);
+    EditWidget (SPDocument*);
     ~EditWidget();
 
     // Initialization
     void initActions();
     void initUIManager();
     void initLayout();
-    void initEdit (Document*);
+    void initEdit (SPDocument*);
     void destroyEdit();
 
     // Actions
diff --git a/src/ui/view/view.cpp b/src/ui/view/view.cpp
index 07bb6d2c1..1b498a846 100644
--- a/src/ui/view/view.cpp
+++ b/src/ui/view/view.cpp
@@ -137,7 +137,7 @@ void View::requestRedraw()
  * 
  * \param doc The new document to connect the view to.
  */
-void View::setDocument(Document *doc) {
+void View::setDocument(SPDocument *doc) {
     g_return_if_fail(doc != NULL);
 
     if (_doc) {
diff --git a/src/ui/view/view.h b/src/ui/view/view.h
index 6465807d6..882746cea 100644
--- a/src/ui/view/view.h
+++ b/src/ui/view/view.h
@@ -53,7 +53,7 @@ struct StopOnNonZero {
   }
 };
 
-class Document;
+class SPDocument;
 
 namespace Inkscape {
     class MessageContext;
@@ -80,7 +80,7 @@ public:
     void close() { _close(); }
 
     /// Returns a pointer to the view's document.
-    Document *doc() const
+    SPDocument *doc() const
       { return _doc; }
     /// Returns a pointer to the view's message stack.
     Inkscape::MessageStack *messageStack() const
@@ -108,12 +108,12 @@ public:
     virtual void onDocumentResized (double, double) = 0;
 
 protected:
-    Document *_doc;
+    SPDocument *_doc;
     Inkscape::MessageStack *_message_stack;
     Inkscape::MessageContext *_tips_message_context;
 
     virtual void _close();
-    virtual void setDocument(Document *doc);
+    virtual void setDocument(SPDocument *doc);
 
     sigc::signal<void,double,double>   _position_set_signal;
     sigc::signal<void,double,double>   _resized_signal;