Hopefully fix the problem with stateText() in lyxfont.C

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

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index 05c78b237799b1f97c00331d6f4fe35f0825a14e..6daeb3d9ff5b6b4487629c2001923cb1201fc214 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -23,8 +23,6 @@
 
 #include "formula.h"
 
-using std::ostream;
-
 class MathMacroTemplate;
 
 
@@ -34,6 +32,7 @@ public:
        ///
        InsetFormulaMacro();
        ///
+       explicit
        InsetFormulaMacro(string name, int na = 0, bool env = false);
        ///
        ~InsetFormulaMacro();
@@ -48,18 +47,18 @@ public:
        ///
        void Read(LyXLex & lex);
         ///
-       void Write(ostream & os) const;
+       void Write(std::ostream & os) const;
        ///
-       int Latex(ostream & os, signed char fragile, bool free_spc) const;
+       int Latex(std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       int Linuxdoc(ostream &) const;
+       int Linuxdoc(std::ostream &) const;
        ///
-       int DocBook(ostream &) const;
+       int DocBook(std::ostream &) const;
        ///
        Inset * Clone() const;
 
        /// what appears in the minibuffer when opening
-       const char * EditMessage() const {return _("Math macro editor mode");}
+       char const * EditMessage() const;
        ///
        void Edit(BufferView *, int x, int y, unsigned int button);
        ///