Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily.

(bzr r8422)

6 files changed, 15 insertions, 15 deletions

diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 90bac6053..a92e7cf5b 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -190,7 +190,7 @@ attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int
     }
 }
 
-CanvasAxonomGrid::CanvasAxonomGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, Document * in_doc)
+CanvasAxonomGrid::CanvasAxonomGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc)
     : CanvasGrid(nv, in_repr, in_doc, GRID_AXONOMETRIC)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h
index b4a27c873..e36804d7c 100644
--- a/src/display/canvas-axonomgrid.h
+++ b/src/display/canvas-axonomgrid.h
@@ -31,7 +31,7 @@ namespace Inkscape {
 
 class CanvasAxonomGrid : public CanvasGrid {
 public:
-    CanvasAxonomGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, Document * in_doc);
+    CanvasAxonomGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc);
     virtual ~CanvasAxonomGrid();
 
     void Update (Geom::Matrix const &affine, unsigned int flags);
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 710074a97..5037c0375 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -155,7 +155,7 @@ grid_canvasitem_update (SPCanvasItem *item, Geom::Matrix const &affine, unsigned
         NULL  /* order_changed */
     };
 
-CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, Document *in_doc, GridType type)
+CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument *in_doc, GridType type)
     : visible(true), gridtype(type)
 {
     repr = in_repr;
@@ -240,7 +240,7 @@ CanvasGrid::getGridTypeFromName(char const *typestr)
 *  writes an <inkscape:grid> child to repr.
 */
 void
-CanvasGrid::writeNewGridToRepr(Inkscape::XML::Node * repr, Document * doc, GridType gridtype)
+CanvasGrid::writeNewGridToRepr(Inkscape::XML::Node * repr, SPDocument * doc, GridType gridtype)
 {
     if (!repr) return;
     if (gridtype > GRID_MAXTYPENR) return;
@@ -262,7 +262,7 @@ CanvasGrid::writeNewGridToRepr(Inkscape::XML::Node * repr, Document * doc, GridT
 * Creates a new CanvasGrid object of type gridtype
 */
 CanvasGrid*
-CanvasGrid::NewGrid(SPNamedView * nv, Inkscape::XML::Node * repr, Document * doc, GridType gridtype)
+CanvasGrid::NewGrid(SPNamedView * nv, Inkscape::XML::Node * repr, SPDocument * doc, GridType gridtype)
 {
     if (!repr) return NULL;
     if (!doc) {
@@ -420,7 +420,7 @@ attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int
     }
 }
 
-CanvasXYGrid::CanvasXYGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, Document * in_doc)
+CanvasXYGrid::CanvasXYGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc)
     : CanvasGrid(nv, in_repr, in_doc, GRID_RECTANGULAR)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index 058f88ef8..58cfbf735 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -26,7 +26,7 @@
 
 struct SPDesktop;
 struct SPNamedView;
-class Document;
+class SPDocument;
 
 namespace Inkscape {
 
@@ -73,8 +73,8 @@ public:
     static GridType     getGridTypeFromSVGName(const char * typestr);
     static GridType     getGridTypeFromName(const char * typestr);
 
-    static CanvasGrid* NewGrid(SPNamedView * nv, Inkscape::XML::Node * repr, Document *doc, GridType gridtype);
-    static void writeNewGridToRepr(Inkscape::XML::Node * repr, Document * doc, GridType gridtype);
+    static CanvasGrid* NewGrid(SPNamedView * nv, Inkscape::XML::Node * repr, SPDocument *doc, GridType gridtype);
+    static void writeNewGridToRepr(Inkscape::XML::Node * repr, SPDocument * doc, GridType gridtype);
 
     GridCanvasItem * createCanvasItem(SPDesktop * desktop);
 
@@ -94,7 +94,7 @@ public:
     SPUnit const* gridunit;
 
     Inkscape::XML::Node * repr;
-    Document *doc;
+    SPDocument *doc;
 
     Inkscape::Snapper* snapper;
 
@@ -104,7 +104,7 @@ public:
     bool isEnabled();
 
 protected:
-    CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, Document *in_doc, GridType type);
+    CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument *in_doc, GridType type);
 
     virtual Gtk::Widget * newSpecificWidget() = 0;
 
@@ -125,7 +125,7 @@ private:
 
 class CanvasXYGrid : public CanvasGrid {
 public:
-    CanvasXYGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, Document * in_doc);
+    CanvasXYGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc);
     virtual ~CanvasXYGrid();
 
     void Update (Geom::Matrix const &affine, unsigned int flags);
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index 4430907da..2b799f8d2 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -225,7 +225,7 @@ void FilterImage::set_href(const gchar *href){
     feImageHref = (href) ? g_strdup (href) : NULL;
 }
 
-void FilterImage::set_document(Document *doc){
+void FilterImage::set_document(SPDocument *doc){
     document = doc;
 }
 
diff --git a/src/display/nr-filter-image.h b/src/display/nr-filter-image.h
index 6fbc5d7eb..f3565ef9f 100644
--- a/src/display/nr-filter-image.h
+++ b/src/display/nr-filter-image.h
@@ -29,14 +29,14 @@ public:
 
     virtual int render(FilterSlot &slot, FilterUnits const &units);
     virtual FilterTraits get_input_traits();
-    void set_document( Document *document );
+    void set_document( SPDocument *document );
     void set_href(const gchar *href);
     void set_region(SVGLength x, SVGLength y, SVGLength width, SVGLength height);
     bool from_element;
     SPItem* SVGElem;
 
 private:
-    Document *document;
+    SPDocument *document;
     gchar *feImageHref;
     guint8* image_pixbuf;
     Glib::RefPtr<Gdk::Pixbuf> image;