X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibitem.h;h=2a210e8c907085a711a654c500af9803afc1df59;hb=eb294eadb5e7f22880da399ae082f74567bbfc4e;hp=b69e85f6cdd1b847976db762b15ccbf3766bb450;hpb=d3365ebbe748a5500186729add2969c7dc34b812;p=lyx.git

diff --git a/src/insets/InsetBibitem.h b/src/insets/InsetBibitem.h
index b69e85f6cd..2a210e8c90 100644
--- a/src/insets/InsetBibitem.h
+++ b/src/insets/InsetBibitem.h
@@ -12,7 +12,7 @@
 #ifndef INSET_BIBITEM_H
 #define INSET_BIBITEM_H
 
-#include "BiblioInfo.h"
+
 #include "InsetCommand.h"
 
 
@@ -34,47 +34,70 @@ public:
 	///
 	InsetBibitem(Buffer *, InsetCommandParams const &);
 	///
-	virtual ~InsetBibitem();
+	~InsetBibitem();
+
 	///
-	static ParamInfo const & findInfo(std::string const &);
+	void updateCommand(docstring const & new_key, bool dummy = false);
+
+	/// \name Public functions inherited from Inset class
+	//@{
 	///
-	static std::string defaultCommand() { return "bibitem"; }
+	InsetCode lyxCode() const override { return BIBITEM_CODE; }
 	///
-	static bool isCompatibleCommand(std::string const & s) 
-		{ return s == "bibitem"; }
-private:
+	bool hasSettings() const override { return true; }
+	/// \copydoc Inset::initView()
 	/// verify label and update references.
-	/// Overloaded from Inset::initView.
-	void initView();
+	void initView() override;
 	///
-	bool isLabeled() const { return true; }
+	bool isLabeled() const override { return true; }
 	///
-	void read(Lexer & lex);
+	void read(Lexer & lex) override;
 	///
-	docstring screenLabel() const;
+	int plaintext(odocstringstream &, OutputParams const &,
+	              size_t max_length = INT_MAX) const override;
 	///
-	bool hasSettings() const { return true; }
+	docstring xhtml(XMLStream &, OutputParams const &) const override;
 	///
-	InsetCode lyxCode() const { return BIBITEM_CODE; }
+	void docbook(XMLStream &, OutputParams const &) const override;
 	///
-	docstring bibLabel() const;
+	void collectBibKeys(InsetIterator const &, support::FileNameList &) const override;
+	/// update the counter of this inset
+	void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false) override;
+	///@}
+
+	/// \name Static public methods obligated for InsetCommand derived classes
+	//@{
 	///
-	int plaintext(odocstream &, OutputParams const &) const;
+	static ParamInfo const & findInfo(std::string const &);
 	///
-	docstring xhtml(XHTMLStream &, OutputParams const &) const;
+	static std::string defaultCommand() { return "bibitem"; }
 	///
-	virtual void fillWithBibKeys(BiblioInfo &, InsetIterator const &) const;
-	/// Update the counter of this inset
-	virtual void updateLabels(ParIterator const &);
+	static bool isCompatibleCommand(std::string const & s)
+		{ return s == "bibitem"; }
 	///
-	void updateCommand(docstring const & new_key, bool dummy = false);
+	docstring bibLabel() const;
+	///@}
+
+private:
+	/// \name Private functions inherited from Inset class
+	//@{
+	///
+	void doDispatch(Cursor & cur, FuncRequest & cmd) override;
 	///
-	void doDispatch(Cursor & cur, FuncRequest & cmd);
+	Inset * clone() const override { return new InsetBibitem(*this); }
+	/// Is the content of this inset part of the immediate (visible) text sequence?
+	bool isPartOfTextSequence() const override { return false; }
+	///@}
+
+	/// \name Private functions inherited from InsetCommand class
+	//@{
 	///
-	Inset * clone() const { return new InsetBibitem(*this); }
+	docstring screenLabel() const override;
+	//@}
 
-	friend docstring bibitemWidest(Buffer const & buffer);
-	/// The label that is set by updateLabels
+	friend docstring bibitemWidest(Buffer const & buffer, OutputParams const &);
+
+	/// The label that is set by updateBuffer
 	docstring autolabel_;
 	///
 	static int key_counter;
@@ -82,7 +105,8 @@ private:
 
 
 /// Return the widest label in the Bibliography.
-docstring bibitemWidest(Buffer const &);
+docstring bibitemWidest(Buffer const &, OutputParams const &);
+
 
 } // namespace lyx