Revert "Fix a number of signedness warnings"

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

diff --git a/src/mathed/InsetMathArray.h b/src/mathed/InsetMathArray.h
index 8768b3ed0f96e358c0a9f501a313861592bd69e9..ce372a1707e55203f5500c95a0d06f789a6d8f71 100644 (file)
--- a/src/mathed/InsetMathArray.h
+++ b/src/mathed/InsetMathArray.h
@@ -22,37 +22,42 @@ namespace lyx {
 class InsetMathArray : public InsetMathGrid {
 public:
        ///
-       InsetMathArray(docstring const &, int m, int n);
+       InsetMathArray(Buffer * buf, docstring const &, int m, int n);
        ///
-       InsetMathArray(docstring const &, int m, int n,
+       InsetMathArray(Buffer * buf, docstring const &, int m, int n,
                char valign, docstring const & halign);
        /// convenience constructor from whitespace/newline separated data
-       InsetMathArray(docstring const &, docstring const & str);
+       InsetMathArray(Buffer * buf, docstring const &, docstring const & str);
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       Dimension const dimension(BufferView const &) const;
+       void draw(PainterInfo & pi, int x, int y) const override;
        ///
-       void draw(PainterInfo & pi, int x, int y) const;
+       InsetMathArray * asArrayInset() override { return this; }
        ///
-       InsetMathArray * asArrayInset() { return this; }
-       ///
-       InsetMathArray const * asArrayInset() const { return this; }
+       InsetMathArray const * asArrayInset() const override { return this; }
 
        ///
-       void write(WriteStream & os) const;
+       void write(WriteStream & os) const override;
+       ///
+       void infoize(odocstream & os) const override;
+       ///
+       void normalize(NormalStream & os) const override;
        ///
-       void infoize(odocstream & os) const;
+       void maple(MapleStream & os) const override;
        ///
-       void normalize(NormalStream & os) const;
+       void validate(LaTeXFeatures & features) const override;
        ///
-       void maple(MapleStream & os) const;
+       InsetCode lyxCode() const override { return MATH_ARRAY_CODE; }
        ///
-       void validate(LaTeXFeatures & features) const;
+       int leftMargin() const override { return 4; }
        ///
-       InsetCode lyxCode() const { return MATH_ARRAY_CODE; }
+       int rightMargin() const override { return 2; }
+       ///
+       bool handlesMulticolumn() const override { return true; }
+
 private:
-       virtual Inset * clone() const;
+       Inset * clone() const override;
        ///
        docstring name_;
 };