backed out Event -> XML::Event changes

(bzr r1319)

5 files changed, 18 insertions, 26 deletions

diff --git a/src/composite-undo-stack-observer.cpp b/src/composite-undo-stack-observer.cpp
index 04890711b..3c46cb11e 100644
--- 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 fbe0ed892..02d54eb76 100644
--- 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 c90925b18..7035e89fe 100644
--- 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 7f121dbce..32149c15d 100644
--- 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 f88c63e62..cd17c4675 100644
--- 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;
 };
 
 }