Revert "Fix a number of signedness warnings"

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

diff --git a/src/mathed/InsetMathXYMatrix.h b/src/mathed/InsetMathXYMatrix.h
index ee20149d30d31f29ea61ca2ac8713111698ef685..5655e33c751f8dcf3f4e282423d71c3ada11b71e 100644 (file)
--- a/src/mathed/InsetMathXYMatrix.h
+++ b/src/mathed/InsetMathXYMatrix.h
@@ -12,9 +12,10 @@
 #ifndef MATH_XYMATRIX_H
 #define MATH_XYMATRIX_H
 
-#include "Length.h"
 #include "InsetMathGrid.h"
 
+#include "support/Length.h"
+
 
 namespace lyx {
 
@@ -22,38 +23,45 @@ namespace lyx {
 class InsetMathXYMatrix : public InsetMathGrid {
 public:
        ///
-       InsetMathXYMatrix(Buffer * buf, Length const & = Length(), char c = '\0');
+       InsetMathXYMatrix(Buffer * buf, Length const & = Length(), char c = '\0',
+               bool equal_spacing = false);
+       ///
+       void metrics(MetricsInfo &, Dimension &) const override;
        ///
-       void metrics(MetricsInfo &, Dimension &) const;
+       void draw(PainterInfo & pi, int x, int y) const override;
        ///
        InsetMathXYMatrix const * asXYMatrixInset() const { return this; }
        ///
-       virtual int colsep() const;
+       int colsep() const override;
        ///
-       virtual int rowsep() const;
+       int rowsep() const override;
 
        ///
-       void normalize();
+       void write(WriteStream & os) const override;
        ///
-       void write(WriteStream & os) const;
+       void infoize(odocstream & os) const override;
        ///
-       void infoize(odocstream & os) const;
+       void normalize(NormalStream &) const override;
        ///
-       void normalize(NormalStream &) const;
+       void maple(MapleStream &) const override;
        ///
-       void maple(MapleStream &) const;
+       void validate(LaTeXFeatures & features) const override;
        ///
-       void validate(LaTeXFeatures & features) const;
+       InsetCode lyxCode() const override { return MATH_XYMATRIX_CODE; }
        ///
-       InsetCode lyxCode() const { return MATH_XYMATRIX_CODE; }
+       void mathmlize(MathStream &) const override;
+       ///
+       void htmlize(HtmlStream &) const override;
 
 private:
        ///
-       virtual Inset * clone() const;
+       Inset * clone() const override;
        /// extra spacing, may be empty
        Length spacing_;
        ///
        char spacing_code_;
+       ///
+       bool equal_spacing_;
 };