X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBox.h;h=898376583648135bb344f9f03d74b9b8464482a8;hb=d9082639080b9de993742bd352f92e5183058cf5;hp=3dfe2286c3a13e49f79ff3cbfa848b247d384f72;hpb=27add8d945ba8e1395dd643f5b5f5cfc985a816e;p=lyx.git

diff --git a/src/mathed/InsetMathBox.h b/src/mathed/InsetMathBox.h
index 3dfe2286c3..8983765836 100644
--- a/src/mathed/InsetMathBox.h
+++ b/src/mathed/InsetMathBox.h
@@ -14,8 +14,6 @@
 
 #include "InsetMathNest.h"
 
-#include <string>
-
 
 namespace lyx {
 
@@ -25,28 +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;
+	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;
 	///
-	void normalize(NormalStream & ns) const;
+	void normalize(NormalStream & ns) const override;
 	///
-	void mathmlize(MathStream & ms) const;
+	void mathmlize(MathMLStream & ms) const override;
 	///
-	void htmlize(HtmlStream & 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_;
 };
@@ -56,28 +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(MathStream & ms) const;
+	void mathmlize(MathMLStream & ms) const override;
 	///
-	void htmlize(HtmlStream & 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;
 private:
 	///
-	Inset * clone() const { return new InsetMathFBox(*this); }
+	Inset * clone() const override { return new InsetMathFBox(*this); }
 };
 
 
@@ -87,25 +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;
 	///
-	void htmlize(HtmlStream & ms) const;
+	void htmlize(HtmlStream & ms) const override;
 	///
-	mode_type currentMode() const { return TEXT_MODE; }
+	mode_type currentMode() const override { return TEXT_MODE; }
 	///
-	void infoize(odocstream & os) const;
+	void infoize(odocstream & os) const override;
 	///
-	void validate(LaTeXFeatures & features) const;
+	void validate(LaTeXFeatures & features) const override;
 private:
-	Inset * clone() const { return new InsetMathMakebox(*this); }
+	Inset * clone() const override { return new InsetMathMakebox(*this); }
 	///
 	bool framebox_;
 };
@@ -116,25 +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;
+	void validate(LaTeXFeatures & features) const override;
 	///
-	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;
 	///
-	void mathmlize(MathStream & ms) const;
+	void mathmlize(MathMLStream & ms) const override;
 	///
-	void htmlize(HtmlStream & 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); }
 };