backed out Event -> XML::Event changes

diff --git a/src/composite-undo-stack-observer.cpp b/src/composite-undo-stack-observer.cpp
index 04890711ba461e9bca04a49eaa5e5330729dfb21..3c46cb11e1ef0a8cf8d9966db156f42cdc23a930 100644 (file)
--- a/src/composite-undo-stack-observer.cpp
+++ b/src/composite-undo-stack-observer.cpp
@@ -42,7 +42,7 @@ CompositeUndoStackObserver::remove(UndoStackObserver& observer)
 }
 
 void
-CompositeUndoStackObserver::notifyUndoEvent(XML::Event* log)
+CompositeUndoStackObserver::notifyUndoEvent(Event* log)
 {
        this->_lock();
        for(UndoObserverRecordList::iterator i = this->_active.begin(); i != _active.end(); ++i) {
@@ -54,7 +54,7 @@ CompositeUndoStackObserver::notifyUndoEvent(XML::Event* log)
 }
 
 void
-CompositeUndoStackObserver::notifyRedoEvent(XML::Event* log)
+CompositeUndoStackObserver::notifyRedoEvent(Event* log)
 {
 
        this->_lock();
@@ -67,7 +67,7 @@ CompositeUndoStackObserver::notifyRedoEvent(XML::Event* log)
 }
 
 void
-CompositeUndoStackObserver::notifyUndoCommitEvent(XML::Event* log)
+CompositeUndoStackObserver::notifyUndoCommitEvent(Event* log)
 {
        this->_lock();
        for(UndoObserverRecordList::iterator i = this->_active.begin(); i != _active.end(); ++i) {

diff --git a/src/composite-undo-stack-observer.h b/src/composite-undo-stack-observer.h
index fbe0ed892cf20cbb041cf67da9a48e12dea036d0..02d54eb7693415fc361ba199f18abc1cddbf4e0a 100644 (file)
--- a/src/composite-undo-stack-observer.h
+++ b/src/composite-undo-stack-observer.h
@@ -20,12 +20,8 @@
 
 namespace Inkscape {
 
-namespace XML {
-
 class Event;
 
-}
-
 /**
  * Aggregates UndoStackObservers for management and triggering in an SPDocument's undo/redo
  * system.
@@ -60,7 +56,7 @@ public:
                 *
                 * \param log The event log generated by the redo event.
                 */
-               void issueRedo(XML::Event* log)
+               void issueRedo(Event* log)
                {
                        this->_observer.notifyRedoEvent(log);
                }
@@ -71,7 +67,7 @@ public:
                 *
                 * \param log The event log generated by the undo event.
                 */
-               void issueUndo(XML::Event* log)
+               void issueUndo(Event* log)
                {
                        this->_observer.notifyUndoEvent(log);
                }
@@ -82,7 +78,7 @@ public:
                 *
                 * \param log The event log being committed to the undo stack.
                 */
-               void issueUndoCommit(XML::Event* log)
+               void issueUndoCommit(Event* log)
                {
                        this->_observer.notifyUndoCommitEvent(log);
                }
@@ -120,21 +116,21 @@ public:
         *
         * \param log The event log generated by the undo event.
         */
-       void notifyUndoEvent(XML::Event* log);
+       void notifyUndoEvent(Event* log);
 
        /**
         * Notify all registered UndoStackObservers of a redo event.
         *
         * \param log The event log generated by the redo event.
         */
-       void notifyRedoEvent(XML::Event* log);
+       void notifyRedoEvent(Event* log);
 
        /**
         * Notify all registered UndoStackObservers of an event log being committed to the undo stack.
         *
         * \param log The event log being committed to the undo stack.
         */
-       void notifyUndoCommitEvent(XML::Event* log);
+       void notifyUndoCommitEvent(Event* log);
 
 private:
        // Remove an observer from a given list

diff --git a/src/console-output-undo-observer.cpp b/src/console-output-undo-observer.cpp
index c90925b180dad030356d9675e727f0b80fcbe2ef..7035e89feb1fb7450b2cabc7915ecaa2eb9d30fd 100644 (file)
--- a/src/console-output-undo-observer.cpp
+++ b/src/console-output-undo-observer.cpp
@@ -17,19 +17,19 @@
 namespace Inkscape {
 
 void
-ConsoleOutputUndoObserver::notifyUndoEvent(XML::Event* log)
+ConsoleOutputUndoObserver::notifyUndoEvent(Event* log)
 {
     // g_message("notifyUndoEvent (sp_document_undo) called; log=%p\n", log->event);
 }
 
 void
-ConsoleOutputUndoObserver::notifyRedoEvent(XML::Event* log)
+ConsoleOutputUndoObserver::notifyRedoEvent(Event* log)
 {
     // g_message("notifyRedoEvent (sp_document_redo) called; log=%p\n", log->event);
 }
 
 void
-ConsoleOutputUndoObserver::notifyUndoCommitEvent(XML::Event* log)
+ConsoleOutputUndoObserver::notifyUndoCommitEvent(Event* log)
 {
     //g_message("notifyUndoCommitEvent (sp_document_maybe_done) called; log=%p\n", log->event);
 }

diff --git a/src/console-output-undo-observer.h b/src/console-output-undo-observer.h
index 7f121dbcebf608fb795c4a537bcfcad1bce853aa..32149c15dc012b13b83d5d68e2897938826a11ee 100644 (file)
--- a/src/console-output-undo-observer.h
+++ b/src/console-output-undo-observer.h
@@ -22,9 +22,9 @@ public:
     ConsoleOutputUndoObserver() : UndoStackObserver() { }
     ~ConsoleOutputUndoObserver() { }
 
-    void notifyUndoEvent(XML::Event* log);
-    void notifyRedoEvent(XML::Event* log);
-    void notifyUndoCommitEvent(XML::Event* log);
+    void notifyUndoEvent(Event* log);
+    void notifyRedoEvent(Event* log);
+    void notifyUndoCommitEvent(Event* log);
 
 };
 }

diff --git a/src/undo-stack-observer.h b/src/undo-stack-observer.h
index f88c63e6254ffd0dffa324dfbec80d57f28bfb79..cd17c467575ca2415c89d0fb8d5db2b78658c3fc 100644 (file)
--- a/src/undo-stack-observer.h
+++ b/src/undo-stack-observer.h
@@ -16,12 +16,8 @@
 
 namespace Inkscape {
 
-namespace XML {
-
 class Event;
 
-}
-
 /**
  * Observes changes made to the undo and redo stacks.
  *
@@ -46,21 +42,21 @@ public:
         *
         * \param log Pointer to an Event describing the undone event.
         */
-       virtual void notifyUndoEvent(XML::Event* log) = 0;
+       virtual void notifyUndoEvent(Event* log) = 0;
 
        /**
         * Triggered when the user issues a redo command.
         *
         * \param log Pointer to an Event describing the redone event.
         */
-       virtual void notifyRedoEvent(XML::Event* log) = 0;
+       virtual void notifyRedoEvent(Event* log) = 0;
 
        /**
         * Triggered when a set of transactions is committed to the undo log.
         *
         * \param log Pointer to an Event describing the committed events.
         */
-       virtual void notifyUndoCommitEvent(XML::Event* log) = 0;
+       virtual void notifyUndoCommitEvent(Event* log) = 0;
 };
 
 }