Revert "Fix a number of signedness warnings"

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

diff --git a/src/mathed/InsetMathDelim.h b/src/mathed/InsetMathDelim.h
index 61c230e4e9d4285d58dcdcf4a5d588459c17070b..d45ecc7174679ea2fb90cea8c2cc0afe48f1cd62 100644 (file)
--- a/src/mathed/InsetMathDelim.h
+++ b/src/mathed/InsetMathDelim.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,8 +15,6 @@
 
 #include "InsetMathNest.h"
 
-#include <string>
-
 
 namespace lyx {
 
@@ -24,13 +22,16 @@ namespace lyx {
 class InsetMathDelim : public InsetMathNest {
 public:
        ///
-       InsetMathDelim(docstring const & left, docstring const & right);
+       InsetMathDelim(Buffer * buf, docstring const & left, docstring const & right);
+       ///
+       InsetMathDelim(Buffer * buf, docstring const & left, docstring const & right,
+               MathData const &);
        ///
-       InsetMathDelim(docstring const & left, docstring const & right, MathData const &);
+       InsetMathDelim * asDelimInset() override { return this; }
        ///
-       InsetMathDelim * asDelimInset() { return this; }
+       InsetMathDelim const * asDelimInset() const override { return this; }
        ///
-       InsetMathDelim const * asDelimInset() const { return this; }
+       MathClass mathClass() const override { return MC_INNER; }
        /// is it (...)?
        bool isParenthesis() const;
        /// is it [...]?
@@ -38,32 +39,38 @@ public:
        /// is it |...|?
        bool isAbs() const;
        ///
-       mode_type currentMode() const { return MATH_MODE; }
+       mode_type currentMode() const override { return MATH_MODE; }
        ///
-       bool metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void draw(PainterInfo &, int x, int y) const;
+       void draw(PainterInfo &, int x, int y) const override;
 
        ///
-       void write(WriteStream & os) const;
+       void validate(LaTeXFeatures & features) const override;
+       ///
+       void write(WriteStream & os) const override;
        /// write normalized content
-       void normalize(NormalStream &) const;
+       void normalize(NormalStream &) const override;
+       ///
+       void maple(MapleStream &) const override;
+       ///
+       void maxima(MaximaStream &) const override;
        ///
-       void maple(MapleStream &) const;
+       void mathematica(MathematicaStream &) const override;
        ///
-       void maxima(MaximaStream &) const;
+       void mathmlize(MathStream &) const override;
        ///
-       void mathematica(MathematicaStream &) const;
+       void htmlize(HtmlStream &) const override;
        ///
-       void mathmlize(MathStream &) const;
+       void octave(OctaveStream &) const override;
        ///
-       void octave(OctaveStream &) const;
+       InsetCode lyxCode() const override { return MATH_DELIM_CODE; }
        ///
        docstring left_;
        ///
        docstring right_;
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       Inset * clone() const override;
        ///
        mutable int dw_;
 };