X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibitem.h;h=f18356b9d469286795f718c21952eab6f87a158a;hb=858f6b6c7b630f7672001fb19b55109a89aed142;hp=07174c10dfa44c33d007cc89b10c26d4b7d45621;hpb=12f57a57bd58a7568206bc70700988f3d7cd0ee9;p=lyx.git

diff --git a/src/insets/InsetBibitem.h b/src/insets/InsetBibitem.h
index 07174c10df..f18356b9d4 100644
--- a/src/insets/InsetBibitem.h
+++ b/src/insets/InsetBibitem.h
@@ -12,12 +12,14 @@
 #ifndef INSET_BIBITEM_H
 #define INSET_BIBITEM_H
 
-#include "BiblioInfo.h"
+
 #include "InsetCommand.h"
 
 
 namespace lyx {
 
+class BiblioInfo;
+
 /////////////////////////////////////////////////////////////////////////
 //
 // InsetBibItem
@@ -32,49 +34,69 @@ class InsetBibitem : public InsetCommand
 {
 public:
 	///
-	InsetBibitem(Buffer const &, InsetCommandParams const &);
+	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 { return BIBITEM_CODE; }
 	///
-	static bool isCompatibleCommand(std::string const & s) 
-		{ return s == "bibitem"; }
-private:
+	bool hasSettings() const { return true; }
+	/// \copydoc Inset::initView()
 	/// verify label and update references.
-	/// Overloaded from Inset::initView.
 	void initView();
 	///
 	bool isLabeled() const { return true; }
 	///
 	void read(Lexer & lex);
 	///
-	docstring screenLabel() const;
+	int plaintext(odocstringstream &, OutputParams const &,
+	              size_t max_length = INT_MAX) const;
 	///
-	bool hasSettings() const { return true; }
-	///
-	InsetCode lyxCode() const { return BIBITEM_CODE; }
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
-	docstring bibLabel() const;
+	void collectBibKeys(InsetIterator const &) const;
+	/// update the counter of this inset
+	void updateBuffer(ParIterator const &, UpdateType);
+	///@}
+
+	/// \name Static public methods obligated for InsetCommand derived classes
+	//@{
 	///
-	int plaintext(odocstream &, OutputParams const &) const;
+	static ParamInfo const & findInfo(std::string const &);
 	///
-	void xhtml(odocstream &, 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"; }
+	///@}
+
+private:
 	///
-	void updateCommand(docstring const & new_key, bool dummy = false);
+	docstring bibLabel() const;
+
+	/// \name Private functions inherited from Inset class
+	//@{
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
 	Inset * clone() const { return new InsetBibitem(*this); }
+	///@}
 
-	friend docstring bibitemWidest(Buffer const & buffer);
-	/// The label that is set by updateLabels
+	/// \name Private functions inherited from InsetCommand class
+	//@{
+	///
+	docstring screenLabel() const;
+	//@}
+
+	friend docstring bibitemWidest(Buffer const & buffer, OutputParams const &);
+
+	/// The label that is set by updateBuffer
 	docstring autolabel_;
 	///
 	static int key_counter;
@@ -82,7 +104,8 @@ private:
 
 
 /// Return the widest label in the Bibliography.
-docstring bibitemWidest(Buffer const &);
+docstring bibitemWidest(Buffer const &, OutputParams const &);
+
 
 } // namespace lyx