X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathGrid.h;h=992844cfb875cd25a7c6b02e8ee238f1b9fb7706;hb=ecafea8227d0c51f36dbf8ff45e9c3ebc15e19cf;hp=89c8e7f07911852590f83851a22e0574bc13eb8e;hpb=d94b708a0fec6ade04fc9d09bd86afd73e72fac7;p=lyx.git

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 89c8e7f079..992844cfb8 100644
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -13,13 +13,13 @@
 #define MATH_GRID_H
 
 #include "InsetMathNest.h"
-#include "Length.h"
+
+#include "support/Length.h"
 
 #include <map>
 
 namespace lyx {
 
-class BufferParams;
 class BufferView;
 
 /** Gridded math inset base class.
@@ -39,54 +39,45 @@ public:
 	};
 
 	/// additional per-cell information
-	class CellInfo {
-	public:
-		///
-		CellInfo();
+	struct CellInfo {
 		/// multicolumn flag
-		Multicolumn multi;
-		/// special multi colums alignment
+		Multicolumn multi = CELL_NORMAL;
+		/// special multi columns alignment
 		docstring align;
 	};
 
 	/// additional per-row information
-	class RowInfo {
-	public:
-		///
-		RowInfo();
+	struct RowInfo {
 		///
 		int skipPixels(MetricsInfo const & mi) const;
 		/// cached descent
-		mutable int descent;
+		mutable int descent = 0;
 		/// cached ascent
-		mutable int ascent;
+		mutable int ascent = 0;
 		/// cached offset for each bufferview
 		mutable std::map<BufferView const *, int> offset;
 		/// how many hlines above this row?
-		unsigned int lines;
+		unsigned int lines = 0;
 		/// parameter to the line break
 		Length crskip;
 		/// extra distance between lines
-		int skip;
+		int skip = 0;
 		/// Is a page break allowed after this row?
-		bool allow_newpage;
+		bool allow_newpage = true;
 	};
 
 	// additional per-row information
-	class ColInfo {
-	public:
-		///
-		ColInfo();
+	struct ColInfo {
 		/// currently possible: 'l', 'c', 'r'
-		char align;
+		char align = 'c';
 		/// cached width
-		mutable int width;
+		mutable int width = 0;
 		/// cached offset
-		mutable int offset;
+		mutable int offset = 0;
 		/// how many lines to the left of this column?
-		unsigned int lines;
+		unsigned int lines = 0;
 		/// additional amount to the right to be skipped when drawing
-		int skip;
+		int skip = 0;
 		/// Special alignment.
 		/// This does also contain align_ and lines_ if it is nonempty.
 		/// It needs to be in sync with align_ and lines_ because some
@@ -95,7 +86,7 @@ public:
 	};
 
 public:
-	/// sets nrows and ncols to 1, vertical alingment to 'c'
+	/// sets nrows and ncols to 1, vertical alignment to 'c'
 	explicit InsetMathGrid(Buffer * buf);
 	/// Note: columns first!
 	InsetMathGrid(Buffer * buf, col_type m, row_type n);
@@ -103,17 +94,17 @@ public:
 	InsetMathGrid(Buffer * buf, col_type m, row_type n, char valign,
 		docstring const & halign);
 	///
-	marker_type marker(BufferView const *) const { return MARKER2; };
+	marker_type marker(BufferView const *) const override { return marker_type::MARKER2; };
 	///
-	void metrics(MetricsInfo & mi, Dimension &) const;
+	void metrics(MetricsInfo & mi, Dimension &) const override;
 	///
-	void draw(PainterInfo & pi, int x, int y) const;
+	void draw(PainterInfo & pi, int x, int y) const override;
 	///
-	void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
+	void metricsT(TextMetricsInfo const & mi, Dimension & dim) const override;
 	///
-	void drawT(TextPainter & pi, int x, int y) const;
+	void drawT(TextPainter & pi, int x, int y) const override;
 	///
-	void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false);
+	void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false) override;
 	/// extract number of columns from alignment string
 	static col_type guessColumns(docstring const & halign);
 	/// accepts some LaTeX column codes: p,m,!,@,M,<,>
@@ -143,36 +134,36 @@ public:
 	///
 	CellInfo & cellinfo(idx_type idx) { return cellinfo_[idx]; }
 	/// identifies GridInset
-	InsetMathGrid * asGridInset() { return this; }
+	InsetMathGrid * asGridInset() override { return this; }
 	/// identifies GridInset
-	InsetMathGrid const * asGridInset() const { return this; }
+	InsetMathGrid const * asGridInset() const override { return this; }
 	//
-	bool isTable() const { return true; }
+	bool isTable() const override { return true; }
 	///
-	col_type ncols() const;
+	col_type ncols() const override;
 	///
-	row_type nrows() const;
+	row_type nrows() const override;
 	///
-	col_type col(idx_type idx) const;
+	col_type col(idx_type idx) const override;
 	///
-	row_type row(idx_type idx) const;
+	row_type row(idx_type idx) const override;
 	/// number of columns of cell \p idx
 	col_type ncellcols(idx_type idx) const;
 
 	///
-	bool idxUpDown(Cursor &, bool up) const;
+	bool idxUpDown(Cursor &, bool up) const override;
 	///
-	bool idxBackward(Cursor &) const;
+	bool idxBackward(Cursor &) const override;
 	///
-	bool idxForward(Cursor &) const;
+	bool idxForward(Cursor &) const override;
 	//
-	idx_type firstIdx() const;
+	idx_type firstIdx() const override;
 	//
-	idx_type lastIdx() const;
+	idx_type lastIdx() const override;
 	///
-	bool idxDelete(idx_type & idx);
+	bool idxDelete(idx_type & idx) override;
 	/// pulls cell after pressing erase
-	void idxGlue(idx_type idx);
+	void idxGlue(idx_type idx) override;
 
 	/// add a row, one row down
 	virtual void addRow(row_type r);
@@ -191,9 +182,9 @@ public:
 	/// swap two columns
 	virtual void swapCol(col_type c);
 	///
-	idx_type index(row_type r, col_type c) const;
+	idx_type index(row_type r, col_type c) const override;
 	///
-	bool idxBetween(idx_type idx, idx_type from, idx_type to) const;
+	bool idxBetween(idx_type idx, idx_type from, idx_type to) const override;
 	///
 	virtual int defaultColSpace(col_type) { return 0; }
 	///
@@ -201,7 +192,7 @@ public:
 	///
 	void setDefaults();
 	///
-	virtual bool interpretString(Cursor & cur, docstring const & str);
+	bool interpretString(Cursor & cur, docstring const & str) override;
 
 	///
 	virtual int colsep() const;
@@ -217,32 +208,32 @@ public:
 	virtual bool handlesMulticolumn() const { return false; }
 
 	///
-	void write(WriteStream & os) const;
+	void write(WriteStream & os) const override;
 	///
 	void write(WriteStream & os,
 		   row_type beg_row, col_type beg_col,
 		   row_type end_row, col_type end_col) const;
 	///
-	void normalize(NormalStream &) const;
+	void normalize(NormalStream &) const override;
 	///
-	//void maple(MapleStream &) const;
+	//void maple(MapleStream &) const override;
 	///
-	void mathmlize(MathStream &) const;
+	void mathmlize(MathMLStream &) const override;
 	///
-	void htmlize(HtmlStream &) const;
+	void htmlize(HtmlStream &) const override;
 	///
-	void htmlize(HtmlStream &, std::string attrib) const;
+	void htmlize(HtmlStream &, std::string const & attrib) const;
 	///
-	void validate(LaTeXFeatures & features) const;
+	void validate(LaTeXFeatures & features) const override;
 	///
-	//void octave(OctaveStream &) const;
+	//void octave(OctaveStream &) const override;
 
 protected:
 	///
-	void doDispatch(Cursor & cur, FuncRequest & cmd);
+	void doDispatch(Cursor & cur, FuncRequest & cmd) override;
 	///
 	bool getStatus(Cursor & cur, FuncRequest const & cmd,
-		FuncStatus & flag) const;
+		FuncStatus & flag) const override;
 	/// returns x offset of cell compared to inset
 	int cellXOffset(BufferView const &, idx_type idx) const;
 	/// returns y offset of cell compared to inset
@@ -281,7 +272,7 @@ protected:
 	int hLineVOffset(BufferView const &, row_type row, unsigned int line) const;
 
 	///
-	InsetCode lyxCode() const { return MATH_GRID_CODE; }
+	InsetCode lyxCode() const override { return MATH_GRID_CODE; }
 
 private:
 	/// row info.
@@ -295,7 +286,7 @@ private:
 	///
 	char v_align_; // FIXME: add approp. type
 	///
-	Inset * clone() const;
+	Inset * clone() const override;
 };