Fix commented out code

[lyx.git] / src / Undo.h

diff --git a/src/Undo.h b/src/Undo.h
index c2acf4af216b78060c7ed3893a965fbfecaa57aa..c2b9b5d074b4e6e8fbef33e40e5aac73e74df3b3 100644 (file)
--- a/src/Undo.h
+++ b/src/Undo.h
@@ -47,6 +47,9 @@ enum UndoKind {
 
 class Undo
 {
+       /// noncopyable
+       Undo(Undo const &);
+       void operator=(Undo const &);
 public:
 
        Undo(Buffer &);
@@ -57,10 +60,10 @@ public:
        void clear();
 
        /// this will undo the last action - returns false if no undo possible
-       bool textUndo(CursorData &);
+       bool undoAction(CursorData &);
 
        /// this will redo the last undo - returns false if no redo possible
-       bool textRedo(CursorData &);
+       bool redoAction(CursorData &);
 
        /// End a sequence of INSERT_UNDO or DELETE_UNDO type of undo
        /// operations (grouping of consecutive characters insertion/deletion).
@@ -80,12 +83,23 @@ public:
         *  a single step. This means you can add a group whenever you are not sure.
         */
        void beginUndoGroup();
-
+       /// open a new group as above and specify a cursor to set as cur_before
+       /// of the group's undo elements.
+       /**
+        * This cursor takes precedence over what is passed to recordUndo.
+        * In the case of nested groups, only the first cur_before is
+        * taken into account. The cursor is reset at the end of the
+        * top-level group.
+        */
+       void beginUndoGroup(CursorData const & cur_before);
        /// end the current undo group.
        void endUndoGroup();
-
        /// end the current undo group and set UndoElement::cur_after if necessary.
-       void endUndoGroup(CursorData const &);
+       void endUndoGroup(CursorData const & cur_after);
+       /// end abruptly the current group and create a new one wih the same nesting level
+       void splitUndoGroup(CursorData const & cur);
+       /// return true if an undo group is open and contains at least one element
+       bool activeUndoGroup() const;
 
        /// The general case: record undo information for an arbitrary range.
        /**
@@ -125,15 +139,9 @@ private:
  */
 class UndoGroupHelper {
 public:
-       UndoGroupHelper(Buffer * buf) : buffer_(0)
-       {
-               resetBuffer(buf);
-       }
+       UndoGroupHelper(Buffer * buf = 0);
 
-       ~UndoGroupHelper()
-       {
-               resetBuffer(0);
-       }
+       ~UndoGroupHelper();
 
        /** Close the current undo group if necessary and create a new one
         * for buffer \c buf.
@@ -141,7 +149,8 @@ public:
        void resetBuffer(Buffer * buf);
 
 private:
-       Buffer * buffer_;
+       class Impl;
+       Impl * const d;
 };