simplify GuiToc / TocWidget interaction. Much can still be simplified...

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

diff --git a/src/mathed/InsetFormulaMacro.h b/src/mathed/InsetFormulaMacro.h
index ecb73960c3c9cdfa2068891c29c7ef881976ef78..20383169de73467afffcaa2d321f5e19a909265b 100644 (file)
--- a/src/mathed/InsetFormulaMacro.h
+++ b/src/mathed/InsetFormulaMacro.h
@@ -19,7 +19,7 @@
 namespace lyx {
 
 class MathMacroTemplate;
-class LyXLex;
+class Lexer;
 
 
 // An InsetFormulaMacro only knows its name and asks the global
@@ -35,28 +35,26 @@ public:
        /// constructs a mocro from its LaTeX definition
        explicit InsetFormulaMacro(docstring const & s);
        ///
-       bool metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
 
        ///
-       void read(Buffer const &, LyXLex & lex);
+       void read(Buffer const &, Lexer & lex);
        ///
        void write(Buffer const &, std::ostream & os) const;
        ///
        int latex(Buffer const &, odocstream & os,
-                 OutputParams const &) const;
+                 OutputParams const &) const;
        ///
        int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+                     OutputParams const &) const;
        ///
        int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+                   OutputParams const &) const;
 
        ///
-       std::auto_ptr<InsetBase> clone() const;
-       ///
-       InsetBase::Code lyxCode() const { return MATHMACRO_CODE; }
+       InsetCode lyxCode() const { return MATHMACRO_CODE; }
        ///
        docstring const & getInsetName() const { return name_; }
        ///
@@ -70,6 +68,8 @@ private:
        docstring prefix() const;
        ///
        docstring name_;
+       ///
+       Inset * clone() const;
 };