Revert "Fix a number of signedness warnings"

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

diff --git a/src/mathed/InsetMathColor.h b/src/mathed/InsetMathColor.h
index 9f8419b63307ce966832f3d0bbf79cf820cea634..55a02c259641f8c478de225302721fee195ad08f 100644 (file)
--- a/src/mathed/InsetMathColor.h
+++ b/src/mathed/InsetMathColor.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.
  */
@@ -22,29 +22,33 @@ namespace lyx {
 class InsetMathColor : public InsetMathNest {
 public:
        /// Create a color inset from LyX color number
-       explicit InsetMathColor(bool oldstyle,
-               ColorCode color = Color_none);
+       InsetMathColor(Buffer * buf, bool oldstyle, ColorCode color = Color_none);
        /// Create a color inset from LaTeX color name
-       explicit InsetMathColor(bool oldstyle, docstring const & color);
+       InsetMathColor(Buffer * buf, bool oldstyle, docstring const & color);
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        /// we write extra braces in any case...
        /// FIXME Why? Are they necessary if oldstyle_ == false?
-       bool extraBraces() const { return true; }
+       bool extraBraces() const override { return true; }
        ///
-       void draw(PainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const override;
        /// we need package color
-       void validate(LaTeXFeatures & features) const;
+       void validate(LaTeXFeatures & features) const override;
+       ///
+       void write(WriteStream & os) const override;
+       /// FIXME XHTML For now, we do nothing with color.
+       void mathmlize(MathStream &) const override {}
+       /// FIXME XHTML For now, we do nothing with color.
+       void htmlize(HtmlStream &) const override {}
        ///
-       void write(WriteStream & os) const;
        /// write normalized content
-       void normalize(NormalStream & ns) const;
+       void normalize(NormalStream & ns) const override;
+       ///
+       void infoize(odocstream & os) const override;
        ///
-       void infoize(odocstream & os) const;
+       InsetCode lyxCode() const override { return MATH_COLOR_CODE; }
 private:
-       virtual Inset * clone() const;
-       /// width of '[' in current font
-       mutable int w_;
+       Inset * clone() const override;
        ///
        bool oldstyle_;
        /// Our color. Only valid LaTeX colors are allowed.