X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacro.h;h=5d1428c7c0ee6c6a68669f0ff85ef8a307bd2d60;hb=fc6ce7cd08562fd7bab4427880b46390bb7d2f07;hp=b4ff0a4041b3591420ac19b56318740c1ee75c6f;hpb=176715bd567758b914a8ebaa2eb8c32f9770a8c7;p=lyx.git

diff --git a/src/mathed/MathMacro.h b/src/mathed/MathMacro.h
index b4ff0a4041..5d1428c7c0 100644
--- a/src/mathed/MathMacro.h
+++ b/src/mathed/MathMacro.h
@@ -14,9 +14,9 @@
 #define MATH_MACRO_H
 
 #include "InsetMathNest.h"
-#include "MathArray.h"
+#include "MathData.h"
 #include "InsetMathNest.h"
-#include "MathMacroTable.h"
+#include "MacroTable.h"
 
 
 namespace lyx {
@@ -42,17 +42,17 @@ public:
 	void cursorPos(BufferView const & bv, CursorSlice const & sl,
 		bool boundary, int & x, int & y) const;
 	///
-	InsetBase * editXY(LCursor & cur, int x, int y);
+	Inset * editXY(Cursor & cur, int x, int y);
 	/// target pos when we enter the inset from the left by pressing "Right"
-	bool idxFirst(LCursor &) const;
+	bool idxFirst(Cursor &) const;
 	/// target pos when we enter the inset from the right by pressing "Left"
-	bool idxLast(LCursor &) const;
+	bool idxLast(Cursor &) const;
 	///
-	virtual bool notifyCursorLeaves(LCursor &);
+	virtual bool notifyCursorLeaves(Cursor &);
 	///
 	docstring name() const;
 	///
-	void setExpansion(MathArray const & exp, MathArray const & args) const;
+	void setExpansion(MathData const & exp, MathData const & args) const;
 
 	///
 	void validate(LaTeXFeatures &) const;
@@ -69,7 +69,7 @@ public:
 	void infoize2(odocstream &) const;
 
 private:
-	virtual std::auto_ptr<InsetBase> doClone() const;
+	virtual std::auto_ptr<Inset> doClone() const;
 	///
 	void updateExpansion() const;
 	///
@@ -78,9 +78,9 @@ private:
 	/// name of macro
 	docstring name_;
 	/// the unexpanded macro defintition
-	mutable MathArray tmpl_;
+	mutable MathData tmpl_;
 	/// the macro substituted with our args
-	mutable MathArray expanded_;
+	mutable MathData expanded_;
 };