macro rework

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

diff --git a/src/mathed/math_numberinset.h b/src/mathed/math_numberinset.h
index 610dd2be65d83bb0bde71551d8d3e75a5ce97734..fc9ed67070804c1f6a2363d3d14cee0851c16abc 100644 (file)
--- a/src/mathed/math_numberinset.h
+++ b/src/mathed/math_numberinset.h
@@ -1,38 +1,44 @@
 // -*- C++ -*-
+/**
+ * \file math_numberinset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef MATH_NUMBERINSET_H
 #define MATH_NUMBERINSET_H
 
-#include "math_diminset.h"
+#include "math_inset.h"
 
 
 /** Some inset that "is" a number
- *  maily for math-extern
- *  \author André Pönitz
- *
- * Full author contact details are available in file CREDITS
+ *  mainly for math-extern
  */
-
-class MathNumberInset : public MathDimInset {
+class MathNumberInset : public MathInset {
 public:
        ///
-       explicit MathNumberInset(string const & s);
+       explicit MathNumberInset(std::string const & s);
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       void metrics(MathMetricsInfo & st) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void draw(MathPainterInfo &, int x, int y) const;
+       void draw(PainterInfo &, int x, int y) const;
        ///
-       string str() const { return str_; }
+       std::string str() const { return str_; }
        ///
        MathNumberInset * asNumberInset() { return this; }
 
        ///
        void normalize(NormalStream &) const;
        ///
-       void octavize(OctaveStream &) const;
+       void octave(OctaveStream &) const;
        ///
-       void maplize(MapleStream &) const;
+       void maple(MapleStream &) const;
        ///
        void mathmlize(MathMLStream &) const;
        ///
@@ -40,6 +46,6 @@ public:
 
 private:
        /// the number as string
-       string str_;
+       std::string str_;
 };
 #endif