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

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

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 16e44169197b1cd88ad264113b67c5b4440ff9c7..b0f062f7b0b7cbec9dc5b54ce81a12615de2e5ae 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -24,9 +24,6 @@
 #include "math_defs.h"
 #include "debug.h"
 
-using std::ostream;
-using std::endl;
-
 ///
 typedef MathParInset * MathParInsetP;
 ///
@@ -40,8 +37,10 @@ class MathMacro : public MathParInset
 {
 public:
     /// A macro can only be builded from an existing template
+       explicit
     MathMacro(MathMacroTemplate *);
     /// or from another macro.
+       explicit
     MathMacro(MathMacro *);
        ///
     ~MathMacro();
@@ -52,7 +51,7 @@ public:
        ///
     MathedInset * Clone();
        ///
-    void Write(ostream &);
+    void Write(std::ostream &, bool fragile);
        ///
     bool setArgumentIdx(int);
        ///
@@ -108,9 +107,10 @@ public:
     ///
     MathMacroArgument() { expnd_mode = false; number = 1;  SetType(LM_OT_MACRO_ARG); }
     ///
+       explicit
     MathMacroArgument(int);
     ///
-       ~MathMacroArgument() { lyxerr << "help, destroyme!" << endl; }
+       ~MathMacroArgument() { lyxerr << "help, destroyme!" << std::endl; }
     ///
     MathedInset * Clone() { return this; }
        ///
@@ -118,7 +118,7 @@ public:
        ///
     void draw(Painter &, int x, int baseline);
        ///
-    void Write(ostream &);
+    void Write(std::ostream &, bool fragile);
     ///
     void setNumber(int n) { number = n; }
     /// Is expanded or not
@@ -137,6 +137,7 @@ private:
 class MathMacroTemplate: public MathParInset {
 public:
     /// A template constructor needs all the data
+       explicit
     MathMacroTemplate(char const *, int na = 0, int f = 0);
        ///
     ~MathMacroTemplate();
@@ -145,7 +146,7 @@ public:
        ///
     void Metrics();
        ///
-    void WriteDef(ostream &);
+    void WriteDef(std::ostream &, bool fragile);
     /// useful for special insets
     void  setTCode(MathedTextCodes t) { tcode = t; }
     ///
@@ -189,6 +190,7 @@ typedef MathMacroTemplate * MathMacroTemplateP;
 class MathMacroTable {
 public:
        ///
+       explicit
     MathMacroTable(int);
        ///
     ~MathMacroTable();