X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetTOC.h;h=ca3f463c5ad610d8aa9c63ebde127296a034d561;hb=eb294eadb5e7f22880da399ae082f74567bbfc4e;hp=ead482b2e839870ec93ed3886d12eb528669f517;hpb=050142de1bc5fa73242a46dacbb42f9645a95944;p=lyx.git

diff --git a/src/insets/InsetTOC.h b/src/insets/InsetTOC.h
index ead482b2e8..ca3f463c5a 100644
--- a/src/insets/InsetTOC.h
+++ b/src/insets/InsetTOC.h
@@ -14,11 +14,12 @@
 
 #include "InsetCommand.h"
 
+#include "Toc.h"
+
 
 namespace lyx {
 
 class Paragraph;
-class Toc;
 
 /// Used to insert table of contents and similar lists
 /// at present, supports only \tableofcontents and \listoflistings.
@@ -32,24 +33,24 @@ public:
 	/// \name Public functions inherited from Inset class
 	//@{
 	///
-	InsetCode lyxCode() const { return TOC_CODE; }
+	InsetCode lyxCode() const override { return TOC_CODE; }
 	///
-	docstring layoutName() const;
+	docstring layoutName() const override;
 	///
-	DisplayType display() const { return AlignCenter; }
+	int rowFlags() const override { return Display; }
 	///
-	virtual void validate(LaTeXFeatures &) const;
+	void validate(LaTeXFeatures &) const override;
 	///
 	int plaintext(odocstringstream & ods, OutputParams const & op,
-	              size_t max_length = INT_MAX) const;
+	              size_t max_length = INT_MAX) const override;
 	///
-	int docbook(odocstream &, OutputParams const &) const;
+	void docbook(XMLStream &, OutputParams const &) const override;
 	///
-	docstring xhtml(XHTMLStream & xs, OutputParams const &) const;
+	docstring xhtml(XMLStream & xs, OutputParams const &) const override;
 	///
-	void doDispatch(Cursor & cur, FuncRequest & cmd);
+	void doDispatch(Cursor & cur, FuncRequest & cmd) override;
 	///
-	bool clickable(int, int) const { return true; }
+	bool clickable(BufferView const &, int, int) const override { return true; }
 	//@}
 
 	/// \name Static public methods obligated for InsetCommand derived classes
@@ -64,22 +65,22 @@ public:
 
 private:
 	///
-	void makeTOCWithDepth(XHTMLStream xs, Toc toc, const OutputParams & op) const;
+	void makeTOCWithDepth(XMLStream & xs, Toc const & toc, const OutputParams & op) const;
 	///
-	void makeTOCNoDepth(XHTMLStream xs, Toc toc, const OutputParams & op) const;
+	void makeTOCNoDepth(XMLStream & xs, Toc const & toc, const OutputParams & op) const;
 	///
-	void makeTOCEntry(XHTMLStream & xs, Paragraph const & par, OutputParams const & op) const;
-	
+	void makeTOCEntry(XMLStream & xs, Paragraph const & par, OutputParams const & op) const;
+
 	/// \name Private functions inherited from Inset class
 	//@{
 	///
-	Inset * clone() const { return new InsetTOC(*this); }
+	Inset * clone() const override { return new InsetTOC(*this); }
 	//@}
 
 	/// \name Private functions inherited from InsetCommand class
 	//@{
 	///
-	docstring screenLabel() const;
+	docstring screenLabel() const override;
 	//@}
 };