X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacroTemplate.h;h=7dd81890a997d7ac4115f386937f1fd9a8357ad8;hb=a746aa52146257c0e7a2d60123f63dccad5b2751;hp=cf46734618f290d0abce49e90add8e0cd82482c1;hpb=2de83b4598b001deca6d80a8df80c54fe52f8ab0;p=lyx.git

diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h
index cf46734618..7dd81890a9 100644
--- a/src/mathed/MathMacroTemplate.h
+++ b/src/mathed/MathMacroTemplate.h
@@ -14,7 +14,7 @@
 #define MATH_MACROTEMPLATE_H
 
 #include "MathData.h"
-#include "MathMacroTable.h"
+#include "MacroTable.h"
 #include "InsetMathNest.h"
 
 #include "support/types.h"
@@ -30,24 +30,23 @@ public:
 	///
 	MathMacroTemplate(docstring const & name, int nargs,
 		docstring const & type,
-		MathArray const & = MathArray(),
-		MathArray const & = MathArray());
+		MathData const & = MathData(),
+		MathData const & = MathData());
 	///
 	explicit MathMacroTemplate(const docstring & str);
 	///
-	void edit(LCursor & cur, bool left);
+	void edit(Cursor & cur, bool left);
 	///
 	EDITABLE editable() const { return HIGHLY_EDITABLE; }
 	///
-	void read(Buffer const &, LyXLex & lex);
+	void read(Buffer const &, Lexer & lex);
 	///
 	void write(Buffer const &, std::ostream & os) const;
 	///
 	void write(WriteStream & os) const;
 	///
-	int plaintext(Buffer const &, odocstream & os,
-			OutputParams const &) const
-	{ os << "[math macro]"; return 12; }
+	int plaintext(Buffer const &, odocstream &,
+	              OutputParams const &) const;
 
 	/// Number of arguments
 	int numargs() const;
@@ -66,10 +65,10 @@ public:
 	/// identifies macro templates
 	MathMacroTemplate const * asMacroTemplate() const { return this; }
 	///
-	InsetBase::Code lyxCode() const { return MATHMACRO_CODE; }
+	Inset::Code lyxCode() const { return MATHMACRO_CODE; }
 
 private:
-	virtual std::auto_ptr<InsetBase> doClone() const;
+	virtual std::auto_ptr<Inset> doClone() const;
 	/// prefix in inset
 	docstring prefix() const;