further code uglification to make Jean-Marc's compiler happy

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

diff --git a/src/mathed/math_funcinset.h b/src/mathed/math_funcinset.h
index b08fefa026bcaee6f1124f21e30f38dd5ad2f95d..3a773df15f1acde56b06431d22918da3549bed2d 100644 (file)
--- a/src/mathed/math_funcinset.h
+++ b/src/mathed/math_funcinset.h
@@ -1,35 +1,38 @@
+// -*- C++ -*-
 #ifndef MATH_FUNCINSET_H
 #define MATH_FUNCINSET_H
 
-#include "math_inset.h"
+#include "math_diminset.h"
+#include "math_defs.h"
+#include "LString.h"
+
+#ifdef __GNUG__
+#pragma interface
+#endif
 
 /**
  Functions or LaTeX names for objects that I don't know how to draw.
  */
-class MathFuncInset: public MathedInset  {
+class MathFuncInset : public MathDimInset {
 public:
        ///
-       explicit
-       MathFuncInset(string const & nm,
-                     short ot = LM_OT_FUNC, short st = LM_ST_TEXT);
-       ///
-       ~MathFuncInset();
+       explicit MathFuncInset(string const & nm);
        ///
-       MathedInset * Clone();
+       MathInset * clone() const;
        ///
-       void draw(Painter &, int, int);
+       void metrics(MathStyles st) const;
        ///
-       void Write(std::ostream &, bool fragile);
+       void draw(Painter &, int x, int y) const;
        ///
-       void Metrics();
+       void write(std::ostream &, bool fragile) const;
        ///
-       bool GetLimits() const;
-protected:
+       void writeNormal(std::ostream &) const;
        ///
-       int ln;
+       string const & name() const;
        ///
-       bool lims;
+       void setName(string const & n);
+private:
        ///
-       string fname;
+       string name_;
 };
 #endif