The way this was done here is inconsistent with how it is done

[features.git] / src / Undo.h

diff --git a/src/Undo.h b/src/Undo.h
index 4e83145a47cbad3443e16de378f4dcc0740b87a0..c2acf4af216b78060c7ed3893a965fbfecaa57aa 100644 (file)
--- a/src/Undo.h
+++ b/src/Undo.h
@@ -94,26 +94,22 @@ public:
         * give an inclusive range. This is called before you make the
         * changes to the paragraph, and it will record the original
         * information of the paragraphs in the undo stack.
+        * Kind of undo is always ATOMIC_UNDO.
         */
-       void recordUndo(CursorData const & cur, UndoKind kind,
-               pit_type from, pit_type to);
-
-       /// Convenience: record undo information for the range between
-       /// 'from' and cursor.
-       void recordUndo(CursorData const & cur, UndoKind kind, pit_type from);
+       void recordUndo(CursorData const & cur, pit_type from, pit_type to);
 
        /// Convenience: record undo information for the single
        /// paragraph or cell containing the cursor.
        void recordUndo(CursorData const & cur, UndoKind kind = ATOMIC_UNDO);
 
-       /// Convenience: record undo information for the inset
-       /// containing the cursor.
-       void recordUndoInset(CursorData const & cur,
-                            UndoKind kind = ATOMIC_UNDO,
-                            Inset const * inset = 0);
+       /// prepare undo for the inset containing the cursor
+       void recordUndoInset(CursorData const & cur, Inset const * inset);
+
+       /// Convenience: record undo for buffer parameters
+       void recordUndoBufferParams(CursorData const & cur);
 
        /// Convenience: prepare undo for the whole buffer
-       void recordUndoFullDocument(CursorData const & cur);
+       void recordUndoFullBuffer(CursorData const & cur);
 
 private:
        struct Private;
@@ -121,6 +117,34 @@ private:
 };
 
 
+/** Helper class to simplify the use of undo groups across several buffers.
+ *
+ *  The undo group is created when the object is instanciated; it is
+ *  then ended as the object goes out of scope or the buffer is reset
+ *  (see below)
+ */
+class UndoGroupHelper {
+public:
+       UndoGroupHelper(Buffer * buf) : buffer_(0)
+       {
+               resetBuffer(buf);
+       }
+
+       ~UndoGroupHelper()
+       {
+               resetBuffer(0);
+       }
+
+       /** Close the current undo group if necessary and create a new one
+        * for buffer \c buf.
+        */
+       void resetBuffer(Buffer * buf);
+
+private:
+       Buffer * buffer_;
+};
+
+
 
 } // namespace lyx