* the old cursor is stored before dispatch and then used after moving

[lyx.git] / src / mathed / MathMacroTemplate.h

diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h
index 34029c00bd9149ddb37475dffeae2c9a06bf0810..c24fd16f80433e8b28ad8de6a64d7d6ae12abf9f 100644 (file)
--- 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,23 +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 &,
-                     OutputParams const &) const;
+                     OutputParams const &) const;
 
        /// Number of arguments
        int numargs() const;
@@ -65,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;