X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbibtex.h;h=3c461d73bb02d76936b632af361c4f0a4f98017d;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=ebe85dae8f4a7fba1df6fd9b68983bc90fe82b2f;hpb=2e57f2ff0ae7cd4a6efbf634ffe6d2f4379d9cfc;p=lyx.git

diff --git a/src/insets/insetbibtex.h b/src/insets/insetbibtex.h
index ebe85dae8f..3c461d73bb 100644
--- a/src/insets/insetbibtex.h
+++ b/src/insets/insetbibtex.h
@@ -6,7 +6,7 @@
  *
  * \author Alejandro Aguilar Sierra
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSET_BIBTEX_H
@@ -16,7 +16,10 @@
 #include <vector>
 #include "insetcommand.h"
 
-class Buffer;
+#include "support/filename.h"
+
+
+namespace lyx {
 
 /** Used to insert BibTeX's information
   */
@@ -25,42 +28,34 @@ public:
 	///
 	InsetBibtex(InsetCommandParams const &);
 	///
-	~InsetBibtex();
-	///
-	std::auto_ptr<InsetBase> clone() const {
-		return std::auto_ptr<InsetBase>(new InsetBibtex(params()));
-	}
-	/// small wrapper for the time being
-	virtual dispatch_result localDispatch(FuncRequest const & cmd);
-	///
-	string const getScreenLabel(Buffer const *) const;
+	docstring const getScreenLabel(Buffer const &) const;
 	///
 	EDITABLE editable() const { return IS_EDITABLE; }
 	///
-	InsetOld::Code lyxCode() const { return InsetOld::BIBTEX_CODE; }
+	InsetBase::Code lyxCode() const { return InsetBase::BIBTEX_CODE; }
 	///
-	int latex(Buffer const *, std::ostream &,
-		  LatexRunParams const &) const;
+	bool display() const { return true; }
 	///
-	void fillWithBibKeys(Buffer const * buffer,
-		std::vector<std::pair<string,string> > & keys) const;
+	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	std::vector<string> const getFiles(Buffer const &) const;
+	void fillWithBibKeys(Buffer const & buffer,
+		std::vector<std::pair<std::string, docstring> > & keys) const;
 	///
-	bool addDatabase(string const &);
+	std::vector<support::FileName> const getFiles(Buffer const &) const;
 	///
-	bool delDatabase(string const &);
+	bool addDatabase(std::string const &);
 	///
-	bool display() const { return true; }
+	bool delDatabase(std::string const &);
 	///
-	struct Holder {
-		InsetBibtex * inset;
-		BufferView * view;
-	};
-
+	void validate(LaTeXFeatures &) const;
+protected:
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 private:
-	///
-	Holder holder;
+	virtual std::auto_ptr<InsetBase> doClone() const;
+
 };
 
+
+} // namespace lyx
+
 #endif // INSET_BIBTEX_H