X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibitem.h;h=c28f66aa5206dec22ee30858cbdc0eab1156da05;hb=2906a35663b92030b0668a42ab370dba8ffca4cf;hp=4c298c32d9e94f2d39f748d8f00b5ae56041dc38;hpb=d65020b293ab208b1391f96a731e53e0c7274a02;p=lyx.git

diff --git a/src/insets/InsetBibitem.h b/src/insets/InsetBibitem.h
index 4c298c32d9..c28f66aa52 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
@@ -34,46 +36,65 @@ 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 { 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;
-	///
-	bool hasSettings() const { return true; }
-	///
-	InsetCode lyxCode() const { return BIBITEM_CODE; }
-	///
-	docstring bibLabel() const;
-	///
 	int plaintext(odocstream &, OutputParams const &) const;
 	///
 	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
-	virtual void fillWithBibKeys(BiblioInfo &, InsetIterator const &) const;
-	/// Update the counter of this inset
+	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
+	//@{
 	///
-	void updateCommand(docstring const & new_key, bool dummy = false);
+	static ParamInfo const & findInfo(std::string const &);
+	///
+	static std::string defaultCommand() { return "bibitem"; }
+	///
+	static bool isCompatibleCommand(std::string const & s) 
+		{ return s == "bibitem"; }
+	///@}
+
+private:
+	///
+	docstring bibLabel() const;
+
+	/// \name Private functions inherited from Inset class
+	//@{
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
 	Inset * clone() const { return new InsetBibitem(*this); }
+	///@}
+
+	/// \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_;
 	///
@@ -84,6 +105,7 @@ private:
 /// Return the widest label in the Bibliography.
 docstring bibitemWidest(Buffer const &, OutputParams const &);
 
+
 } // namespace lyx
 
 #endif // INSET_BIBITEM_H