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

(bzr r8422)

6 files changed, 18 insertions, 18 deletions

diff --git a/src/extension/implementation/implementation.cpp b/src/extension/implementation/implementation.cpp
index e3421b26d..6090b72d0 100644
--- a/src/extension/implementation/implementation.cpp
+++ b/src/extension/implementation/implementation.cpp
@@ -79,7 +79,7 @@ Implementation::prefs_input(Inkscape::Extension::Input *module, gchar const */*f
     return module->autogui(NULL, NULL);
 } /* Implementation::prefs_input */
 
-Document *
+SPDocument *
 Implementation::open(Inkscape::Extension::Input */*module*/, gchar const */*filename*/) {
     /* throw open_failed(); */
     return NULL;
@@ -91,7 +91,7 @@ Implementation::prefs_output(Inkscape::Extension::Output *module) {
 } /* Implementation::prefs_output */
 
 void
-Implementation::save(Inkscape::Extension::Output */*module*/, Document */*doc*/, gchar const */*filename*/) {
+Implementation::save(Inkscape::Extension::Output */*module*/, SPDocument */*doc*/, gchar const */*filename*/) {
     /* throw save_fail */
     return;
 } /* Implementation::save */
@@ -100,7 +100,7 @@ Gtk::Widget *
 Implementation::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, ImplementationDocumentCache * docCache) {
     if (module->param_visible_count() == 0) return NULL;
 
-    Document * current_document = view->doc();
+    SPDocument * current_document = view->doc();
 
     using Inkscape::Util::GSListConstIterator;
     GSListConstIterator<SPItem *> selected =
@@ -134,7 +134,7 @@ Implementation::set_preview(Inkscape::Extension::Print */*module*/)
 
 
 unsigned int
-Implementation::begin(Inkscape::Extension::Print */*module*/, Document */*doc*/)
+Implementation::begin(Inkscape::Extension::Print */*module*/, SPDocument */*doc*/)
 {
     return 0;
 }
diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h
index 9f1894d95..9de70dce7 100644
--- a/src/extension/implementation/implementation.h
+++ b/src/extension/implementation/implementation.h
@@ -70,13 +70,13 @@ public:
     virtual Gtk::Widget *prefs_input(Inkscape::Extension::Input *module,
                              gchar const *filename);
 
-    virtual Document *open(Inkscape::Extension::Input *module,
+    virtual SPDocument *open(Inkscape::Extension::Input *module,
                              gchar const *filename);
 
     /* ----- Output functions ----- */
     /** Find out information about the file. */
     virtual Gtk::Widget *prefs_output(Inkscape::Extension::Output *module);
-    virtual void save(Inkscape::Extension::Output *module, Document *doc, gchar const *filename);
+    virtual void save(Inkscape::Extension::Output *module, SPDocument *doc, gchar const *filename);
 
     /* ----- Effect functions ----- */
     /** Find out information about the file. */
@@ -93,7 +93,7 @@ public:
     virtual unsigned set_preview(Inkscape::Extension::Print *module);
 
     virtual unsigned begin(Inkscape::Extension::Print *module,
-                           Document *doc);
+                           SPDocument *doc);
     virtual unsigned finish(Inkscape::Extension::Print *module);
     virtual bool     textToPath(Inkscape::Extension::Print *ext);
     virtual bool     fontEmbedded(Inkscape::Extension::Print * ext);
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index d207c1a19..e6ce40bc0 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -545,7 +545,7 @@ Script::prefs_output(Inkscape::Extension::Output *module)
     the incoming filename (so that it's not the temporary filename).
     That document is then returned from this function.
 */
-Document *
+SPDocument *
 Script::open(Inkscape::Extension::Input *module,
              const gchar *filenameArg)
 {
@@ -567,7 +567,7 @@ Script::open(Inkscape::Extension::Input *module,
     int data_read = execute(command, params, lfilename, fileout);
     fileout.toFile(tempfilename_out);
 
-    Document * mydoc = NULL;
+    SPDocument * mydoc = NULL;
     if (data_read > 10) {
         if (helper_extension.size()==0) {
             mydoc = Inkscape::Extension::open(
@@ -623,7 +623,7 @@ Script::open(Inkscape::Extension::Input *module,
 */
 void
 Script::save(Inkscape::Extension::Output *module,
-             Document *doc,
+             SPDocument *doc,
              const gchar *filenameArg)
 {
     std::list<std::string> params;
@@ -757,7 +757,7 @@ Script::effect(Inkscape::Extension::Effect *module,
 
     pump_events();
 
-    Document * mydoc = NULL;
+    SPDocument * mydoc = NULL;
     if (data_read > 10) {
         mydoc = Inkscape::Extension::open(
               Inkscape::Extension::db.get(SP_MODULE_KEY_INPUT_SVG),
diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index 0769c9a18..8e25fb351 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -73,7 +73,7 @@ public:
     /**
      *
      */
-    virtual Document *open(Inkscape::Extension::Input *module,
+    virtual SPDocument *open(Inkscape::Extension::Input *module,
                              gchar const *filename);
 
     /**
@@ -85,7 +85,7 @@ public:
      *
      */
     virtual void save(Inkscape::Extension::Output *module,
-                      Document *doc,
+                      SPDocument *doc,
                       gchar const *filename);
 
     /**
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index 9eea2dbeb..f34fea64a 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -136,7 +136,7 @@ XSLT::unload(Inkscape::Extension::Extension *module)
     return;
 }
 
-Document *
+SPDocument *
 XSLT::open(Inkscape::Extension::Input */*module*/, gchar const *filename)
 {
     xmlDocPtr filein = xmlParseFile(filename);
@@ -174,7 +174,7 @@ XSLT::open(Inkscape::Extension::Input */*module*/, gchar const *filename)
     }
     g_free(s);
 
-    Document * doc = sp_document_create(rdoc, filename, base, name, true);
+    SPDocument * doc = sp_document_create(rdoc, filename, base, name, true);
 
     g_free(base); g_free(name);
 
@@ -182,7 +182,7 @@ XSLT::open(Inkscape::Extension::Input */*module*/, gchar const *filename)
 }
 
 void
-XSLT::save(Inkscape::Extension::Output */*module*/, Document *doc, gchar const *filename)
+XSLT::save(Inkscape::Extension::Output */*module*/, SPDocument *doc, gchar const *filename)
 {
     /* TODO: Should we assume filename to be in utf8 or to be a raw filename?
      * See JavaFXOutput::save for discussion. */
diff --git a/src/extension/implementation/xslt.h b/src/extension/implementation/xslt.h
index df9467d9e..45befb529 100644
--- a/src/extension/implementation/xslt.h
+++ b/src/extension/implementation/xslt.h
@@ -44,9 +44,9 @@ public:
 
     bool check(Inkscape::Extension::Extension *module);
 
-    Document *open(Inkscape::Extension::Input *module,
+    SPDocument *open(Inkscape::Extension::Input *module,
                      gchar const *filename);
-    void save(Inkscape::Extension::Output *module, Document *doc, gchar const *filename);
+    void save(Inkscape::Extension::Output *module, SPDocument *doc, gchar const *filename);
 };
 
 }  /* Inkscape  */