* do not ignore "requires" field in MathMacro

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 6d25addd3397322bf61a068a337685e6e232f2bf..6220982e02b3b9e32d7b7d6bad78f2d770cd944e 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -28,8 +28,8 @@
 #include "lfuns.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
-#include "LyXText.h"
-#include "LyXTextClassList.h"
+#include "Text.h"
+#include "TextClassList.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
@@ -146,7 +146,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
        // set the paragraphs to default
        if (cur.inset().forceDefaultParagraphs(cur.idx())) {
                Layout_ptr const layout = 
-                       buffer.params().getLyXTextClass().defaultLayout();
+                       buffer.params().getTextClass().defaultLayout();
                ParagraphList::iterator const end = insertion.end();
                for (ParagraphList::iterator par = insertion.begin(); 
                                par != end; ++par)
@@ -382,9 +382,9 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
        }
 
        // do not copy text (also nested in insets) which is marked as deleted
-       // acceptChanges() is defined for LyXText rather than ParagraphList
-       // Thus we must wrap copy_pars into a LyXText object and cross our fingers
-       LyXText lt;
+       // acceptChanges() is defined for Text rather than ParagraphList
+       // Thus we must wrap copy_pars into a Text object and cross our fingers
+       Text lt;
        copy_pars.swap(lt.paragraphs());
        lt.acceptChanges(buf.params());
        copy_pars.swap(lt.paragraphs());
@@ -416,8 +416,8 @@ void switchBetweenClasses(textclass_type c1, textclass_type c2,
        if (c1 == c2)
                return;
 
-       LyXTextClass const & tclass1 = textclasslist[c1];
-       LyXTextClass const & tclass2 = textclasslist[c2];
+       TextClass const & tclass1 = textclasslist[c1];
+       TextClass const & tclass2 = textclasslist[c2];
 
        // layouts
        ParIterator end = par_iterator_end(in);
@@ -520,7 +520,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
        // and cur.selEnd()
 
        if (cur.inTexted()) {
-               LyXText * text = cur.text();
+               Text * text = cur.text();
                BOOST_ASSERT(text);
 
                // make sure that the depth behind the selection are restored, too
@@ -602,7 +602,7 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
                return;
 
        if (cur.inTexted()) {
-               LyXText * text = cur.text();
+               Text * text = cur.text();
                BOOST_ASSERT(text);
                // ok we have a selection. This is always between cur.selBegin()
                // and sel_end cursor
@@ -625,7 +625,7 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
                ParagraphList pars;
                Paragraph par;
                BufferParams const & bp = cur.buffer().params();
-               par.layout(bp.getLyXTextClass().defaultLayout());
+               par.layout(bp.getTextClass().defaultLayout());
                par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
                cutstack.push(make_pair(pars, bp.textclass));
@@ -652,7 +652,7 @@ void copySelection(Cursor & cur, docstring const & plaintext)
                ParagraphList pars;
                Paragraph par;
                BufferParams const & bp = cur.buffer().params();
-               par.layout(bp.getLyXTextClass().defaultLayout());
+               par.layout(bp.getTextClass().defaultLayout());
                par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
                pars.push_back(par);
                theCuts.push(make_pair(pars, bp.textclass));
@@ -701,7 +701,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
                        textclass_type textclass, ErrorList & errorList)
 {
        if (cur.inTexted()) {
-               LyXText * text = cur.text();
+               Text * text = cur.text();
                BOOST_ASSERT(text);
 
                pit_type endpit;