X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetinclude.h;h=9aed79b72bf9b6013829448e171689f36743be29;hb=3c7232560282456bae466ef66e69d3eb511500fd;hp=2a21c2976e8d6c3220c8a8e46a5808ca85d1d0ca;hpb=85a5ea7bfc80e179a61a99f2955455e84d3384cc;p=lyx.git

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index 2a21c2976e..9aed79b72b 100644
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -3,7 +3,7 @@
  * ======================================================
  *
  *           LyX, The Document Processor
- * 	
+ *
  *	    Copyright 1997 LyX Team (this file was created this year)
  *
  * ====================================================== */
@@ -17,6 +17,8 @@
 
 #include "insetcommand.h"
 
+#include <boost/signals/signal0.hpp>
+
 class Buffer;
 struct LaTeXFeatures;
 
@@ -26,8 +28,8 @@ struct LaTeXFeatures;
  */
 class InsetInclude: public InsetButton, boost::noncopyable {
 public:
-        /// the type of inclusion
-        enum Flags {
+	/// the type of inclusion
+	enum Flags {
 		///
 		INCLUDE = 0,
 		///
@@ -69,7 +71,7 @@ public:
 	void set(Params const & params);
 
 	///
-        virtual Inset * clone(Buffer const &) const;
+	virtual Inset * clone(Buffer const &, bool same_id = false) const;
 	///
 	Inset::Code lyxCode() const { return Inset::INCLUDE_CODE; }
 	/// This returns the list of labels on the child buffer
@@ -77,15 +79,17 @@ public:
 	/// This returns the list of bibkeys on the child buffer
 	std::vector< std::pair<string,string> > const getKeys() const;
 	///
-	void edit(BufferView *, int x, int y, unsigned int button);
+	void edit(BufferView *, int x, int y, mouse_button::state button);
+	///
+	void edit(BufferView * bv, bool front = true);
 	///
 	EDITABLE editable() const
 	{
 		return IS_EDITABLE;
 	}
-        /// With lyx3 we won't overload these 3 methods
-        void write(Buffer const *, std::ostream &) const;
-        ///
+	/// With lyx3 we won't overload these 3 methods
+	void write(Buffer const *, std::ostream &) const;
+	///
 	void read(Buffer const *, LyXLex &);
 	///
 	int latex(Buffer const *, std::ostream &,
@@ -95,40 +99,40 @@ public:
 	///
 	int linuxdoc(Buffer const *, std::ostream &) const;
 	///
-	int docBook(Buffer const *, std::ostream &) const;
+	int docbook(Buffer const *, std::ostream &) const;
 	///
 	void validate(LaTeXFeatures &) const;
-	
-        /** Input inserts anything inside a paragraph.
+
+	/** Input inserts anything inside a paragraph.
 	    Display can give some visual feedback
 	*/
 	bool display() const;
 
-	/// return the filename stub of the included file 
+	/// return the filename stub of the included file
 	string const getRelFileBaseName() const;
- 
+
 	/// return true if the included file is not loaded
 	bool isIncludeOnly() const;
 
 	/// return true if the file is or got loaded.
 	bool loadIfNeeded() const;
- 
-	/// hide a dialog if about 
-	SigC::Signal0<void> hideDialog;
+
+	/// hide a dialog if about
+	boost::signal0<void> hideDialog;
 private:
 	/// get the text displayed on the button
-	string const getScreenLabel() const;
+	string const getScreenLabel(Buffer const *) const;
 	/// is this a verbatim include ?
 	bool isVerbatim() const;
-        /// get the filename of the master buffer
-        string const getMasterFilename() const;
-        /// get the included file name
-        string const getFileName() const;
+	/// get the filename of the master buffer
+	string const getMasterFilename() const;
+	/// get the included file name
+	string const getFileName() const;
 
 	/// the parameters
 	Params params_;
-	///
-	string include_label;
+	/// holds the entity name that defines the file location (SGML)
+	string const include_label;
 };