Reset cur.pit() when pasting into tables.

[lyx.git] / src / insets / InsetInclude.h

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index bee2089d9407beb2a4e921ec69decde18977b90c..18329fe6d9117826e8f62c9eaf2e1b8990123d8f 100644 (file)
--- 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,14 +59,6 @@ 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();
        ///
@@ -87,7 +84,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; }
        ///
@@ -104,7 +101,8 @@ public:
        ///
        void addPreview(DocIterator const &, graphics::PreviewLoader &) const;
        ///
-       void addToToc(DocIterator const & di, bool output_active) const;
+       void addToToc(DocIterator const & di, bool output_active,
+                                 UpdateType utype, TocBackend & backend) const;
        ///
        void updateBuffer(ParIterator const &, UpdateType);
        ///
@@ -153,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_;