Revert "Fix a number of signedness warnings"

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

diff --git a/src/mathed/InsetMathAMSArray.h b/src/mathed/InsetMathAMSArray.h
index 76ca3208fbf4387e6b1520db6eea3dbf9d7b8eb9..ab9ead0bd08dcd71d3b9df0b13f05da9cfd3ff7d 100644 (file)
--- a/src/mathed/InsetMathAMSArray.h
+++ b/src/mathed/InsetMathAMSArray.h
@@ -23,36 +23,56 @@ public:
        ///
        InsetMathAMSArray(Buffer * buf, docstring const &, int m, int n);
        ///
-       InsetMathAMSArray(Buffer * buf, docstring const &);
+       InsetMathAMSArray(Buffer * buf, docstring const &);     ///
+
+       ///
+       int rowsep() const override;
+       ///
+       int colsep() const override;
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       int border() const override;
        ///
-       void draw(PainterInfo & pain, int x, int y) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       InsetMathAMSArray * asAMSArrayInset() { return this; }
+       void draw(PainterInfo & pi, int x, int y) const override;
        ///
-       InsetMathAMSArray const * asAMSArrayInset() const { return this; }
+       InsetMathAMSArray * asAMSArrayInset() override { return this; }
+       ///
+       InsetMathAMSArray const * asAMSArrayInset() const override { return this; }
 
        ///
        bool getStatus(Cursor & cur, FuncRequest const & cmd,
-               FuncStatus & flag) const;
+               FuncStatus & flag) const override;
        ///
-       void write(WriteStream & os) const;
+       void write(WriteStream & os) const override;
        ///
-       void infoize(odocstream & os) const;
+       void infoize(odocstream & os) const override;
        ///
-       void normalize(NormalStream &) const;
+       void normalize(NormalStream &) const override;
+       // Don't need mathmlize or htmlize, as this is handled by
+       // InsetMathMatrix after being extracted in MathExtern.
+       // void mathmlize(MathStream &) const override;
+       // void htmlize(HtmlStream &) const override;
        ///
-       void validate(LaTeXFeatures & features) const;
+       void validate(LaTeXFeatures & features) const override;
        ///
-       InsetCode lyxCode() const { return MATH_AMSARRAY_CODE; }
-private:
-       virtual Inset * clone() const;
+       InsetCode lyxCode() const override { return MATH_AMSARRAY_CODE; }
        ///
        char const * name_left() const;
        ///
        char const * name_right() const;
        ///
+       int leftMargin() const override { return small() ? 3 : 6; }
+       ///
+       int rightMargin() const override { return small() ? 3: 6; }
+       ///
+       bool handlesMulticolumn() const override { return true; }
+
+private:
+       Inset * clone() const override;
+       ///
+       bool small() const { return name_ == "smallmatrix"; }
+       ///
        docstring name_;
 };