patch from Gustav Broberg: undo annotations and history dialog

(bzr r1315)

1 files changed, 6 insertions, 10 deletions

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