X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fundo.h;h=494cf7b6fb70c056edaa1a3a2b08f935aaed314c;hb=e5a46922e916a06ad1b958d5895cc3cfb4f13d2c;hp=fe677a8a4b9a52fc3390c0fa83526d5a3df5a687;hpb=d7055d0a8e64f66afc9f43f7d22fc9c71a2d1cac;p=lyx.git

diff --git a/src/undo.h b/src/undo.h
index fe677a8a4b..494cf7b6fb 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -17,15 +17,19 @@
 #define UNDO_H
 
 #include "dociterator.h"
-#include "ParagraphList_fwd.h"
+#include "ParagraphList.h"
 #include "bufferparams.h"
 
 #include "support/types.h"
 
 #include <string>
 
+
+namespace lyx {
+
 class BufferParams;
 class BufferView;
+class DocIterator;
 class LCursor;
 
 
@@ -76,17 +80,17 @@ public:
 	/// the position of the cell described
 	StableDocIterator cell;
 	/// counted from begin of cell
-	lyx::pit_type from;
+	pit_type from;
 	/// complement to end of this cell
-	lyx::pit_type end;
+	pit_type end;
 	/// the contents of the saved Paragraphs (for texted)
 	ParagraphList pars;
 	/// the stringified contents of the saved MathArray (for mathed)
-	std::string array;
+	docstring array;
 	/// Only used in case of full backups
 	BufferParams bparams;
 	/// Only used in case of full backups
-	bool isFullBuffer;	
+	bool isFullBuffer;
 };
 
 
@@ -115,11 +119,13 @@ void finishUndo();
  */
 
 /// The general case: prepare undo for an arbitrary range.
+/// FIXME: replace LCursor with DocIterator. This is not possible right
+/// now because we need access to Buffer->params()!.
 void recordUndo(LCursor & cur, Undo::undo_kind kind,
-	lyx::pit_type from, lyx::pit_type to);
+	pit_type from, pit_type to);
 
 /// Convenience: prepare undo for the range between 'from' and cursor.
-void recordUndo(LCursor & cur, Undo::undo_kind kind, lyx::pit_type from);
+void recordUndo(LCursor & cur, Undo::undo_kind kind, pit_type from);
 
 /// Convenience: prepare undo for the single paragraph or cell
 /// containing the cursor
@@ -132,4 +138,7 @@ void recordUndoSelection(LCursor & cur, Undo::undo_kind kind = Undo::ATOMIC);
 /// Convenience: prepare undo for the whole buffer
 void recordUndoFullDocument(BufferView * bv);
 
+
+} // namespace lyx
+
 #endif // UNDO_FUNCS_H