X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.h;h=9a05758a88d969de10ebc733accf97fc12216765;hb=5cadecf3f66912361e30e0e978b2098f0ba5cde7;hp=e715b8b4a62012ec0229b294f8bbcdaa74dad5f7;hpb=9b39c142b6a7b1f7a131906b15cdd602cc0237f8;p=lyx.git

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index e715b8b4a6..9a05758a88 100644
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -13,13 +13,14 @@
 #ifndef INSET_INCLUDE_H
 #define INSET_INCLUDE_H
 
-#include "BiblioInfo.h"
 #include "InsetCommand.h"
+
+#include "BiblioInfo.h"
+#include "Counters.h"
 #include "InsetCommandParams.h"
 #include "RenderButton.h"
-#include "MailInset.h"
-#include "Counters.h"
-#include "EmbeddedFiles.h"
+
+#include "support/FileNameList.h"
 
 #include <boost/scoped_ptr.hpp>
 
@@ -27,6 +28,7 @@ namespace lyx {
 
 class Buffer;
 class Dimension;
+class InsetLabel;
 class LaTeXFeatures;
 class RenderMonitoredPreview;
 
@@ -35,20 +37,19 @@ class InsetInclude : public InsetCommand {
 public:
 	///
 	InsetInclude(InsetCommandParams const &);
+	~InsetInclude();
+
+	void setBuffer(Buffer & buffer);
+	bool isLabeled() const { return true; }
 
 	/// Override these InsetButton methods if Previewing
 	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	virtual DisplayType display() const;
+	DisplayType display() const;
 	///
 	InsetCode lyxCode() const { return INCLUDE_CODE; }
-	/** Fills \c list
-	 *  \param buffer the Buffer containing this inset.
-	 *  \param list the list of labels in the child buffer.
-	 */
-	void getLabelList(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.
@@ -68,7 +69,7 @@ public:
 	 *  Return an empty vector if the child doc is not loaded.
 	 *  \param buffer the Buffer containing this inset.
 	 */
-	EmbeddedFileList const &
+	support::FileNameList const &
 		getBibfilesCache(Buffer const & buffer) const;
 	///
 	EDITABLE editable() const { return IS_EDITABLE; }
@@ -86,14 +87,10 @@ public:
 	void addToToc(ParConstIterator const &) const;
 	///
 	void updateLabels(ParIterator const &);
-	/// child document can be embedded
-	void registerEmbeddedFiles(EmbeddedFileList &) const;
-	///
-	void updateEmbeddedFile(EmbeddedFile const & file);
 	///
 	static ParamInfo const & findInfo(std::string const &);
 	///
-	static std::string defaultCommand() { return "include"; };
+	static std::string defaultCommand() { return "include"; }
 	///
 	static bool isCompatibleCommand(std::string const & s);
 protected:
@@ -101,7 +98,7 @@ protected:
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 private:
-	Inset * clone() const;
+	Inset * clone() const { return new InsetInclude(*this); }
 
 	/** Slot receiving a signal that the external file has changed
 	 *  and the preview should be regenerated.
@@ -122,18 +119,12 @@ private:
 	mutable bool set_label_;
 	mutable RenderButton button_;
 	mutable docstring listings_label_;
+	InsetLabel * label_;
 };
 
-/// return the child buffer if the file is a LyX doc and is loaded
-Buffer * getChildBuffer(Buffer const & buffer, InsetCommandParams const & params);
-	
 /// return loaded Buffer or zero if the file loading did not proceed.
 Buffer * loadIfNeeded(Buffer const & parent, InsetCommandParams const & params);
 
-///
-void resetParentBuffer(Buffer const * parent, InsetCommandParams const & params,
-	bool close_it);
-
 } // namespace lyx
 
-#endif // INSETINCLUDE_H
+#endif // INSET_INCLUDE_H