X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetinclude.h;h=c42159e30ce4fdfd0297565ac483ea11d2638921;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=cf0a660643d395dced5ecc40acd3434f262aee24;hpb=8b67659646c6850377cb9f44a2a0a22c0e80840c;p=lyx.git

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index cf0a660643..c42159e30c 100644
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -15,8 +15,14 @@
 #include "inset.h"
 #include "insetcommandparams.h"
 #include "render_button.h"
+#include "mailinset.h"
+
+#include "support/filename.h"
+
 #include <boost/scoped_ptr.hpp>
 
+namespace lyx {
+
 class Buffer;
 class Dimension;
 class LaTeXFeatures;
@@ -24,21 +30,21 @@ class RenderMonitoredPreview;
 
 
 /// for including tex/lyx files
-class InsetInclude: public InsetOld {
+class InsetInclude : public InsetOld {
 public:
 	///
 	InsetInclude(InsetCommandParams const &);
 	~InsetInclude();
 
 	/// Override these InsetButton methods if Previewing
-	void metrics(MetricsInfo & mi, Dimension & dim) const;
+	bool metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
 	virtual bool display() const;
 
 	/// get the parameters
-	InsetCommandParams const & params(void) const;
+	InsetCommandParams const & params() const;
 
 	///
 	InsetBase::Code lyxCode() const { return InsetBase::INCLUDE_CODE; }
@@ -47,13 +53,13 @@ public:
 	 *  \param list the list of labels in the child buffer.
 	 */
 	void getLabelList(Buffer const & buffer,
-			  std::vector<lyx::docstring> & list) const;
+			  std::vector<docstring> & list) const;
 	/** Fills \c keys
 	 *  \param buffer the Buffer containing this inset.
 	 *  \param keys the list of bibkeys in the child buffer.
 	 */
 	void fillWithBibKeys(Buffer const & buffer,
-		std::vector<std::pair<std::string,std::string> > & keys) const;
+		std::vector<std::pair<std::string, docstring> > & keys) const;
 	/** Update the cache with all bibfiles in use of the child buffer
 	 *  (including bibfiles of grandchild documents).
 	 *  Does nothing if the child document is not loaded to prevent
@@ -66,7 +72,7 @@ public:
 	 *  Return an empty vector if the child doc is not loaded.
 	 *  \param buffer the Buffer containing this inset.
 	 */
-	std::vector<std::string> const &
+	std::vector<support::FileName> const &
 	getBibfilesCache(Buffer const & buffer) const;
 	///
 	EDITABLE editable() const { return IS_EDITABLE; }
@@ -75,18 +81,22 @@ public:
 	///
 	void read(Buffer const &, LyXLex &);
 	///
-	int latex(Buffer const &, lyx::odocstream &,
+	int latex(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, lyx::odocstream &,
+	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	///
-	int docbook(Buffer const &, std::ostream &,
-		    OutputParams const &) const;
+	int docbook(Buffer const &, odocstream &,
+	    OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures &) const;
 	///
-	void addPreview(lyx::graphics::PreviewLoader &) const;
+	void addPreview(graphics::PreviewLoader &) const;
+	///
+	void addToToc(TocList &, Buffer const &) const;
+	///
+	void updateLabels(Buffer const & buffer) const;
 	///
 	bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
 protected:
@@ -106,7 +116,7 @@ private:
 	/// set the parameters
 	void set(InsetCommandParams const & params, Buffer const &);
 	/// get the text displayed on the button
-	lyx::docstring const getScreenLabel(Buffer const &) const;
+	docstring const getScreenLabel(Buffer const &) const;
 	///
 	void write(std::ostream &) const;
 	///
@@ -115,7 +125,7 @@ private:
 	/// the parameters
 	InsetCommandParams params_;
 	/// holds the entity name that defines the file location (SGML)
-	std::string const include_label;
+	docstring const include_label;
 
 	/// The pointer never changes although *preview_'s contents may.
 	boost::scoped_ptr<RenderMonitoredPreview> const preview_;
@@ -126,8 +136,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetIncludeMailer : public MailInset {
 public:
 	///
@@ -149,4 +157,7 @@ private:
 	InsetInclude & inset_;
 };
 
+
+} // namespace lyx
+
 #endif // INSETINCLUDE_H