SPDocument->Document

(bzr r8407)

18 files changed, 49 insertions, 49 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;
diff --git a/src/ui/view/edit-widget.h b/src/ui/view/edit-widget.h
index 2bb708305..28b4b52d2 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 SPDocument;
+struct Document;
 struct SPNamedView;
 
 namespace Inkscape {
@@ -46,14 +46,14 @@ namespace View {
 class EditWidget : public Gtk::Window,
                    public EditWidgetInterface {
 public:
-    EditWidget (SPDocument*);
+    EditWidget (Document*);
     ~EditWidget();
 
     // Initialization
     void initActions();
     void initUIManager();
     void initLayout();
-    void initEdit (SPDocument*);
+    void initEdit (Document*);
     void destroyEdit();
 
     // Actions
diff --git a/src/ui/view/view.h b/src/ui/view/view.h
index 882746cea..6465807d6 100644
--- a/src/ui/view/view.h
+++ b/src/ui/view/view.h
@@ -53,7 +53,7 @@ struct StopOnNonZero {
   }
 };
 
-class SPDocument;
+class Document;
 
 namespace Inkscape {
     class MessageContext;
@@ -80,7 +80,7 @@ public:
     void close() { _close(); }
 
     /// Returns a pointer to the view's document.
-    SPDocument *doc() const
+    Document *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:
-    SPDocument *_doc;
+    Document *_doc;
     Inkscape::MessageStack *_message_stack;
     Inkscape::MessageContext *_tips_message_context;
 
     virtual void _close();
-    virtual void setDocument(SPDocument *doc);
+    virtual void setDocument(Document *doc);
 
     sigc::signal<void,double,double>   _position_set_signal;
     sigc::signal<void,double,double>   _resized_signal;
diff --git a/src/ui/widget/entity-entry.h b/src/ui/widget/entity-entry.h
index 5bdee9a90..d080787c1 100644
--- a/src/ui/widget/entity-entry.h
+++ b/src/ui/widget/entity-entry.h
@@ -16,7 +16,7 @@
 #include <gtkmm/tooltips.h>
 
 struct rdf_work_entity_t;
-class SPDocument;
+class Document;
 
 namespace Gtk {
 class TextBuffer;
@@ -32,7 +32,7 @@ class EntityEntry {
 public:
     static EntityEntry* create (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr);
     virtual ~EntityEntry() = 0;
-    virtual void update (SPDocument *doc) = 0;
+    virtual void update (Document *doc) = 0;
     virtual void on_changed() = 0;
     Gtk::Label _label;
     Gtk::Widget *_packable;
@@ -49,7 +49,7 @@ class EntityLineEntry : public EntityEntry {
 public:
     EntityLineEntry (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr);
     ~EntityLineEntry();
-    void update (SPDocument *doc);
+    void update (Document *doc);
 
 protected:
     virtual void on_changed();
@@ -59,7 +59,7 @@ class EntityMultiLineEntry : public EntityEntry {
 public:
     EntityMultiLineEntry (rdf_work_entity_t* ent, Gtk::Tooltips& tt, Registry& wr);
     ~EntityMultiLineEntry();
-    void update (SPDocument *doc);
+    void update (Document *doc);
 
 protected: 
     virtual void on_changed();
diff --git a/src/ui/widget/imageicon.h b/src/ui/widget/imageicon.h
index 803b2f53f..3819a3c77 100644
--- a/src/ui/widget/imageicon.h
+++ b/src/ui/widget/imageicon.h
@@ -16,7 +16,7 @@
 #include <gtkmm/box.h>
 
 
-class SPDocument;
+class Document;
 
 namespace Inkscape
 {
@@ -62,7 +62,7 @@ public:
     /**
      *
      */
-    bool showSvgDocument(const SPDocument *doc);
+    bool showSvgDocument(const Document *doc);
 
     /**
      *
@@ -99,7 +99,7 @@ private:
     /**
      * The svg document we are currently showing
      */
-    SPDocument *document;
+    Document *document;
 
     /**
      * The sp_svg_view widget
diff --git a/src/ui/widget/layer-selector.h b/src/ui/widget/layer-selector.h
index 0b5300272..d9ef558a5 100644
--- a/src/ui/widget/layer-selector.h
+++ b/src/ui/widget/layer-selector.h
@@ -23,7 +23,7 @@
 #include "util/list.h"
 
 class SPDesktop;
-class SPDocument;
+class Document;
 class SPObject;
 namespace Inkscape {
 namespace XML {
diff --git a/src/ui/widget/licensor.h b/src/ui/widget/licensor.h
index 9f41a6d0d..6738c48df 100644
--- a/src/ui/widget/licensor.h
+++ b/src/ui/widget/licensor.h
@@ -15,7 +15,7 @@
 
 #include <gtkmm/box.h>
 
-class SPDocument;
+class Document;
 
 namespace Gtk {
     class Tooltips;
@@ -34,7 +34,7 @@ public:
     Licensor();
     virtual ~Licensor();
     void init (Gtk::Tooltips&, Registry&);
-    void update (SPDocument *doc);
+    void update (Document *doc);
 
 protected: 
     EntityEntry          *_eentry;
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index d42548f16..36f5ea804 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -71,7 +71,7 @@ public:
     void setDefaultResponse(int response_id);
     void setResponseSensitive(int response_id, bool setting);
 
-    virtual sigc::signal<void, SPDesktop *, SPDocument *> &signalDocumentReplaced();
+    virtual sigc::signal<void, SPDesktop *, Document *> &signalDocumentReplaced();
     virtual sigc::signal<void, Inkscape::Application *, SPDesktop *> &signalActivateDesktop();
     virtual sigc::signal<void, Inkscape::Application *, SPDesktop *> &signalDeactiveDesktop();
 
@@ -100,7 +100,7 @@ protected:
     /** Signals */
     sigc::signal<void, int> _signal_response;
     sigc::signal<void>      _signal_present;
-    sigc::signal<void, SPDesktop *, SPDocument *> _signal_document_replaced;
+    sigc::signal<void, SPDesktop *, Document *> _signal_document_replaced;
     sigc::signal<void, Inkscape::Application *, SPDesktop *> _signal_activate_desktop;
     sigc::signal<void, Inkscape::Application *, SPDesktop *> _signal_deactive_desktop;
 
diff --git a/src/ui/widget/registered-enums.h b/src/ui/widget/registered-enums.h
index 739745817..f9195d1f2 100644
--- a/src/ui/widget/registered-enums.h
+++ b/src/ui/widget/registered-enums.h
@@ -32,7 +32,7 @@ public:
                 const Util::EnumDataConverter<E>& c,
                 Registry& wr,
                 Inkscape::XML::Node* repr_in = NULL,
-                SPDocument *doc_in = NULL )
+                Document *doc_in = NULL )
         : RegisteredWidget< LabelledComboBoxEnum<E> >(label, tip, c)
     {
         RegisteredWidget< LabelledComboBoxEnum<E> >::init_parent(key, wr, repr_in, doc_in);
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index a5c61f68a..32d6c93fa 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -35,7 +35,7 @@
 #include "sp-namedview.h"
 
 class SPUnit;
-class SPDocument;
+class Document;
 
 namespace Gtk {
     class HScale;
@@ -81,7 +81,7 @@ protected:
 
     virtual ~RegisteredWidget() {};
 
-    void init_parent(const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in)
+    void init_parent(const Glib::ustring& key, Registry& wr, Inkscape::XML::Node* repr_in, Document *doc_in)
     {
         _wr = &wr;
         _key = key;
@@ -96,7 +96,7 @@ protected:
         // Use local repr here. When repr is specified, use that one, but
         // if repr==NULL, get the repr of namedview of active desktop.
         Inkscape::XML::Node *local_repr = repr;
-        SPDocument *local_doc = doc;
+        Document *local_doc = doc;
         if (!local_repr) {
             // no repr specified, use active desktop's namedview's repr
             SPDesktop* dt = SP_ACTIVE_DESKTOP;
@@ -120,7 +120,7 @@ protected:
     Registry * _wr;
     Glib::ustring _key;
     Inkscape::XML::Node * repr;
-    SPDocument * doc;
+    Document * doc;
     unsigned int event_type;
     Glib::ustring event_description;
     bool write_undo;
@@ -139,7 +139,7 @@ private:
 class RegisteredCheckButton : public RegisteredWidget<Gtk::CheckButton> {
 public:
     virtual ~RegisteredCheckButton();
-    RegisteredCheckButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL);
+    RegisteredCheckButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, Document *doc_in=NULL);
 
     void setActive (bool);
 
@@ -168,7 +168,7 @@ public:
                          const Glib::ustring& key,
                          Registry& wr,
                          Inkscape::XML::Node* repr_in = NULL,
-                         SPDocument *doc_in = NULL );
+                         Document *doc_in = NULL );
 
     void setUnit (const SPUnit*);
     Unit getUnit() const { return static_cast<UnitMenu*>(_widget)->getUnit(); };
@@ -188,7 +188,7 @@ public:
                            const RegisteredUnitMenu &rum,
                            Registry& wr,
                            Inkscape::XML::Node* repr_in = NULL,
-                           SPDocument *doc_in = NULL );
+                           Document *doc_in = NULL );
 
 protected:
     sigc::connection  _value_changed_connection;
@@ -204,7 +204,7 @@ public:
             const Glib::ustring& key,
             Registry& wr,
             Inkscape::XML::Node* repr_in = NULL,
-            SPDocument *doc_in = NULL );
+            Document *doc_in = NULL );
 
 protected:
     sigc::connection  _value_changed_connection;
@@ -219,7 +219,7 @@ public:
             const Glib::ustring& key,
             Registry& wr,
             Inkscape::XML::Node* repr_in = NULL,
-            SPDocument *doc_in = NULL );
+            Document *doc_in = NULL );
 
 protected:
     sigc::connection  _activate_connection;
@@ -237,7 +237,7 @@ public:
                            const Glib::ustring& akey,
                            Registry& wr,
                            Inkscape::XML::Node* repr_in = NULL,
-                           SPDocument *doc_in = NULL);
+                           Document *doc_in = NULL);
 
     void setRgba32 (guint32);
     void closeWindow();
@@ -259,7 +259,7 @@ public:
                                 const Glib::ustring& key,
                                 Registry& wr,
                                 Inkscape::XML::Node* repr_in = NULL,
-                                SPDocument *doc_in = NULL );
+                                Document *doc_in = NULL );
 
     bool setProgrammatically; // true if the value was set by setValue, not changed by the user;
                                 // if a callback checks it, it must reset it back to false
@@ -280,7 +280,7 @@ public:
                                 const Glib::ustring& key,
                                 Registry& wr,
                                 Inkscape::XML::Node* repr_in = NULL,
-                                SPDocument *doc_in = NULL );
+                                Document *doc_in = NULL );
 
     void setValue (bool second);
 
@@ -301,7 +301,7 @@ public:
                       const Glib::ustring& key,
                       Registry& wr,
                       Inkscape::XML::Node* repr_in = NULL,
-                      SPDocument *doc_in = NULL );
+                      Document *doc_in = NULL );
 
 protected:
     sigc::connection  _value_x_changed_connection;
@@ -318,7 +318,7 @@ public:
                                   const Glib::ustring& key,
                                   Registry& wr,
                                   Inkscape::XML::Node* repr_in = NULL,
-                                  SPDocument *doc_in = NULL );
+                                  Document *doc_in = NULL );
 
     // redefine setValue, because transform must be applied
     void setValue(Geom::Point const & p);
@@ -342,7 +342,7 @@ public:
                        const Glib::ustring& key,
                        Registry& wr,
                        Inkscape::XML::Node* repr_in = NULL,
-                       SPDocument *doc_in = NULL);
+                       Document *doc_in = NULL);
 
     void setValue (double val, long startseed);