Revert "Fix a number of signedness warnings"

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

diff --git a/src/mathed/InsetMathString.h b/src/mathed/InsetMathString.h
index 495de2f005a40afce4dc26a5be1a39c2f9191811..9f2e0bf4f509cc907b5f1f111437416d8a9ab8c4 100644 (file)
--- a/src/mathed/InsetMathString.h
+++ b/src/mathed/InsetMathString.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,6 +14,8 @@
 
 #include "InsetMath.h"
 
+#include "support/docstring.h"
+
 
 namespace lyx {
 
@@ -26,31 +28,33 @@ public:
        ///
        explicit InsetMathString(docstring const & s);
        ///
-       bool metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void draw(PainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const override;
        ///
        docstring str() const { return str_; }
        ///
-       InsetMathString * asStringInset() { return this; }
+       InsetMathString * asStringInset() override { return this; }
        ///
-       InsetMathString const * asStringInset() const { return this; }
+       InsetMathString const * asStringInset() const override { return this; }
 
        ///
-       void normalize(NormalStream &) const;
+       void normalize(NormalStream &) const override;
+       ///
+       void octave(OctaveStream &) const override;
        ///
-       void octave(OctaveStream &) const;
+       void maple(MapleStream &) const override;
        ///
-       void maple(MapleStream &) const;
+       void mathematica(MathematicaStream &) const override;
        ///
-       void mathematica(MathematicaStream &) const;
+       void mathmlize(MathStream &) const override;
        ///
-       void mathmlize(MathStream &) const;
+       void write(WriteStream & os) const override;
        ///
-       void write(WriteStream & os) const;
+       InsetCode lyxCode() const override { return MATH_STRING_CODE; }
 
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       Inset * clone() const override;
        /// the string
        docstring str_;
 };