Event -> XML::Event*

(bzr r1317)

4 files changed, 19 insertions, 15 deletions

diff --git a/src/composite-undo-stack-observer.cpp b/src/composite-undo-stack-observer.cpp
index 3c46cb11e..04890711b 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(Event* log)
+CompositeUndoStackObserver::notifyUndoEvent(XML::Event* log)
 {
 	this->_lock();
 	for(UndoObserverRecordList::iterator i = this->_active.begin(); i != _active.end(); ++i) {
@@ -54,7 +54,7 @@ CompositeUndoStackObserver::notifyUndoEvent(Event* log)
 }
 
 void
-CompositeUndoStackObserver::notifyRedoEvent(Event* log)
+CompositeUndoStackObserver::notifyRedoEvent(XML::Event* log)
 {
 
 	this->_lock();
@@ -67,7 +67,7 @@ CompositeUndoStackObserver::notifyRedoEvent(Event* log)
 }
 
 void
-CompositeUndoStackObserver::notifyUndoCommitEvent(Event* log)
+CompositeUndoStackObserver::notifyUndoCommitEvent(XML::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 02d54eb76..fbe0ed892 100644
--- a/src/composite-undo-stack-observer.h
+++ b/src/composite-undo-stack-observer.h
@@ -20,8 +20,12 @@
 
 namespace Inkscape {
 
+namespace XML {
+
 class Event;
 
+}
+
 /**
  * Aggregates UndoStackObservers for management and triggering in an SPDocument's undo/redo
  * system.
@@ -56,7 +60,7 @@ public:
 		 *
 		 * \param log The event log generated by the redo event.
 		 */
-		void issueRedo(Event* log)
+		void issueRedo(XML::Event* log)
 		{
 			this->_observer.notifyRedoEvent(log);
 		}
@@ -67,7 +71,7 @@ public:
 		 *
 		 * \param log The event log generated by the undo event.
 		 */
-		void issueUndo(Event* log)
+		void issueUndo(XML::Event* log)
 		{
 			this->_observer.notifyUndoEvent(log);
 		}
@@ -78,7 +82,7 @@ public:
 		 *
 		 * \param log The event log being committed to the undo stack.
 		 */
-		void issueUndoCommit(Event* log)
+		void issueUndoCommit(XML::Event* log)
 		{
 			this->_observer.notifyUndoCommitEvent(log);
 		}
@@ -116,21 +120,21 @@ public:
 	 *
 	 * \param log The event log generated by the undo event.
 	 */
-	void notifyUndoEvent(Event* log);
+	void notifyUndoEvent(XML::Event* log);
 
 	/**
 	 * Notify all registered UndoStackObservers of a redo event.
 	 *
 	 * \param log The event log generated by the redo event.
 	 */
-	void notifyRedoEvent(Event* log);
+	void notifyRedoEvent(XML::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(Event* log);
+	void notifyUndoCommitEvent(XML::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 7035e89fe..c90925b18 100644
--- a/src/console-output-undo-observer.cpp
+++ b/src/console-output-undo-observer.cpp
@@ -17,19 +17,19 @@
 namespace Inkscape {
 
 void
-ConsoleOutputUndoObserver::notifyUndoEvent(Event* log)
+ConsoleOutputUndoObserver::notifyUndoEvent(XML::Event* log)
 {
     // g_message("notifyUndoEvent (sp_document_undo) called; log=%p\n", log->event);
 }
 
 void
-ConsoleOutputUndoObserver::notifyRedoEvent(Event* log)
+ConsoleOutputUndoObserver::notifyRedoEvent(XML::Event* log)
 {
     // g_message("notifyRedoEvent (sp_document_redo) called; log=%p\n", log->event);
 }
 
 void
-ConsoleOutputUndoObserver::notifyUndoCommitEvent(Event* log)
+ConsoleOutputUndoObserver::notifyUndoCommitEvent(XML::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 32149c15d..7f121dbce 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(Event* log);
-    void notifyRedoEvent(Event* log);
-    void notifyUndoCommitEvent(Event* log);
+    void notifyUndoEvent(XML::Event* log);
+    void notifyRedoEvent(XML::Event* log);
+    void notifyUndoCommitEvent(XML::Event* log);
 
 };
 }