X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.h;h=009b49e3ac03c06b9ca4e55b72a677f3a41e157a;hb=96dea61f22c04529e726cab36acf0240d41fa778;hp=ce93c7104c0eb321eec2f4e2f2ae789ad788933c;hpb=d5a5fbb8ee87d4a8ae1c55f9ba72819251bb6fb7;p=lyx.git diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h index ce93c7104c..009b49e3ac 100644 --- a/src/insets/InsetInclude.h +++ b/src/insets/InsetInclude.h @@ -17,7 +17,8 @@ #include "RenderButton.h" -#include +#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 &); @@ -87,7 +92,7 @@ public: * \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; } /// @@ -105,7 +110,7 @@ public: void addPreview(DocIterator const &, graphics::PreviewLoader &) const; /// void addToToc(DocIterator const & di, bool output_active, - UpdateType utype) const; + UpdateType utype, TocBackend & backend) const; /// void updateBuffer(ParIterator const &, UpdateType); /// @@ -154,15 +159,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 const preview_; + unique_ptr const preview_; - /// + /// mutable bool failedtoload_; /// cache mutable bool set_label_;