small cleanup, doxygen, formatting changes

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

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index 6c823275741d899b98f012fde26f59871f53a7dd..5eb113fb7215f0505e83101d582e17e00ed53657 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -32,32 +32,35 @@ public:
        ///
        InsetFormulaMacro();
        ///
+       explicit
        InsetFormulaMacro(string name, int na = 0, bool env = false);
        ///
        ~InsetFormulaMacro();
        ///
-       int ascent(Painter &, LyXFont const &) const;
+       int ascent(BufferView *, LyXFont const &) const;
        ///
-       int descent(Painter &, LyXFont const &) const;
+       int descent(BufferView *, LyXFont const &) const;
        ///
-       int width(Painter &, LyXFont const &) const;
+       int width(BufferView *, LyXFont const &) const;
        ///
-       void draw(Painter &, LyXFont const &, int baseline, float & x) const;
+       void draw(BufferView *,LyXFont const &, int, float &, bool) const;
        ///
-       void Read(LyXLex & lex);
+       void Read(Buffer const *, LyXLex & lex);
         ///
-       void Write(ostream & os) const;
+       void Write(Buffer const *, std::ostream & os) const;
        ///
-       int Latex(ostream & os, signed char fragile, bool free_spc) const;
+       int Latex(Buffer const *, std::ostream & os, bool fragile,
+                 bool free_spc) const;
        ///
-       int Linuxdoc(ostream &) const;
+       int Linuxdoc(Buffer const *, std::ostream & os) const;
        ///
-       int DocBook(ostream &) const;
+       int DocBook(Buffer const *, std::ostream &) const;
        ///
-       Inset * Clone() const;
-
+       Inset * Clone(Buffer const &) const;
+       ///
+       Inset::Code LyxCode() const { return Inset::MATHMACRO_CODE; }
        /// what appears in the minibuffer when opening
-       const char * EditMessage() const {return _("Math macro editor mode");}
+       string const EditMessage() const;
        ///
        void Edit(BufferView *, int x, int y, unsigned int button);
        ///
@@ -65,10 +68,6 @@ public:
        ///
        RESULT LocalDispatch(BufferView *, int, string const &);
 
-protected:
-       ///
-       //void UpdateLocal();
-
 private:
        ///
         bool opened;