X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathFactory.cpp;h=7f8c2192241bebdce37212be6a22554888834e2a;hb=a746aa52146257c0e7a2d60123f63dccad5b2751;hp=5f5cb02192e2b9a5f3f072c20b97c594081d4e7c;hpb=6e3a75969b97a5db4c80c46be49d4deb122abfe7;p=lyx.git

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 5f5cb02192..7f8c219224 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -50,7 +50,7 @@
 #include "InsetMathXArrow.h"
 #include "InsetMathXYMatrix.h"
 #include "MathMacroArgument.h"
-#include "MathMacroTable.h"
+#include "MacroTable.h"
 #include "MathParser.h"
 #include "MathSupport.h"
 
@@ -87,7 +87,7 @@ WordList theWordList;
 
 bool math_font_available(docstring & name)
 {
-	LyXFont f;
+	Font f;
 	augmentFont(f, name);
 
 	// Do we have the font proper?
@@ -265,7 +265,7 @@ MathAtom createInsetMath(docstring const & s)
 		docstring const & inset = l->inset;
 		//lyxerr << " found inset: '" << inset << '\'' << endl;
 		if (inset == "ref")
-			return MathAtom(new RefInset(l->name));
+			return MathAtom(new InsetMathRef(l->name));
 		if (inset == "overset")
 			return MathAtom(new InsetMathOverset);
 		if (inset == "underset")
@@ -318,7 +318,7 @@ MathAtom createInsetMath(docstring const & s)
 		return MathAtom(new InsetMathKern);
 	if (s.substr(0, 8) == "xymatrix") {
 		char spacing_code = '\0';
-		LyXLength spacing;
+		Length spacing;
 		size_t const len = s.length();
 		size_t i = 8;
 		if (i < len && s[i] == '@') {
@@ -338,7 +338,7 @@ MathAtom createInsetMath(docstring const & s)
 			}
 			if (i < len && s[i] == '=') {
 				++i;
-				spacing = LyXLength(to_ascii(s.substr(i)));
+				spacing = Length(to_ascii(s.substr(i)));
 			}
 		}
 		return MathAtom(new InsetMathXYMatrix(spacing, spacing_code));
@@ -404,7 +404,7 @@ MathAtom createInsetMath(docstring const & s)
 }
 
 
-bool createInsetMath_fromDialogStr(docstring const & str, MathArray & ar)
+bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
 {
 	// An example str:
 	// "ref LatexCommand ref\nreference \"sec:Title\"\n\\end_inset\n\n";