nullptr

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

diff --git a/src/mathed/InsetMathBox.h b/src/mathed/InsetMathBox.h
index 4ef299401d9b6df2dd4931e6ab8384b8f0cc71fc..898376583648135bb344f9f03d74b9b8464482a8 100644 (file)
--- a/src/mathed/InsetMathBox.h
+++ b/src/mathed/InsetMathBox.h
@@ -14,8 +14,6 @@
 
 #include "InsetMathNest.h"
 
-#include <string>
-
 
 namespace lyx {
 
@@ -25,26 +23,28 @@ public:
        ///
        explicit InsetMathBox(Buffer * buf, docstring const & name);
        ///
-       mode_type currentMode() const { return TEXT_MODE; }
+       mode_type currentMode() const override { return TEXT_MODE; }
+       ///
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void draw(PainterInfo & pi, int x, int y) const override;
        ///
-       void draw(PainterInfo & pi, int x, int y) const;
+       void write(TeXMathStream & os) const override;
        ///
-       void write(WriteStream & os) const;
+       void normalize(NormalStream & ns) const override;
        ///
-       void normalize(NormalStream & ns) const;
+       void mathmlize(MathMLStream & ms) const override;
        ///
-       void mathmlize(MathStream & ms) const;
+       void htmlize(HtmlStream & ms) const override;
        ///
-       void infoize(odocstream & os) const;
+       void infoize(odocstream & os) const override;
        ///
-       void validate(LaTeXFeatures & features) const;
+       void validate(LaTeXFeatures & features) const override;
        ///
-       InsetCode lyxCode() const { return MATH_BOX_CODE; }
+       InsetCode lyxCode() const override { return MATH_BOX_CODE; }
 
 private:
-       Inset * clone() const { return new InsetMathBox(*this); }
+       Inset * clone() const override { return new InsetMathBox(*this); }
        ///
        docstring name_;
 };
@@ -54,24 +54,30 @@ private:
 class InsetMathFBox : public InsetMathNest {
 public:
        ///
-       InsetMathFBox(Buffer * buf);
+       explicit InsetMathFBox(Buffer * buf);
+       ///
+       mode_type currentMode() const override { return TEXT_MODE; }
        ///
-       mode_type currentMode() const { return TEXT_MODE; }
+       marker_type marker(BufferView const *) const override { return marker_type::NO_MARKER; }
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void draw(PainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const override;
        ///
-       void write(WriteStream & os) const;
+       void write(TeXMathStream & os) const override;
        /// write normalized content
-       void normalize(NormalStream & ns) const;
+       void normalize(NormalStream & ns) const override;
+       ///
+       void mathmlize(MathMLStream & ms) const override;
+       ///
+       void htmlize(HtmlStream & ms) const override;
        ///
-       //void mathmlize(MathStream & ms) const;
+       void infoize(odocstream & os) const override;
        ///
-       void infoize(odocstream & os) const;
+       void validate(LaTeXFeatures & features) const override;
 private:
        ///
-       Inset * clone() const { return new InsetMathFBox(*this); }
+       Inset * clone() const override { return new InsetMathFBox(*this); }
 };
 
 
@@ -81,21 +87,25 @@ public:
        ///
        InsetMathMakebox(Buffer * buf, bool framebox);
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void draw(PainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const override;
        ///
-       void write(WriteStream & os) const;
+       void write(TeXMathStream & os) const override;
        /// write normalized content
-       void normalize(NormalStream & ns) const;
+       void normalize(NormalStream & ns) const override;
        ///
-       //void mathmlize(MathStream & ms) const;
+       void mathmlize(MathMLStream & ms) const override;
        ///
-       mode_type currentMode() const { return TEXT_MODE; }
+       void htmlize(HtmlStream & ms) const override;
        ///
-       void infoize(odocstream & os) const;
+       mode_type currentMode() const override { return TEXT_MODE; }
+       ///
+       void infoize(odocstream & os) const override;
+       ///
+       void validate(LaTeXFeatures & features) const override;
 private:
-       Inset * clone() const { return new InsetMathMakebox(*this); }
+       Inset * clone() const override { return new InsetMathMakebox(*this); }
        ///
        bool framebox_;
 };
@@ -106,23 +116,27 @@ private:
 class InsetMathBoxed : public InsetMathNest {
 public:
        ///
-       InsetMathBoxed(Buffer * buf);
+       explicit InsetMathBoxed(Buffer * buf);
+       ///
+       marker_type marker(BufferView const *) const override { return marker_type::NO_MARKER; }
+       ///
+       void validate(LaTeXFeatures & features) const override;
        ///
-       void validate(LaTeXFeatures & features) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void draw(PainterInfo & pi, int x, int y) const override;
        ///
-       void draw(PainterInfo & pi, int x, int y) const;
+       void write(TeXMathStream & os) const override;
        ///
-       void write(WriteStream & os) const;
+       void mathmlize(MathMLStream & ms) const override;
        ///
-       //void mathmlize(MathStream & ms) const;
+       void htmlize(HtmlStream & ms) const override;
        /// write normalized content
-       void normalize(NormalStream & ns) const;
+       void normalize(NormalStream & ns) const override;
        ///
-       void infoize(odocstream & os) const;
+       void infoize(odocstream & os) const override;
 private:
-       Inset * clone() const { return new InsetMathBoxed(*this); }
+       Inset * clone() const override { return new InsetMathBoxed(*this); }
 };