X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetinclude.h;h=591965409b086fa5bf2e73a4ab24444e0adc26ce;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=2fa0040fefa64dbac27442ccb99515469963a478;hpb=df199d6d567dd0a9bfdd08fcf1f4846d244daa2c;p=lyx.git

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index 2fa0040fef..591965409b 100644
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -69,34 +69,37 @@ public:
 	void set(Params const & params);
 
 	///
-        Inset * Clone(Buffer const &) const;
+	virtual Inset * clone(Buffer const &, bool same_id = false) const;
 	///
-	Inset::Code LyxCode() const { return Inset::INCLUDE_CODE; }
+	Inset::Code lyxCode() const { return Inset::INCLUDE_CODE; }
 	/// This returns the list of labels on the child buffer
 	std::vector<string> const getLabelList() const;
 	/// 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, unsigned int button);
 	///
-	EDITABLE Editable() const
+	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;
-        ///
-	void Read(Buffer const *, LyXLex &);
+	/// 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 &, bool fragile, bool free_spc) const;
+	int latex(Buffer const *, std::ostream &,
+	          bool fragile, bool free_spc) const;
 	///
-	int Ascii(Buffer const *, std::ostream &, int linelen) const;
+	int ascii(Buffer const *, std::ostream &, int linelen) const;
 	///
-	int Linuxdoc(Buffer const *, std::ostream &) const;
+	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;
+	void validate(LaTeXFeatures &) const;
 	
         /** Input inserts anything inside a paragraph.
 	    Display can give some visual feedback
@@ -116,7 +119,7 @@ public:
 	SigC::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
@@ -126,8 +129,8 @@ private:
 
 	/// the parameters
 	Params params_;
-	///
-	string include_label;
+	/// holds the entity name that defines the file location (SGML) 
+	string const include_label;
 };