Remove background_color_ in Insets: it takes a lot of unnecessary memory,

[lyx.git] / src / Undo.cpp

diff --git a/src/Undo.cpp b/src/Undo.cpp
index 07f69e10803a8bf83d5b5adedbe17975ec0e8936..3dcd54daa867b162d4dc9fc72aeacc202f390213 100644 (file)
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -18,15 +18,15 @@
 
 #include "Buffer.h"
 #include "buffer_funcs.h"
-#include "LCursor.h"
+#include "Cursor.h"
 #include "debug.h"
 #include "BufferView.h"
-#include "LyXText.h"
+#include "Text.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
 
 #include "mathed/MathSupport.h"
-#include "mathed/MathArray.h"
+#include "mathed/MathData.h"
 
 #include "insets/Inset.h"
 
@@ -101,12 +101,12 @@ void doRecordUndo(Undo::undo_kind kind,
        // fill in the real data to be saved
        if (cell.inMathed()) {
                // simply use the whole cell
-               undo.array = new MathArray(cell.cell());
+               undo.array = new MathData(cell.cell());
        } else {
                // some more effort needed here as 'the whole cell' of the
-               // main LyXText _is_ the whole document.
+               // main Text _is_ the whole document.
                // record the relevant paragraphs
-               LyXText const * text = cell.text();
+               Text const * text = cell.text();
                BOOST_ASSERT(text);
                ParagraphList const & plist = text->paragraphs();
                ParagraphList::const_iterator first = plist.begin();
@@ -126,7 +126,7 @@ void doRecordUndo(Undo::undo_kind kind,
 
 
 void recordUndo(Undo::undo_kind kind,
-       LCursor & cur, pit_type first_pit, pit_type last_pit,
+       Cursor & cur, pit_type first_pit, pit_type last_pit,
        limited_stack<Undo> & stack)
 {
        BOOST_ASSERT(first_pit <= cur.lastpit());
@@ -184,7 +184,7 @@ bool textUndoOrRedo(BufferView & bv,
                undo.array = 0;
        } else {
                // Some finer machinery is needed here.
-               LyXText * text = dit.text();
+               Text * text = dit.text();
                BOOST_ASSERT(text);
                BOOST_ASSERT(undo.pars);
                ParagraphList & plist = text->paragraphs();
@@ -215,7 +215,7 @@ bool textUndoOrRedo(BufferView & bv,
        BOOST_ASSERT(undo.array == 0);
 
        // Set cursor
-       LCursor & cur = bv.cursor();
+       Cursor & cur = bv.cursor();
        cur.setCursor(undo.cursor.asDocIterator(&buf->inset()));
        cur.selection() = false;
        cur.resetAnchor();
@@ -250,7 +250,7 @@ bool textRedo(BufferView & bv)
 
 
 void recordUndo(Undo::undo_kind kind,
-       LCursor & cur, pit_type first, pit_type last)
+       Cursor & cur, pit_type first, pit_type last)
 {
        Buffer * buf = cur.bv().buffer();
        recordUndo(kind, cur, first, last, buf->undostack());
@@ -261,15 +261,15 @@ void recordUndo(Undo::undo_kind kind,
 }
 
 
-void recordUndo(LCursor & cur, Undo::undo_kind kind)
+void recordUndo(Cursor & cur, Undo::undo_kind kind)
 {
        recordUndo(kind, cur, cur.pit(), cur.pit());
 }
 
 
-void recordUndoInset(LCursor & cur, Undo::undo_kind kind)
+void recordUndoInset(Cursor & cur, Undo::undo_kind kind)
 {
-       LCursor c = cur;
+       Cursor c = cur;
        c.pop();
        Buffer * buf = cur.bv().buffer();
        doRecordUndo(kind, c, c.pit(), c.pit(), cur,
@@ -277,19 +277,19 @@ void recordUndoInset(LCursor & cur, Undo::undo_kind kind)
 }
 
 
-void recordUndoSelection(LCursor & cur, Undo::undo_kind kind)
+void recordUndoSelection(Cursor & cur, Undo::undo_kind kind)
 {
        recordUndo(kind, cur, cur.selBegin().pit(), cur.selEnd().pit());
 }
 
 
-void recordUndo(LCursor & cur, Undo::undo_kind kind, pit_type from)
+void recordUndo(Cursor & cur, Undo::undo_kind kind, pit_type from)
 {
        recordUndo(kind, cur, cur.pit(), from);
 }
 
 
-void recordUndo(LCursor & cur, Undo::undo_kind kind,
+void recordUndo(Cursor & cur, Undo::undo_kind kind,
        pit_type from, pit_type to)
 {
        recordUndo(kind, cur, from, to);