LyXText -> Text

[lyx.git] / src / mathed / InsetMathHull.cpp

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 1b963ac068762cc23022f0c2948ff93453a6eb1f..6b9d8d3cce01e5e8a1c9b0ff52208e315307cbb8 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -26,14 +26,14 @@
 #include "InsetMathRef.h"
 
 #include "bufferview_funcs.h"
-#include "LyXText.h"
+#include "Text.h"
 
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "CutAndPaste.h"
 #include "FuncStatus.h"
-#include "LColor.h"
+#include "Color.h"
 #include "LaTeXFeatures.h"
 #include "Cursor.h"
 #include "debug.h"
@@ -162,7 +162,7 @@ InsetMathHull::InsetMathHull()
        //lyxerr << "sizeof InsetMath: " << sizeof(InsetMath) << endl;
        //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
        //lyxerr << "sizeof InsetMathChar: " << sizeof(InsetMathChar) << endl;
-       //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << endl;
+       //lyxerr << "sizeof Font: " << sizeof(Font) << endl;
        initMath();
        setDefaults();
 }
@@ -188,9 +188,9 @@ InsetMathHull::~InsetMathHull()
 {}
 
 
-auto_ptr<InsetBase> InsetMathHull::doClone() const
+auto_ptr<Inset> InsetMathHull::doClone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathHull(*this));
+       return auto_ptr<Inset>(new InsetMathHull(*this));
 }
 
 
@@ -208,7 +208,7 @@ InsetMathHull & InsetMathHull::operator=(InsetMathHull const & other)
 }
 
 
-InsetBase * InsetMathHull::editXY(Cursor & cur, int x, int y)
+Inset * InsetMathHull::editXY(Cursor & cur, int x, int y)
 {
        if (use_preview_) {
                edit(cur, true);
@@ -1128,7 +1128,7 @@ void InsetMathHull::doDispatch(Cursor & cur, FuncRequest & cmd)
                        docstring old = label(r);
                        if (str != old) {
                                cur.bv().buffer()->changeRefsIfUnique(old, str,
-                                                       InsetBase::REF_CODE);
+                                                       Inset::REF_CODE);
                                label(r, str);
                        }
                        break;
@@ -1274,7 +1274,7 @@ void InsetMathHull::mutateToText()
        string str = os.str();
 
        // insert this text
-       LyXText * lt = view_->cursor().innerText();
+       Text * lt = view_->cursor().innerText();
        string::const_iterator cit = str.begin();
        string::const_iterator end = str.end();
        for (; cit != end; ++cit)
@@ -1304,10 +1304,10 @@ void InsetMathHull::handleFont(Cursor & cur, docstring const & arg,
 void InsetMathHull::handleFont2(Cursor & cur, docstring const & arg)
 {
        recordUndo(cur);
-       LyXFont font;
+       Font font;
        bool b;
        bv_funcs::string2font(to_utf8(arg), font, b);
-       if (font.color() != LColor::inherit) {
+       if (font.color() != Color::inherit) {
                MathAtom at = MathAtom(new InsetMathColor(true, font.color()));
                cur.handleNest(at, 0);
        }
@@ -1367,7 +1367,7 @@ void InsetMathHull::revealCodes(Cursor & cur) const
 }
 
 
-InsetBase::Code InsetMathHull::lyxCode() const
+Inset::Code InsetMathHull::lyxCode() const
 {
        return MATH_CODE;
 }