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

diff --git a/src/insets/insetbibtex.h b/src/insets/insetbibtex.h
index 0a7cbf7093..3c461d73bb 100644
--- a/src/insets/insetbibtex.h
+++ b/src/insets/insetbibtex.h
@@ -16,6 +16,11 @@
 #include <vector>
 #include "insetcommand.h"
 
+#include "support/filename.h"
+
+
+namespace lyx {
+
 /** Used to insert BibTeX's information
   */
 class InsetBibtex : public InsetCommand {
@@ -23,23 +28,20 @@ public:
 	///
 	InsetBibtex(InsetCommandParams const &);
 	///
-	std::auto_ptr<InsetBase> clone() const;
-	///
-	std::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; }
 	///
 	bool display() const { return true; }
 	///
-	int latex(Buffer const &, std::ostream &,
-		  OutputParams const &) const;
+	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
 	void fillWithBibKeys(Buffer const & buffer,
-		std::vector<std::pair<std::string,std::string> > & keys) const;
+		std::vector<std::pair<std::string, docstring> > & keys) const;
 	///
-	std::vector<std::string> const getFiles(Buffer const &) const;
+	std::vector<support::FileName> const getFiles(Buffer const &) const;
 	///
 	bool addDatabase(std::string const &);
 	///
@@ -47,8 +49,13 @@ public:
 	///
 	void validate(LaTeXFeatures &) const;
 protected:
-	///
-	virtual void priv_dispatch(LCursor & cur, FuncRequest & cmd);
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+private:
+	virtual std::auto_ptr<InsetBase> doClone() const;
+
 };
 
+
+} // namespace lyx
+
 #endif // INSET_BIBTEX_H