X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.h;h=18329fe6d9117826e8f62c9eaf2e1b8990123d8f;hb=6e4e0869006aa4c225162164aaa14a70d041facf;hp=2cd2a762a005138b64d7854638368798fd0d1e8b;hpb=4b1777d2fa533f5a36f010c592a0408be92cdbd2;p=lyx.git

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index 2cd2a762a0..18329fe6d9 100644
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -17,7 +17,8 @@
 
 #include "RenderButton.h"
 
-#include <boost/scoped_ptr.hpp>
+#include "support/unique_ptr.h"
+
 
 namespace lyx {
 
@@ -35,6 +36,10 @@ namespace support {
 
 /// for including tex/lyx files
 class InsetInclude : public InsetCommand {
+	// Disable assignment operator, since it is not used, and cannot be
+	// implemented consistently with the copy constructor, because
+	// include_label is const.
+	InsetInclude & operator=(InsetInclude const &);
 public:
 	///
 	InsetInclude(Buffer * buf, InsetCommandParams const &);
@@ -54,16 +59,10 @@ public:
 	 */
 	void updateBibfilesCache();
 
-	/** Return the cache with all bibfiles in use of the child buffer
-	 *  (including bibfiles of grandchild documents).
-	 *  Return an empty vector if the child doc is not loaded.
-	 *  \param buffer the Buffer containing this inset.
-	 */
-	support::FileNameList const &
-		getBibfilesCache() const;
-
 	///
 	void updateCommand();
+	///
+	void write(std::ostream &) const;
 
 	/// \name Public functions inherited from Inset class
 	//@{
@@ -79,17 +78,20 @@ public:
 	DisplayType display() const;
 	///
 	InsetCode lyxCode() const { return INCLUDE_CODE; }
+	///
+	docstring layoutName() const;
 	/** Fills \c key
 	 *  \param keys the list of bibkeys in the child buffer.
 	 *  \param it not used here
 	 */
-	void collectBibKeys(InsetIterator const &) const;
+	void collectBibKeys(InsetIterator const &, support::FileNameList &) const;
 	///
 	bool hasSettings() const { return true; }
 	///
-	int latex(odocstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
-	int plaintext(odocstream &, OutputParams const &) const;
+	int plaintext(odocstringstream & ods, OutputParams const & op,
+	              size_t max_length = INT_MAX) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	///
@@ -99,11 +101,12 @@ public:
 	///
 	void addPreview(DocIterator const &, graphics::PreviewLoader &) const;
 	///
-	void addToToc(DocIterator const &) const;
+	void addToToc(DocIterator const & di, bool output_active,
+				  UpdateType utype, TocBackend & backend) const;
 	///
 	void updateBuffer(ParIterator const &, UpdateType);
 	///
-	docstring contextMenuName() const;
+	std::string contextMenuName() const;
 	//@}
 
 	/// \name Static public methods obligated for InsetCommand derived classes
@@ -148,15 +151,15 @@ private:
 	void setParams(InsetCommandParams const & params);
 	/// get the text displayed on the button
 	docstring screenLabel() const;
-	//@}	
-	
+	//@}
+
 	/// holds the entity name that defines the file location (SGML)
 	docstring const include_label;
 
 	/// The pointer never changes although *preview_'s contents may.
-	boost::scoped_ptr<RenderMonitoredPreview> const preview_;
+	unique_ptr<RenderMonitoredPreview> const preview_;
 
-	/// 
+	///
 	mutable bool failedtoload_;
 	/// cache
 	mutable bool set_label_;