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

(bzr r8422)

2 files changed, 15 insertions, 15 deletions

diff --git a/src/application/editor.cpp b/src/application/editor.cpp
index 730188bdd..49010efdc 100644
--- a/src/application/editor.cpp
+++ b/src/application/editor.cpp
@@ -18,7 +18,7 @@
 #endif
 
 /*
-  TODO:  Replace Document with the new Inkscape::Document
+  TODO:  Replace SPDocument with the new Inkscape::Document
   TODO:  Change 'desktop's to 'view*'s
   TODO:  Add derivation from Inkscape::Application::RunMode
 */
@@ -76,7 +76,7 @@ Editor::init()
     //
     gchar const *tmpl = g_build_filename ((INKSCAPE_TEMPLATESDIR), "default.svg", NULL);
     bool have_default = Inkscape::IO::file_test (tmpl, G_FILE_TEST_IS_REGULAR);
-    Document *doc = sp_document_new (have_default? tmpl:0, true, true);
+    SPDocument *doc = sp_document_new (have_default? tmpl:0, true, true);
     g_return_val_if_fail (doc != 0, false);
     Inkscape::UI::View::EditWidget *ew = new Inkscape::UI::View::EditWidget (doc);
     sp_document_unref (doc);
@@ -96,7 +96,7 @@ Editor::getWindow()
 }
 
 /// Returns the active document
-Document*
+SPDocument*
 Editor::getActiveDocument()
 {
     if (getActiveDesktop()) {
@@ -107,7 +107,7 @@ Editor::getActiveDocument()
 }
 
 void
-Editor::addDocument (Document *doc)
+Editor::addDocument (SPDocument *doc)
 {
     if ( _instance->_document_set.find(doc) == _instance->_document_set.end() ) {
         _instance->_documents = g_slist_append (_instance->_documents, doc);
@@ -116,7 +116,7 @@ Editor::addDocument (Document *doc)
 }
 
 void
-Editor::removeDocument (Document *doc)
+Editor::removeDocument (SPDocument *doc)
 {
     _instance->_document_set.erase(doc);
     if ( _instance->_document_set.find(doc) == _instance->_document_set.end() ) {
@@ -125,7 +125,7 @@ Editor::removeDocument (Document *doc)
 }
 
 SPDesktop* 
-Editor::createDesktop (Document* doc)
+Editor::createDesktop (SPDocument* doc)
 {
     g_assert (doc != 0);
     (new Inkscape::UI::View::EditWidget (doc))->present();
@@ -227,13 +227,13 @@ Editor::reactivateDesktop (SPDesktop* dt)
 bool
 Editor::isDuplicatedView (SPDesktop* dt)
 {
-    Document const* document = dt->doc();
+    SPDocument const* document = dt->doc();
     if (!document) {
         return false;
     }
     for ( GSList *iter = _instance->_desktops ; iter ; iter = iter->next ) {
         SPDesktop *other_desktop=(SPDesktop *)iter->data;
-        Document *other_document=other_desktop->doc();
+        SPDocument *other_document=other_desktop->doc();
         if ( other_document == document && other_desktop != dt ) {
             return true;
         }
diff --git a/src/application/editor.h b/src/application/editor.h
index 0886555e9..4545022b8 100644
--- a/src/application/editor.h
+++ b/src/application/editor.h
@@ -22,7 +22,7 @@
 #include "app-prototype.h"
 
 class SPDesktop;
-class Document;
+class SPDocument;
 class SPEventContext;
 
 namespace Inkscape {
@@ -52,7 +52,7 @@ public:
     void            refreshDisplay();
     void            exit();
 
-    bool        lastViewOfDocument(Document* doc, SPDesktop* view) const;
+    bool        lastViewOfDocument(SPDocument* doc, SPDesktop* view) const;
 
     bool        addView(SPDesktop* view);
     bool        deleteView(SPDesktop* view);
@@ -60,16 +60,16 @@ public:
     static Inkscape::XML::Document *getPreferences();
     static SPDesktop* getActiveDesktop();
     static bool isDesktopActive (SPDesktop* dt) { return getActiveDesktop()==dt; }
-    static SPDesktop* createDesktop (Document* doc);
+    static SPDesktop* createDesktop (SPDocument* doc);
     static void addDesktop (SPDesktop* dt);
     static void removeDesktop (SPDesktop* dt);
     static void activateDesktop (SPDesktop* dt);
     static void reactivateDesktop (SPDesktop* dt);
     static bool isDuplicatedView (SPDesktop* dt);
 
-    static Document* getActiveDocument();
-    static void addDocument (Document* doc);
-    static void removeDocument (Document* doc);
+    static SPDocument* getActiveDocument();
+    static void addDocument (SPDocument* doc);
+    static void removeDocument (SPDocument* doc);
 
     static void selectionModified (Inkscape::Selection*, guint);
     static void selectionChanged (Inkscape::Selection*);
@@ -96,7 +96,7 @@ protected:
     Editor(Editor const &);
     Editor& operator=(Editor const &);
 
-    std::multiset<Document *> _document_set;
+    std::multiset<SPDocument *> _document_set;
     GSList         *_documents;
     GSList         *_desktops;
     gchar          *_argv0;